generator-jhipster 8.2.0 → 8.2.1

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.spring_data_reactive.ejs

@@ -1,114 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-<%#
- This is a fragment file, it will be merged into to root template if available.
- EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
--%>
-<&_ if (fragment.importSection) { -&>
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Transient;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-<&_ } -&>
-
-<&_ if (fragment.annotationSection) { -&>
-@Table("<%= entityTableName %>")
-<&_ } -&>
-
-<%_ for (const field of fields) { _%>
-<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
-  <%_ if (field.id) { _%>
-    @Id
-  <%_ } _%>
-    @Column("<%- field.fieldNameAsDatabaseColumn %>")
-<&_ } -&>
-  <%_ if (field.fieldTypeBigDecimal) { _%>
-<&_ if (fragment.field<%- field.fieldNameCapitalized %>CustomSetSection) { -&>
-    public void set<%= field.fieldInJavaBeanMethod %>(<%= field.javaFieldType %> <%= field.fieldName %>) {
-        this.<%= field.fieldName %> = <%= field.fieldName %> != null ? <%= field.fieldName %>.stripTrailingZeros() : null;
-    }
-<&_ } -&>
-  <%_ } _%>
-<%_ } -%>
-
-<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { _%>
-<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
-    @Column("<%- field.fieldNameAsDatabaseColumn %>_content_type")
-<&_ } -&>
-<%_ } -%>
-
-<%_ for (const relationship of relationships) { _%>
-<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
-    @Transient
-<&_ } -&>
-<%_ } -%>
-
-<%_ for (const relationship of relationships) {
-  const reactiveRelationshipWithId = (databaseTypeSql && reactive && !(relationship.relationshipOneToOne &&
-    (!relationship.ownerSide || (relationship.ownerSide && relationship.id))));
- _%>
-<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection) { -&>
-  <%_ if (!relationship.collection && reactiveRelationshipWithId) { _%>
-    public void set<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
-    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
-        if (this.<%= relationship.relationshipFieldName %> != null) {
-      <%_ if (relationship.otherRelationship.reference.collection) { _%>
-            this.<%= relationship.relationshipFieldName %>.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
-      <%_ } else { _%>
-            this.<%= relationship.relationshipFieldName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
-      <%_ } _%>
-        }
-        if (<%= relationship.otherEntityName %> != null) {
-      <%_ if (relationship.otherRelationship.reference.collection) { _%>
-            <%= relationship.otherEntityName %>.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
-      <%_ } else { _%>
-            <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
-      <%_ } _%>
-        }
-    <%_ } _%>
-        this.<%= relationship.relationshipFieldName %> = <%= relationship.otherEntityName %>;
-        this.<%= relationship.relationshipFieldName %>Id = <%= relationship.otherEntityName %> != null ? <%= relationship.otherEntityName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>() : null;
-    }
-  <%_ } _%>
-<&_ } -&>
-<%_ } _%>
-
-<&_ if (fragment.classAdditionalRelationshipsSection) { -&>
-    <%_ for (const relationship of relationships) { _%>
-      <%_ if (relationship.ownerSide && !relationship.collection && !relationship.id) { _%>
-    @Column("<%= relationship.joinColumnNames[0] %>")
-    private <%= relationship.otherEntity.primaryKey.type %> <%= relationship.relationshipFieldName %>Id;
-      <%_ } _%>
-    <%_ } _%>
-<&_ } -&>
-
-<&_ if (fragment.classAdditionalRelationshipsMethodsSection) { -&>
-    <%_ for (const relationship of relationships) { _%>
-      <%_ if (relationship.ownerSide && !relationship.collection && !relationship.id) { _%>
-
-    public <%= relationship.otherEntity.primaryKey.type %> get<%= relationship.relationshipNameCapitalized %>Id() {
-        return this.<%= relationship.relationshipFieldName %>Id;
-    }
-
-    public void set<%= relationship.relationshipNameCapitalized %>Id(<%= relationship.otherEntity.primaryKey.type %> <%= relationship.otherEntityName %>) {
-        this.<%= relationship.relationshipFieldName %>Id = <%= relationship.otherEntityName %>;
-    }
-      <%_ } _%>
-    <%_ } _%>
-<&_ } -&>

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_Callback.java.ejs

