generator-jhipster 7.5.0 → 7.8.0

package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.
@@ -29,11 +29,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
   <%_ } _%>
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import java.util.List;
-import org.springframework.data.domain.PageRequest;
-
 
 <%_ } _%>
 <%_ if (reactive) { _%>
@@ -65,7 +60,7 @@ public interface <%= entityClass %>SearchRepository extends <% if (reactive) {%>
 <%_ if (reactive) { _%>
 
 interface <%= entityClass %>SearchRepositoryInternal {
-    Flux<<%= entityClass %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);
+    Flux<<%= persistClass %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);
 }
 
 class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass %>SearchRepositoryInternal {
@@ -77,23 +72,13 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
     }
 
     @Override
-    public Flux<<%= entityClass %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
-  <%_ if (!paginationNo) { _%>
-        List<FieldSortBuilder> builders = new SortToFieldSortBuilderConverter().convert(pageable.getSort());
-
-        NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder().withQuery(queryStringQuery(query))
-            .withPageable(PageRequest.of(pageable.getPageNumber(), pageable.getPageSize()));
-
-        builders.stream().forEach(builder -> {
-            queryBuilder.withSort(builder);
-        });
-
-        NativeSearchQuery nativeSearchQuery = queryBuilder.build();
-  <%_ } else { _%>
+    public Flux<<%= persistClass %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
         NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
-  <%_ } _%>
+  <%_ if (!paginationNo) { _%>
+        nativeSearchQuery.setPageable(pageable);
+  <%_ }_%>
         return reactiveElasticsearchTemplate
-            .search(nativeSearchQuery, <%= entityClass %>.class)
+            .search(nativeSearchQuery, <%= persistClass %>.class)
             .map(SearchHit::getContent);
     }
 }
@@ -101,9 +86,9 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
 
 interface <%= entityClass %>SearchRepositoryInternal {
   <%_ if (paginationNo) { _%>
-    Stream<<%= entityClass %>> search(String query);
+    Stream<<%= persistClass %>> search(String query);
   <%_ } else { _%>
-    Page<<%= entityClass %>> search(String query, Pageable pageable);
+    Page<<%= persistClass %>> search(String query, Pageable pageable);
   <%_ } _%>
 }
 