@@ -1,43 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= entityAbsolutePackage %>.domain;
-
-import org.reactivestreams.Publisher;
-import org.springframework.data.r2dbc.mapping.OutboundRow;
-import org.springframework.data.r2dbc.mapping.event.AfterConvertCallback;
-import org.springframework.data.r2dbc.mapping.event.AfterSaveCallback;
-import org.springframework.data.relational.core.sql.SqlIdentifier;
-import org.springframework.stereotype.Component;
-
-import reactor.core.publisher.Mono;
-
-@Component
-public class <%= persistClass %>Callback implements AfterSaveCallback<<%= persistClass %>>, AfterConvertCallback<<%= persistClass %>> {
-
-    @Override
-    public Publisher<<%= persistClass %>> onAfterConvert(<%= persistClass %> entity, SqlIdentifier table) {
-        return Mono.just(entity.setIsPersisted());
-    }
-
-    @Override
-    public Publisher<<%= persistClass %>> onAfterSave(<%= persistClass %> entity, OutboundRow outboundRow,
-            SqlIdentifier table) {
-        return Mono.just(entity.setIsPersisted());
-    }
-}

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryInternalImpl_reactive.java.ejs

@@ -1,280 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= entityAbsolutePackage %>.repository;
-
-import java.util.function.BiFunction;
-<%_ if (anyFieldIsBigDecimal) { _%>
-import java.math.BigDecimal;
-<%_} if (anyFieldIsInstant) { _%>
-import java.time.Instant;
-<%_ } if (anyFieldIsLocalDate) { _%>
-import java.time.LocalDate;
-<%_ } if (anyFieldIsZonedDateTime) { _%>
-import java.time.ZonedDateTime;
-<%_ } if (anyFieldIsDuration) { _%>
-import java.time.Duration;
-<%_ } if (anyFieldIsUUID) { _%>
-import java.util.UUID;
-<%_ } _%>
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.domain.Pageable;
-import io.r2dbc.spi.Row;
-import io.r2dbc.spi.RowMetadata;
-import static org.springframework.data.relational.core.query.Criteria.where;
-<%_ if (containsBagRelationships) { _%>
-import static org.springframework.data.relational.core.query.Query.query;
-<%_ } _%>
-import org.springframework.data.r2dbc.convert.R2dbcConverter;
-import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
-import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
-import org.springframework.data.r2dbc.repository.support.SimpleR2dbcRepository;
-import org.springframework.data.relational.core.query.Criteria;
-import org.springframework.data.relational.core.sql.Column;
-import org.springframework.data.relational.core.sql.Comparison;
-import org.springframework.data.relational.core.sql.Condition;
-import org.springframework.data.relational.core.sql.Conditions;
-import org.springframework.data.relational.core.sql.Expression;
-import org.springframework.data.relational.core.sql.Select;
-import org.springframework.data.relational.core.sql.SelectBuilder.SelectFromAndJoin<% if (reactiveEagerRelations.length > 0) { %>Condition<% } %>;
-import org.springframework.data.relational.core.sql.Table;
-import org.springframework.data.relational.repository.support.MappingRelationalEntityInformation;
-import org.springframework.r2dbc.core.DatabaseClient;
-import org.springframework.r2dbc.core.RowsFetchSpec;
-
-import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
-<%_ if (jpaMetamodelFiltering && reactive) {  _%>
-import <%= entityAbsolutePackage %>.domain.criteria.<%= entityClass %>Criteria;
-import <%= entityAbsolutePackage %>.repository.rowmapper.ColumnConverter;
-import tech.jhipster.service.ConditionBuilder;
-<%_ }  _%>
-<% relationships.forEach(rel => {
-  if (rel.relationshipManyToMany && rel.ownerSide) { _%>
-import <%= rel.otherEntity.entityAbsolutePackage %>.domain.<%= rel.otherEntity.persistClass %>;
-  <%_ } _%>
-<%_ }); _%>
-<%_ Object.keys(uniqueEnums).forEach(element => { _%>
-
-import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
-<%_ }); _%>
-
-<%_ [...reactiveOtherEntities, locals].forEach(otherEntity => { _%>
-import <%= otherEntity.entityAbsolutePackage %>.repository.rowmapper.<%= otherEntity.entityClass %>RowMapper;
-  <%_ if (otherEntity.entityPackage !== entityPackage) { _%>
-import <%= otherEntity.entityAbsolutePackage %>.repository.<%= otherEntity.entityClass %>SqlHelper;
-  <%_ } _%>
-<%_ }); _%>
-<%_ if (packageName !== entityAbsolutePackage) { _%>
-import <%= packageName %>.repository.EntityManager;
-<%_ } _%>
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * <%= springDataDescription %> custom repository implementation for the <%= persistClass %> entity.
- */
-@SuppressWarnings("unused")
-class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%= persistClass %>, <%= primaryKey.type %>> implements <%= entityClass %>RepositoryInternal {
-    private final DatabaseClient db;
-    private final R2dbcEntityTemplate r2dbcEntityTemplate;
-    private final EntityManager entityManager;
-
-<%_ reactiveUniqueEntityTypes.forEach(element => { _%>
-    private final <%= element %>RowMapper <%= element.toLowerCase() %>Mapper;
-<%_ }); _%>
-<%_ if (jpaMetamodelFiltering && reactive) {  _%>
-    private final ColumnConverter columnConverter;
-<%_ } _%>
-
-    private final static Table entityTable = Table.aliased("<%= entityTableName %>", EntityManager.ENTITY_ALIAS);
-<%_ reactiveEagerRelations.forEach(rel => { _%>
-    private final static Table <%= rel.relationshipName %>Table = Table.aliased("<%= rel.otherEntityTableName %>", "<%= rel.relationshipSqlSafeName %>");
-<%_ }); _%>
-
-<%_ relationships.forEach(rel => {
-  if (rel.shouldWriteJoinTable) {
-_%>
-    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new EntityManager.LinkTable("<%= rel.joinTable.name %>", "<%= entityTableName %>_<%= this.getColumnName(primaryKey.name) %>", "<%= rel.joinColumnNames[0] %>");
-<%_ }
-}); _%>
-
-    public <%= entityClass %>RepositoryInternalImpl(R2dbcEntityTemplate template, EntityManager entityManager<%_
-            reactiveUniqueEntityTypes.forEach(element => { _%>, <%= element %>RowMapper <%= element.toLowerCase() %>Mapper<%_ }); _%>, R2dbcEntityOperations entityOperations,
-        R2dbcConverter converter<% if (jpaMetamodelFiltering && reactive) {  %>,
-        ColumnConverter columnConverter<% } %>) {
-        super(new MappingRelationalEntityInformation(converter.getMappingContext().getRequiredPersistentEntity(<%= persistClass %>.class)), entityOperations, converter);
-        this.db = template.getDatabaseClient();
-        this.r2dbcEntityTemplate = template;
-        this.entityManager = entityManager;
-<%_ reactiveUniqueEntityTypes.forEach(element => { _%>
-        this.<%= element.toLowerCase() %>Mapper = <%= element.toLowerCase() %>Mapper;
-<%_ }); _%>
-<%_ if (jpaMetamodelFiltering && reactive) {  _%>
-        this.columnConverter = columnConverter;
-<%_ } _%>
-    }
-
-    @Override
-    public Flux<<%= persistClass %>> findAllBy(Pageable pageable) {
-        return createQuery(pageable, null).all();
-    }
-
-    RowsFetchSpec<<%= persistClass %>> createQuery(Pageable pageable, Condition whereClause) {
-        List<Expression> columns = <%= entityClass %>SqlHelper.getColumns(entityTable, EntityManager.ENTITY_ALIAS);
-<%_ reactiveEagerRelations.forEach(rel => { _%>
-        columns.addAll(<%= rel.otherEntityNameCapitalized %>SqlHelper.getColumns(<%= rel.relationshipName %>Table, "<%= rel.relationshipName %>"));
-<%_ }); _%>
-        SelectFromAndJoin<% if (reactiveEagerRelations.length > 0) { %>Condition<% } %> selectFrom = Select.builder().select(columns).from(entityTable)
-<%_ reactiveEagerRelations.forEach(rel => { _%>
-            .leftOuterJoin(<%= rel.relationshipName %>Table).on(Column.create("<%= rel.joinColumnNames[0] %>", entityTable)).equals(Column.create("<%= rel.otherEntity.primaryKey.fields[0].columnName %>", <%= rel.relationshipName %>Table ))
-<%_ }); _%>;
-        // we do not support Criteria here for now as of https://github.com/jhipster/generator-jhipster/issues/18269
-        String select = entityManager.createSelect(selectFrom, <%= persistClass %>.class, pageable, whereClause);
-        return db.sql(select).map(this::process);
-    }
-
-    @Override
-    public Flux<<%= persistClass %>> findAll() {
-        return findAllBy(null);
-    }
-
-    @Override
-    public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
-<%_ if (primaryKey.type != 'Long') {  _%>
-        Comparison whereClause = Conditions.isEqual(entityTable.column("<%= primaryKey.fields[0].columnName %>"), Conditions.just(StringUtils.wrap(id.toString(), "'")));
-<%_ } else { _%>
-        Comparison whereClause = Conditions.isEqual(entityTable.column("<%= primaryKey.fields[0].columnName %>"), Conditions.just(id.toString()));
-<%_ }_%>
-        return createQuery(null, whereClause).one();
-    }
-
-<%_ if (implementsEagerLoadApis) { _%>
-
-    @Override
-    public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) {
-        return findById(id);
-    }
-
-    @Override
-    public Flux<<%= persistClass %>> findAllWithEagerRelationships() {
-        return findAll();
-    }
-
-    @Override
-    public Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page) {
-        return findAllBy(page);
-    }
-
-<%_ } _%>
-    private <%= persistClass %> process(Row row, RowMetadata metadata) {
-        <%= persistClass %> entity = <%= entityClass.toLowerCase() %>Mapper.apply(row, "e");
-<%_ reactiveEagerRelations.forEach(rel => { _%>
-        entity.set<%= rel.relationshipNameCapitalized %>(<%= rel.otherEntityNameCapitalized.toLowerCase() %>Mapper.apply(row, "<%= rel.relationshipName %>"));
-<%_ }); _%>
-        return entity;
-    }
-
-    @Override
-    public <S extends <%= persistClass %>> Mono<S> save(S entity) {
-<%_ if (isUsingMapsId) { _%>
-        if (entity.get<%= primaryKey.nameCapitalized %>() == null && entity.get<%= mapsIdAssoc.relationshipNameCapitalized %>() != null) {
-            entity.set<%= primaryKey.nameCapitalized %>(entity.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= mapsIdAssoc.otherEntity.primaryKey.nameCapitalized %>());
-            return entityManager.insert(entity);
-        }
-<%_ } _%>
-        return super.save(entity)<% if (containsBagRelationships) { %>.flatMap((S e) -> updateRelations(e))<% } %>;
-    }
-
-<%_ if (containsBagRelationships) { _%>
-    protected <S extends <%= persistClass %>> Mono<S> updateRelations(S entity) {
-  <%_ relationships.filter(rel => {
-    return (rel.relationshipManyToMany && rel.ownerSide);
-   }).forEach(function(rel, idx) { _%>
-    <%_ if (idx === 0) { _%>
-        Mono<Void> result = entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= rel.otherEntity.persistClass %>::get<%= rel.otherEntity.primaryKey.nameCapitalized %>)).then();
-    <%_ } else { _%>
-        result = result.and(entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= rel.otherEntity.persistClass %>::get<%= rel.otherEntity.primaryKey.nameCapitalized %>)));
-    <%_ } _%>
-  <%_ }); _%>
-        return result.thenReturn(entity);
-    }
-
-    @Override
-    public Mono<Void> deleteById(<%= primaryKey.type %> entityId) {
-        return deleteRelations(entityId)
-            .then(super.deleteById(entityId));
-    }
-
-    protected Mono<Void> deleteRelations(<%= primaryKey.type %> entityId) {
-  <%_ relationships.filter(rel => {
-      return (rel.relationshipManyToMany && rel.ownerSide);
-    }).forEach(function(rel, idx) { _%>
-    <%_ if (idx === 0) { _%>
-        return entityManager.deleteFromLinkTable(<%= rel.relationshipName %>Link, entityId)
-    <%_} else { _%>
-            .and(entityManager.deleteFromLinkTable(<%= rel.relationshipName %>Link, entityId))
-    <%_ } _%>
-  <%_ }); %>;
-        }
-<%_ } _%>
-<%_ if (jpaMetamodelFiltering && reactive) {  _%>
-    @Override
-    public Flux<<%= persistClass %>> findByCriteria(<%= entityClass %>Criteria <%= entityInstance %>Criteria, Pageable page) {
-        return createQuery(page, buildConditions(<%= entityInstance %>Criteria)).all();
-    }
-
-    @Override
-    public Mono<Long> countByCriteria(<%= entityClass %>Criteria criteria) {
-        return findByCriteria(criteria, null)
-                    .collectList()
-                        .map(collectedList -> collectedList != null ? (long) collectedList.size() : (long) 0);
-    }
-
-    private Condition buildConditions(<%= entityClass %>Criteria criteria) {
-        ConditionBuilder builder = new ConditionBuilder(this.columnConverter);
-        List<Condition> allConditions = new ArrayList<Condition>();
-        if (criteria != null) {
-            if (criteria.get<%= primaryKey.nameCapitalized %>() != null) {
-                builder.buildFilterConditionForField(criteria.get<%= primaryKey.nameCapitalized %>(), entityTable.column("<%= primaryKey.name %>"));
-            }
-<%_
-fields.forEach((field) => {
-  if (field.id || field.transient) return;
-  if (field.filterableField) { _%>
-            if (criteria.get<%= field.fieldInJavaBeanMethod %>() != null) {
-                builder.buildFilterConditionForField(criteria.get<%= field.fieldInJavaBeanMethod %>(), entityTable.column("<%= field.columnName %>"));
-            }
-<%_ } _%>
-<%_ }); _%>
-<%_ reactiveEagerRelations.forEach((relationship) => {
-  const metamodelFieldName = (relationship.relationshipManyToMany || relationship.relationshipOneToMany) ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName; _%>
-            if (criteria.get<%= relationship.relationshipNameCapitalized %>Id() != null) {
-                builder.buildFilterConditionForField(criteria.get<%= relationship.relationshipNameCapitalized %>Id(), <%= relationship.relationshipName %>Table.column("<%= relationship.otherEntity.primaryKey.ownFields[0].columnName %>"));
-            }
-<%_ }); _%>
-        }
-        return builder.buildConditions();
-    }
-<%_ } _%>
-}

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryWithBagRelationships.java.ejs

@@ -1,37 +0,0 @@
-<%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= entityAbsolutePackage %>.repository;
-
-import java.util.List;
-import java.util.Optional;
-<%_ if (anyFieldIsUUID) { _%>
-import java.util.UUID;
-<%_ } _%>
-
-import org.springframework.data.domain.Page;
-
-import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
-
-public interface <%= entityClass %>RepositoryWithBagRelationships {
-    Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>);
-
-    List<<%= persistClass %>> fetchBagRelationships(List<<%= persistClass %>> <%= entityInstancePlural %>);
-
-    Page<<%= persistClass %>> fetchBagRelationships(Page<<%= persistClass %>> <%= entityInstancePlural %>);
-}

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_RepositoryWithBagRelationshipsImpl.java.ejs

@@ -1,95 +0,0 @@
-<%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= entityAbsolutePackage %>.repository;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.HashMap;
-<%_ if (anyFieldIsUUID) { _%>
-import java.util.UUID;
-<%_ } _%>
-import java.util.stream.IntStream;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-
-import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
-
-/**
- * Utility repository to load bag relationships based on https://vladmihalcea.com/hibernate-multiplebagfetchexception/
- */
-public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%= entityClass %>RepositoryWithBagRelationships {
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    @Override
-    public Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>) {
-        return <%= entityInstance %>
-<%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
-            .map(this::fetch<%= relationship.relationshipNameCapitalizedPlural %>)
-<%_ } _%>
-        ;
-    }
-
-    @Override
-    public Page<<%= persistClass %>> fetchBagRelationships(Page<<%= persistClass %>> <%= entityInstancePlural %>) {
-        return new PageImpl<>(fetchBagRelationships(<%= entityInstancePlural %>.getContent()), <%= entityInstancePlural %>.getPageable(), <%= entityInstancePlural %>.getTotalElements());
-    }
-
-    @Override
-    public List<<%= persistClass %>> fetchBagRelationships(List<<%= persistClass %>> <%= entityInstancePlural %>) {
-        return Optional
-            .of(<%= entityInstancePlural %>)
-<%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
-            .map(this::fetch<%= relationship.relationshipNameCapitalizedPlural %>)
-<%_ } _%>
-            .orElse(Collections.emptyList());
-    }
-<%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
-
-    <%= persistClass %> fetch<%= relationship.relationshipNameCapitalizedPlural %>(<%= persistClass %> result) {
-        return entityManager
-            .createQuery(
-                "select <%= entityInstance %> from <%= persistClass %> <%= entityInstance %> left join fetch <%= entityInstance %>.<%= relationship.relationshipFieldNamePlural %> where <%= entityInstance %>.<%= primaryKey.name %> = :<%= primaryKey.name %>",
-                <%= persistClass %>.class
-            )
-            .setParameter("<%= primaryKey.name %>", result.get<%= primaryKey.nameCapitalized %>())
-            .getSingleResult();
-    }
-
-    List<<%= persistClass %>> fetch<%= relationship.relationshipNameCapitalizedPlural %>(List<<%= persistClass %>> <%= entityInstancePlural %>) {
-        HashMap<Object, Integer> order = new HashMap<>();
-        IntStream.range(0, <%= entityInstancePlural %>.size())
-            .forEach(index -> order.put(<%= entityInstancePlural %>.get(index).get<%= primaryKey.nameCapitalized %>(), index));
-        List<<%= persistClass %>> result = entityManager
-            .createQuery(
-                "select <%= entityInstance %> from <%= persistClass %> <%= entityInstance %> left join fetch <%= entityInstance %>.<%= relationship.relationshipFieldNamePlural %> where <%= entityInstance %> in :<%= entityInstancePlural %>",
-                <%= persistClass %>.class
-            )
-            .setParameter("<%= entityInstancePlural %>", <%= entityInstancePlural %>)
-            .getResultList();
-        Collections.sort(result, (o1, o2) -> Integer.compare(order.get(o1.get<%= primaryKey.nameCapitalized %>()), order.get(o2.get<%= primaryKey.nameCapitalized %>())));
-        return result;
-    }
-<%_ } _%>
-}

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/_EntityClass_SqlHelper_reactive.java.ejs

@@ -1,46 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= entityAbsolutePackage %>.repository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.relational.core.sql.Column;
-import org.springframework.data.relational.core.sql.Expression;
-import org.springframework.data.relational.core.sql.Table;
-
-public class <%= entityClass %>SqlHelper {
-
-    public static List<Expression> getColumns(Table table, String columnPrefix) {
-        List<Expression> columns = new ArrayList<>();
-<%_ fields.filter(field => !field.transient).forEach(function(field) {
-    let col = field.fieldNameAsDatabaseColumn;
-    _%>
-        columns.add(Column.aliased("<%= col %>", table, columnPrefix + "_<%= col %>"));
-   <%_  if ((field.fieldTypeBinary) && !field.blobContentTypeText) { _%>
-        columns.add(Column.aliased("<%= col %>_content_type", table, columnPrefix + "_<%= col %>_content_type"));
-   <%_  } _%>
-<%_ }); _%>
-
-<%_ reactiveRegularEagerRelations.forEach(function(rel) { _%>
-        columns.add(Column.aliased("<%= rel.joinColumnNames[0] %>", table, columnPrefix + "_<%= rel.joinColumnNames[0] %>"));
-<%_ }); _%>
-        return columns;
-    }
-}