@@ -117,19 +102,19 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
 
   <%_ if (paginationNo) { _%>
     @Override
-    public Stream<<%= entityClass %>> search(String query) {
+    public Stream<<%= persistClass %>> search(String query) {
         NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
         return elasticsearchTemplate
-            .search(nativeSearchQuery, <%= entityClass %>.class)
+            .search(nativeSearchQuery, <%= persistClass %>.class)
             .map(SearchHit::getContent)
             .stream();
     }
   <%_ } else { _%>
     @Override
-    public Page<<%= entityClass %>> search(String query, Pageable pageable) {
+    public Page<<%= persistClass %>> search(String query, Pageable pageable) {
         NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
         nativeSearchQuery.setPageable(pageable);
-        List<<%= entityClass %>> hits = elasticsearchTemplate.search(nativeSearchQuery, <%= entityClass %>.class).map(SearchHit::getContent)
+        List<<%= persistClass %>> hits = elasticsearchTemplate.search(nativeSearchQuery, <%= persistClass %>.class).map(SearchHit::getContent)
             .stream()
             .collect(Collectors.toList());
 

package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.

package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.
@@ -30,7 +30,7 @@ import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
 <%_ } else { _%>
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ } _%>
-<%_ if (!paginationNo || relationshipsContainEagerLoad) { _%>
+<%_ if (!paginationNo || implementsEagerLoadApis) { _%>
 
   <%_ if (!reactive) { _%>
 import org.springframework.data.domain.Page;
@@ -65,13 +65,21 @@ public interface <%= entityClass %>Service {
      */
     <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> save(<%= instanceType %> <%= instanceName %>);
 
+    /**
+     * Updates a <%= entityInstance %>.
+     *
+     * @param <%= instanceName %> the entity to update.
+     * @return the persisted entity.
+     */
+     <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> update(<%= instanceType %> <%= instanceName %>);
+
     /**
      * Partially updates a <%= entityInstance %>.
      *
      * @param <%= instanceName %> the entity to update partially.
      * @return the persisted entity.
      */
-<% if (!reactive) { %>Optional<<% } %><% if (reactive) { %>Mono<<% } %><%= instanceType %>> partialUpdate(<%= instanceType %> <%= instanceName %>);
+    <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= instanceType %>> partialUpdate(<%= instanceType %> <%= instanceName %>);
 
     /**
      * Get all the <%= entityInstancePlural %>.
@@ -79,7 +87,7 @@ public interface <%= entityClass %>Service {
      * @param pageable the pagination information.<% } %>
      * @return the list of entities.
      */
-    <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> findAll(<% if (!paginationNo) { %>Pageable pageable<% } %>);
+    <% if (paginationNo) { %><%= listOrFlux %><% } else { %><%= pageOrFlux %><% } %><<%= instanceType %>> findAll(<% if (!paginationNo) { %>Pageable pageable<% } %>);
 <%_ for (const relationship of relationships) { _%>
   <%_ if (relationship.relationshipOneToOne && !relationship.ownerSide) { _%>
     /**
@@ -90,7 +98,7 @@ public interface <%= entityClass %>Service {
     <%= listOrFlux %><<%= instanceType %>> findAllWhere<%= relationship.relationshipNameCapitalized %>IsNull();
 <%_ } } _%>
 
-<%_ if (relationshipsContainEagerLoad) { _%>
+<%_ if (implementsEagerLoadApis) { _%>
     /**
      * Get all the <%= entityInstancePlural %> with eager load of many-to-many relationships.
      *

package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs

@@ -2,6 +2,7 @@ package <%= entityAbsolutePackage %>.service.criteria;
 
 import java.io.Serializable;
 import java.util.Objects;
+import org.springdoc.api.annotations.ParameterObject;
 import tech.jhipster.service.Criteria;
 <%_ for (const field of fields) { if (field.fieldIsEnum === true) { _%>
 import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
@@ -13,22 +14,22 @@ import tech.jhipster.service.filter.FloatFilter;
 import tech.jhipster.service.filter.IntegerFilter;
 import tech.jhipster.service.filter.LongFilter;
 import tech.jhipster.service.filter.StringFilter;
-<%_ if (fieldsContainBigDecimal === true) { _%>
+<%_ if (fieldsContainBigDecimal) { _%>
 import tech.jhipster.service.filter.BigDecimalFilter;
 <%_ } _%>
-<%_ if (fieldsContainDuration === true) { _%>
+<%_ if (fieldsContainDuration) { _%>
 import tech.jhipster.service.filter.DurationFilter;
 <%_ } _%>
-<%_ if (fieldsContainInstant === true) { _%>
+<%_ if (fieldsContainInstant) { _%>
 import tech.jhipster.service.filter.InstantFilter;
 <%_ } _%>
-<%_ if (fieldsContainLocalDate === true) { _%>
+<%_ if (fieldsContainLocalDate) { _%>
 import tech.jhipster.service.filter.LocalDateFilter;
 <%_ } _%>
-<%_ if (fieldsContainUUID === true || otherEntityPrimaryKeyTypesIncludesUUID) { _%>
+<%_ if (fieldsContainUUID || otherEntityPrimaryKeyTypesIncludesUUID) { _%>
 import tech.jhipster.service.filter.UUIDFilter;
 <%_ } _%>
-<%_ if (fieldsContainZonedDateTime === true) { _%>
+<%_ if (fieldsContainZonedDateTime) { _%>
 import tech.jhipster.service.filter.ZonedDateTimeFilter;
 <%_ } _%>
 
@@ -76,6 +77,7 @@ _%>
  * As Spring is unable to properly convert the types, unless specific {@link Filter} class are used, we need to use
  * fix type specific filters.
  */
+@ParameterObject
 public class <%= entityClass %>Criteria implements Serializable, Criteria {
 <%_ Object.keys(extraFilters).forEach((key) => {
   extraFilter = extraFilters[key]; _%>

package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.

package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.
@@ -51,7 +51,7 @@ import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-<%_ if (!paginationNo || relationshipsContainEagerLoad) { _%>
+<%_ if (!paginationNo || implementsEagerLoadApis) { _%>
   <%_ if (!reactive) { _%>
 import org.springframework.data.domain.Page;
   <%_ } _%>
@@ -112,7 +112,23 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> save(<%= instanceType %> <%= instanceName %>) {
         log.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
-<%- include('/partials/save_template', {asEntity, asDto, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false}); -%>
+<%- include('/partials/save_template', {asEntity, asDto, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: false}); -%>
+    }
+
+<%_ if (!serviceImpl) { _%>
+    /**
+     * Update a <%= entityInstance %>.
+     *
+     * @param <%= instanceName %> the entity to save.
+     * @return the persisted entity.
+    */
+<%_ } _%>
+<%_ if (serviceImpl) { _%>
+    @Override
+<%_ } _%>
+    public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> update(<%= instanceType %> <%= instanceName %>) {
+        log.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
+<%- include('/partials/update_template', {updatableEntity, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: requiresPersistableImplementation}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>
@@ -126,7 +142,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ if (serviceImpl) { _%>
     @Override
 <%_ } _%>
-    public <% if (!reactive) { %>Optional<<% } %><% if (reactive) { %>Mono<<% } %><%= instanceType %>> partialUpdate(<%= instanceType %> <%= instanceName %>) {
+    public <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= instanceType %>> partialUpdate(<%= instanceType %> <%= instanceName %>) {
         log.debug("Request to partially update <%= entityClass %> : {}", <%= instanceName %>);
 <%- include('../../common/patch_template', {asEntity, asDto, isService: true, viaService: false}); -%>
     }
@@ -147,10 +163,10 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ if (databaseTypeSql) { _%>
     @Transactional(readOnly = true)
 <%_ } _%>
-    public <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> findAll(<% if (!paginationNo) { %>Pageable pageable<% } %>) {
+    public <% if (paginationNo) { %><%= listOrFlux %><% } else { %><%= pageOrFlux %><% } %><<%= instanceType %>> findAll(<% if (!paginationNo) { %>Pageable pageable<% } %>) {
         log.debug("Request to get all <%= entityClassPlural %>");
 <%_ if (paginationNo) { _%>
-        return <%= entityInstance %>Repository.<% if (relationshipsContainEagerLoad) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (dtoMapstruct) { %><% if (!reactive) { %>.stream()<% } %>
+        return <%= entityInstance %>Repository.<% if (implementsEagerLoadApis) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (dtoMapstruct) { %><% if (!reactive) { %>.stream()<% } %>
             .map(<%= entityToDtoReference %>)<% if (!reactive) { %>
             .collect(Collectors.toCollection(LinkedList::new))<% } } %>;
 <%_ } else { _%>
@@ -159,7 +175,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
 <%_ } _%>
     }
 
-<%_ if (relationshipsContainEagerLoad) { _%>
+<%_ if (implementsEagerLoadApis) { _%>
 
   <%_ if (!serviceImpl) { _%>
     /**
@@ -213,7 +229,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Transactional(readOnly = true)
     <%_ } _%>
     public <%= optionalOrMono %><<%= instanceType %>> findOne(<%= primaryKey.type %> id) {
-        log.debug("Request to get <%= entityClass %> : {}", id);<%- include('../../common/get_template', {asEntity, asDto, viaService: false, returnDirectly:true}); -%>
+        log.debug("Request to get <%= entityClass %> : {}", id);<%- include('../../common/get_template', {asEntity, asDto, viaService: false, returnDirectly:true, implementsEagerLoadApis}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>

package/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.

package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 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.
@@ -19,30 +19,34 @@
 package <%= entityAbsolutePackage %>.service.mapper;
 
 <%_
-let existingMappings = [];
-let uuidMapMethod = dtoReferences.some(reference => reference.valueReference && reference.valueReference.field && reference.valueReference.field.fieldTypeUUID);
-let byteMapMethod = dtoReferences.some(reference => reference.valueReference && reference.valueReference.field && reference.valueReference.field.fieldTypeBytes);
-for (reference of dtoReferences) {
-  // if the entity is mapped twice, we should implement the mapping once
-  if (reference.relationship && !reference.relationship.otherEntity.embedded && !existingMappings.includes(reference.name) && asEntity(reference.relationship.otherEntityNameCapitalized) !== persistClass) {
-    existingMappings.push(reference.relationship.otherEntity.entityNameCapitalized);
-  }
- }
+  const uuidMapMethod = dtoReferences.some(reference => reference.valueReference && reference.valueReference.field && reference.valueReference.field.fieldTypeUUID);
+  const byteMapMethod = dtoReferences.some(reference => reference.valueReference && reference.valueReference.field && reference.valueReference.field.fieldTypeBytes);
+  const dtoRelationships = dtoReferences.filter(reference => reference.relationship && !reference.relationship.otherEntity.embedded).map(reference => reference.relationship);
+  let otherEntitiesFields = otherEntities
+    .filter(otherEntity => dtoRelationships.some(relationship => relationship.otherEntity === otherEntity))
+    .map(otherEntity => 
+      dtoRelationships
+        .filter(relationship => relationship.otherEntity == otherEntity)
+        .map(({relatedField, collection}) => ({otherEntity, relatedField, collection}))
+    )
+    .flat();
+  otherEntitiesFields.forEach(a => {
+    a.collection = a.collection || otherEntitiesFields.some(b => a.otherEntity === b.otherEntity && a.relatedField === b.relatedField && b.collection == true)
+  });
+  otherEntitiesFields = _.uniqWith(otherEntitiesFields, (a, b) => a.otherEntity === b.otherEntity && a.collection === b.collection && a.relatedField === b.relatedField);
 _%>
 
-<%_ if (dtoReferences.some(r => r.relationship &&
-        r.relationship.otherRelationship &&
-        r.relationship.otherRelationship.reference.collection &&
-        r.relationship.relationshipManyToMany
-    ) || otherDtoReferences.some(r => r.collection)) { _%>
+<%_ if (dtoRelationships.some(r => r.collection)) { _%>
 import java.util.Set;
+import java.util.stream.Collectors;
 <%_ } _%>
 
 import <%= entityAbsoluteClass %>;
 import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
 
-<%_ for (const otherEntity of _.uniq(dtoReferences.filter(ref => ref.relationship).map(ref => ref.relationship.otherEntity).filter(otherEntity => otherEntity.entityPackage !== entityPackage))) { _%>
-import <%= `${otherEntity.entityAbsolutePackage}.service.mapper.${otherEntity.entityClass}Mapper` %>;
+<%_ for (const otherEntity of _.uniq(dtoRelationships.map(relationship => relationship.otherEntity).filter(otherEntity => otherEntity !== entity))) { _%>
+import <%= otherEntity.entityAbsoluteClass %>;
+import <%= otherEntity.entityAbsolutePackage %>.service.dto.<%= otherEntity.dtoClass %>;
 <%_ } _%>
 
 import org.mapstruct.*;
@@ -55,100 +59,67 @@ import java.util.UUID;
 /**
  * Mapper for the entity {@link <%= persistClass %>} and its DTO {@link <%= dtoClass %>}.
  */
-@Mapper(componentModel = "spring", uses = {<%= [...new Set(existingMappings.map(otherEntityNameCapitalized => otherEntityNameCapitalized + 'Mapper.class'))].join(', ') %>})
+@Mapper(componentModel = "spring")
 public interface <%= entityClass %>Mapper extends EntityMapper<<%= dtoClass %>, <%= persistClass %>> {
-<%_ /***** Basic dto mapping *****/
-  if (!embedded) {
-    var renMapAnotEnt = false; //Render Mapping Annotation during Entity to DTO conversion?
-    for (reference of dtoReferences.filter(reference => reference.relationship && !reference.relationship.otherEntity.embedded)) {
+<%_ if (!embedded) { _%>
+  <%_ var renMapAnotEnt = false; //Render Mapping Annotation during Entity to DTO conversion? _%>
+  <%_ for (relationship of dtoRelationships) { _%>
+    <%_
       renMapAnotEnt = true;
-      let qualifiedByName = reference.relationship.otherEntityField;
-      qualifiedByName = qualifiedByName + (reference.collection ? 'Set' : ''); _%>
-    @Mapping(target = "<%= reference.name %>", source = "<%= reference.name %>", qualifiedByName="<%= qualifiedByName %>")
-    <%_ } _%>
-    <%_ for (reference of dtoReferences.filter(reference => reference.field && reference.field.mapstructExpression)) {
+      let qualifiedByName = relationship.otherEntity.entityInstance + _.upperFirst(relationship.otherEntityField);
+      qualifiedByName = qualifiedByName + (relationship.collection ? 'Set' : '');
+    _%>
+    @Mapping(target = "<%= relationship.propertyName %>", source = "<%= relationship.propertyName %>", qualifiedByName="<%= qualifiedByName %>")
+  <%_ } _%>
+  <%_ for (const field of fields.filter(field => field.mapstructExpression)) {
       renMapAnotEnt = true; _%>
-    @Mapping( target = "<%= reference.name %>", expression = "<%- reference.field.mapstructExpression %>")
-    <%_ } _%>
-    <%_ if (renMapAnotEnt) { _%>
+    @Mapping( target = "<%= field.propertyName %>", expression = "<%- field.mapstructExpression %>")
+  <%_ } _%>
+  <%_ if (renMapAnotEnt) { _%>
     <%= dtoClass %> toDto(<%= persistClass %> s);
-    <%_ } %>
-<%_ } %>
-<%_ /***** Id mapping *****/
-const otherIdReferences = otherDtoReferences.filter(r => !r.relatedReference || r.relatedReference.id);
-if (!embedded && otherIdReferences.length > 0) {
-    if (otherIdReferences.some(r => !r.collection)) { _%>
-
-    @Named("<%= primaryKey.name %>")
-    @BeanMapping(ignoreByDefault = true)
-      <%_ let renMapAnotEnt = false; //Render Mapping Annotation during Entity to DTO conversion?
-       for (reference of dtoReferences.filter(reference => reference.id)) {
-          renMapAnotEnt = true; _%>
-    @Mapping(target = "<%= reference.name %>", source = "<%= reference.name %>")
-      <%_ } _%>
-    <%_ if (renMapAnotEnt) { _%>
-    <%= dtoClass %> toDtoId(<%= persistClass %> <%= persistInstance %>);
-    <%_ } _%>
   <%_ } _%>
-  <%_ if (otherIdReferences.some(r => r.collection)) { _%>
 
-    @Named("<%= primaryKey.name %>Set")
-    @BeanMapping(ignoreByDefault = true)
-    <%_ let renMapAnotEnt = false; //Render Mapping Annotation during Entity to DTO conversion?
-    for (reference of dtoReferences.filter(reference => reference.id)) {
-      renMapAnotEnt = true; _%>
-    @Mapping(target = "<%= reference.name %>", source = "<%= reference.name %>")
-    <%_ } _%>
-    <%_ if (renMapAnotEnt === true) { _%>
-    Set<<%= dtoClass %>> toDtoIdSet(Set<<%= persistClass %>> <%= persistInstance %>);
+  <%_ var renMapAnotDto = false;  //Render Mapping Annotation during DTO to Entity conversion? _%>
+  <%_ if(primaryKey.ids.length > 1) { _%>
+    <%_ renMapAnotDto = true; _%>
+    <%_ for (const id of primaryKey.ids) { _%>
+    @Mapping(target = "id.<%= id.name %>", source = "<%= id.nameDotted %>")
     <%_ } _%>
   <%_ } _%>
-<%_ } _%>
-<%_ if (!embedded) {
-        // DTO -> entity mapping
-  var renMapAnotDto = false;  //Render Mapping Annotation during DTO to Entity conversion?
-  if(primaryKey.ids.length > 1) {
-    renMapAnotDto = true;
-    primaryKey.ids.forEach(id => { _%>
-
-    @Mapping(target = "id.<%= id.name %>", source = "<%= id.nameDotted %>")
-    <%_ })
-  }
-  for (reference of dtoReferences.filter(reference => reference.relationship)) {
-    if (reference.owned === false) {
-      renMapAnotDto = true; _%>
-    @Mapping(target = "<%= reference.name %>", ignore = true)
+  <%_ for (relationship of dtoRelationships) { _%>
+    <%_ if (!relationship.ownerSide) { _%>
+      <%_ renMapAnotDto = true; _%>
+    @Mapping(target = "<%= relationship.propertyName %>", ignore = true)
     <%_ }
-    if (reference.collection && fluentMethods) {
+    if (relationship.collection && fluentMethods) {
       renMapAnotDto = true; _%>
-    @Mapping(target = "remove<%= reference.relationship.relationshipNameCapitalized %>", ignore = true)
+    @Mapping(target = "remove<%= relationship.relationshipNameCapitalized %>", ignore = true)
     <%_ } _%>
   <%_ } _%>
   <%_ if (renMapAnotDto) { _%>
     <%= persistClass %> toEntity(<%= dtoClass %> <%= dtoInstance %>);
   <%_ } _%>
-  <%_ /***** Add filtered backreference *****/
-  const addedMappers = [];
-  for (const otherReference of otherDtoReferences.filter(r => r.relatedReference && !r.relatedReference.id)) {
-    const reference = otherReference.relationship.otherRelationship && otherReference.relationship.otherRelationship.reference;
-    const collection = otherReference.collection;
-    const mapperName = otherReference.relationship.otherEntityField + (collection ? 'Set' : '');
-    if (addedMappers.includes(mapperName)) continue;
-    addedMappers.push(mapperName);
-    const backReferenceDtoClass = collection ? `Set<${dtoClass}>` : dtoClass;
-    const backReferenceEntityClass = collection ? `Set<${persistClass}>` : persistClass; _%>
+  <%_ for (const {otherEntity, relatedField, collection} of otherEntitiesFields) { _%>
+    <%_ const mapperName = otherEntity.entityInstance + _.upperFirst(relatedField.propertyName); _%>
 
     @Named("<%= mapperName %>")
     @BeanMapping(ignoreByDefault = true)
-    <%_ dtoReferences.filter(r => r.id && r != reference).forEach(r => { _%>
-    @Mapping(target = "<%= r.name %>", source = "<%= r.name %>")
-    <%_ }); _%>
-    <%_ if (otherReference.relationship.relatedField && !otherReference.relationship.relatedField.id) { _%>
-    @Mapping(target = "<%= otherReference.relationship.relatedField.reference.name %>", source = "<%= otherReference.relationship.relatedField.reference.name %>")
+    <%_ for (const field of otherEntity.primaryKey.fields) { _%>
+    @Mapping(target = "<%= field.propertyName %>", source = "<%= field.propertyName %>")
     <%_ } _%>
-    <%- backReferenceDtoClass %> toDto<%= _.upperFirst(mapperName) %>(<%- backReferenceEntityClass %> <%= persistInstance %>);
-  <%_ } _%>
+    <%_ if (!relatedField.id) { _%>
+    @Mapping(target = "<%= relatedField.propertyName %>", source = "<%= relatedField.propertyName %>")
+    <%_ } _%>
+    <%- otherEntity.dtoClass %> toDto<%= _.upperFirst(mapperName) %>(<%- otherEntity.persistClass %> <%= otherEntity.persistInstance %>);
+    <%_ if (collection) { %>
+      <%_ const collectionMapperName = otherEntity.entityInstance + _.upperFirst(relatedField.propertyName) + 'Set'; _%>
 
+    @Named("<%= collectionMapperName %>")
+    default Set<<%- otherEntity.dtoClass %>> toDto<%= _.upperFirst(mapperName) %>Set(Set<<%- otherEntity.persistClass %>> <%= otherEntity.persistInstance %>) {
+        return <%= otherEntity.persistInstance %>.stream().map(this:: toDto<%= _.upperFirst(mapperName) %>).collect(Collectors.toSet());
+    }
+    <%_ } _%>
+  <%_ } _%>
   <%_ if (uuidMapMethod) { _%>
 
     default String map(UUID value) {