generator-jhipster 7.1.0 → 7.4.0

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
 import java.util.function.BiFunction;
 <%_ if (fieldsContainBigDecimal) { _%>
@@ -56,19 +56,22 @@ import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.r2dbc.core.RowsFetchSpec;
 <%_ } _%>
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <% relationships.forEach(function(rel) {
   if (rel.relationshipManyToMany && rel.ownerSide) { _%>
-import <%= packageName %>.domain.<%= asEntity(rel.otherEntityNameCapitalized) %>;
+import <%= rel.otherEntity.entityAbsolutePackage %>.domain.<%= rel.otherEntity.persistClass %>;
   <%_ } _%>
 <%_ }); _%>
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
 
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
 
-<%_ reactiveUniqueEntityTypes.forEach(function(element) { _%>
-import <%= packageName %>.repository.rowmapper.<%= element %>RowMapper;
+<%_ [...reactiveOtherEntities, entity].forEach(otherEntity => { _%>
+import <%= otherEntity.entityAbsolutePackage %>.repository.rowmapper.<%= otherEntity.entityClass %>RowMapper;
+  <%_ if (otherEntity.entityPackage !== entityPackage) { _%>
+import <%= otherEntity.entityAbsolutePackage %>.repository.<%= otherEntity.entityClass %>SqlHelper;
+  <%_ } _%>
 <%_ }); _%>
 import <%= packageName %>.service.EntityManager;
 <%_ if (fieldsContainOwnerManyToMany) { _%>
@@ -149,13 +152,13 @@ _%>
 
     @Override
     public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
-        return createQuery(null, where("id").is(id)).one();
+        return createQuery(null, where("<%= primaryKey.name %>").is(id)).one();
     }
 
 <%_ if (fieldsContainOwnerManyToMany) { _%>
 
     @Override
-    public Mono<<%= persistClass %>> findOneWithEagerRelationships(Long id) {
+    public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) {
         return findById(id);
     }
 
@@ -202,11 +205,15 @@ _%>
 
     @Override
     public Mono<Integer> update(<%= persistClass %> entity) {
-<%_ if (fields.length + reactiveEagerRelations.length > 0) { _%>
+<%_ if (fields.some(field => !field.id) || relationships.some(relationship => !relationship.id && relationship.ownerSide)) { _%>
         //fixme is this the proper way?
         return r2dbcEntityTemplate.update(entity).thenReturn(1);
 <%_ } else { _%>
-        // What can we update on this field?
+        /*
+         * Entity doesn't contain any updatable data, ignore update for compatibility.
+         * Otherwise it fails with `IllegalArgumentException: UPDATE contains no assignments`
+         * https://github.com/spring-projects/spring-data-r2dbc/issues/250#issuecomment-563122844
+         */
         return Mono.just(1);
 <%_ } _%>
     }
@@ -247,23 +254,3 @@ _%>
 
 <%_ } _%>
 }
-
-class <%= entityClass %>SqlHelper {
-    static List<Expression> getColumns(Table table, String columnPrefix) {
-        List<Expression> columns = new ArrayList<>();
-<%_ fields.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("<%= getColumnName(rel.relationshipName) %>_id", table, columnPrefix + "_<%= getColumnName(rel.relationshipName) %>_id"));
-<%_ }); _%>
-        return columns;
-    }
-
-}

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

@@ -16,16 +16,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ if (databaseTypeCassandra) { _%>
 import org.springframework.data.cassandra.repository.ReactiveCassandraRepository;
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
-import <%= packageName %>.repository.search.SearchCouchbaseRepository;
-<%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.data.couchbase.core.query.Query;
 import org.springframework.data.couchbase.repository.ReactiveCouchbaseSortingRepository;
 <%_ } _%>
@@ -64,7 +61,7 @@ import java.util.UUID;
  */
 @SuppressWarnings("unused")
 @Repository
-public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>R2dbc<% } if (databaseTypeMongodb) { %>ReactiveMongo<% } if (databaseTypeCouchbase) { %>ReactiveN1qlCouchbase<% } if (databaseTypeNeo4j) { %>ReactiveNeo4j<% } if (databaseTypeCassandra) { %>ReactiveCassandra<% } %>Repository<<%= persistClass %>, <%= primaryKey.type %>><% if (searchEngineCouchbase) { %>, SearchCouchbaseRepository<<%= persistClass %>, <%= primaryKey.type %>><% } %><% if (databaseTypeSql) { %>, <%= entityClass %>RepositoryInternal<% } %> {
+public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>R2dbc<% } if (databaseTypeMongodb) { %>ReactiveMongo<% } if (databaseTypeCouchbase) { %>ReactiveN1qlCouchbase<% } if (databaseTypeNeo4j) { %>ReactiveNeo4j<% } if (databaseTypeCassandra) { %>ReactiveCassandra<% } %>Repository<<%= persistClass %>, <%= primaryKey.type %>><% if (databaseTypeSql) { %>, <%= entityClass %>RepositoryInternal<% } %> {
 
 <%_ if (!paginationNo) { _%>
 
@@ -107,7 +104,7 @@ if (databaseTypeSql) {
     Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
 
     @Override
-    Mono<Void> deleteById(Long id);
+    Mono<Void> deleteById(<%= primaryKey.type %> id);
 
   <%_ } _%>
 
@@ -141,7 +138,7 @@ if (databaseTypeSql) {
     Flux<<%= persistClass %>> findAll();
 
     @Override
-    Mono<<%= persistClass %>> findById(Long id);
+    Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id);
 
     @Override
     <S extends <%= persistClass %>> Mono<S> save(S entity);
@@ -168,7 +165,7 @@ interface <%= entityClass %>RepositoryInternal {
 
     Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
 
-    Mono<Void> deleteById(Long id);
+    Mono<Void> deleteById(<%= primaryKey.type %> id);
   <%_ } _%>
 
 }

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

@@ -0,0 +1,46 @@
+<%#
+ 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.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.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("<%= getColumnName(rel.relationshipName) %>_id", table, columnPrefix + "_<%= getColumnName(rel.relationshipName) %>_id"));
+<%_ }); _%>
+        return columns;
+    }
+}

package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.rowmapper;
+package <%= entityAbsolutePackage %>.repository.rowmapper;
 
 <%_ if (fieldsContainBigDecimal) { _%>
 import java.math.BigDecimal;
@@ -35,9 +35,9 @@ import java.util.function.BiFunction;
 
 import org.springframework.stereotype.Service;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
 import <%= packageName %>.service.ColumnConverter;
 

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

@@ -16,34 +16,45 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.search;
+package <%= entityAbsolutePackage %>.repository.search;
 
-import <%= packageName %>.domain.<%= persistClass %>;
-<%_ if (reactive) { _%>
-  <%_ if (!paginationNo) { _%>
-import org.springframework.data.domain.Pageable;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+
+<%_ if (!paginationNo) { _%>
+  <%_ if (!reactive) { _%>
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
   <%_ } _%>
+import org.springframework.data.domain.Pageable;
+<%_ } _%>
+<%_ if (reactive) { _%>
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
-import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+<%_ } else { _%>
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 <%_ } _%>
+import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.repository.<% if (reactive) {%>Reactive<% } %>ElasticsearchRepository;
+
 <%_ if (reactive) { _%>
 import reactor.core.publisher.Flux;
+<%_ } else { _%>
+import java.util.stream.Stream;
 <%_ } _%>
 <%_ if (primaryKey.typeUUID) { _%>
 
 import java.util.UUID;
 <% } %>
-<%_ if (reactive) { _%>
 
 import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
-<%_ } _%>
 
 /**
  * Spring Data Elasticsearch repository for the {@link <%= persistClass %>} entity.
  */
-public interface <%= entityClass %>SearchRepository extends <% if (reactive) {%>Reactive<% } %>ElasticsearchRepository<<%= persistClass %>, <%= primaryKey.type %>><% if (reactive) {%>, <%= entityClass %>SearchRepositoryInternal<% } %> {
+public interface <%= entityClass %>SearchRepository extends <% if (reactive) {%>Reactive<% } %>ElasticsearchRepository<<%= persistClass %>, <%= primaryKey.type %>>, <%= entityClass %>SearchRepositoryInternal {
 }
 <%_ if (reactive) { _%>
 
@@ -70,4 +81,44 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
             .map(SearchHit::getContent);
     }
 }
+<%_ } else { _%>
+
+interface <%= entityClass %>SearchRepositoryInternal {
+  <%_ if (paginationNo) { _%>
+    Stream<<%= entityClass %>> search(String query);
+  <%_ } else { _%>
+    Page<<%= entityClass %>> search(String query, Pageable pageable);
+  <%_ } _%>
+}
+
+class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass %>SearchRepositoryInternal {
+
+    private final ElasticsearchRestTemplate elasticsearchTemplate;
+
+    <%= entityClass %>SearchRepositoryInternalImpl(ElasticsearchRestTemplate elasticsearchTemplate) {
+        this.elasticsearchTemplate = elasticsearchTemplate;
+    }
+
+  <%_ if (paginationNo) { _%>
+    @Override
+    public Stream<<%= entityClass %>> search(String query) {
+        NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
+        return elasticsearchTemplate
+            .search(nativeSearchQuery, <%= entityClass %>.class)
+            .map(SearchHit::getContent)
+            .stream();
+    }
+  <%_ } else { _%>
+    @Override
+    public Page<<%= entityClass %>> 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)
+            .stream()
+            .collect(Collectors.toList());
+
+        return new PageImpl<>(hits, pageable, hits.size());
+    }
+  <%_ } _%>
+}
 <%_ } _%>

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= entityAbsolutePackage %>.service;
 
 <%_
 const serviceClassName = entityClass + 'QueryService';
@@ -44,16 +44,16 @@ import org.springframework.transaction.annotation.Transactional;
 
 import tech.jhipster.service.QueryService;
 
-import <%= packageName %>.domain.<%= persistClass %>;
-import <%= packageName %>.domain.*; // for static metamodels
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.*; // for static metamodels
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
-import <%= packageName %>.service.criteria.<%= entityClass %>Criteria;
+import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 
 /**
@@ -125,6 +125,10 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
     protected Specification<<%= persistClass %>> createSpecification(<%= criteria %> criteria) {
         Specification<<%= persistClass %>> specification = Specification.where(null);
         if (criteria != null) {
+            // This has to be called first, because the distinct method returns null
+            if (criteria.getDistinct() != null) {
+                specification = specification.and(distinct(criteria.getDistinct()));
+            }
             if (criteria.get<%= primaryKey.nameCapitalized %>() != null) {
                 specification = specification.and(<%= getSpecificationBuilder(primaryKey.type) %>(criteria.get<%= primaryKey.nameCapitalized %>(), <%= persistClass %>_.<%= primaryKey.name %>));
             }

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= entityAbsolutePackage %>.service;
 
 <%_
 const instanceType = restClass;
@@ -26,9 +26,9 @@ const listOrFlux = (reactive) ? 'Flux' : 'List';
 const pageOrFlux = (reactive) ? 'Flux' : 'Page';
 _%>
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
 <%_ } else { _%>
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ } _%>
 <%_ if (!paginationNo || relationshipsContainEagerLoad) { _%>
 
@@ -53,7 +53,7 @@ import java.util.UUID;
 <%_ } _%>
 
 /**
- * Service Interface for managing {@link <% if (dtoMapstruct) { %><%= packageName %>.domain.<% } %><%= persistClass %>}.
+ * Service Interface for managing {@link <% if (dtoMapstruct) { %><%= entityAbsolutePackage %>.domain.<% } %><%= persistClass %>}.
  */
 public interface <%= entityClass %>Service {
 

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

@@ -1,10 +1,10 @@
-package <%= packageName %>.service.criteria;
+package <%= entityAbsolutePackage %>.service.criteria;
 
 import java.io.Serializable;
 import java.util.Objects;
 import tech.jhipster.service.Criteria;
 <%_ for (const field of fields) { if (field.fieldIsEnum === true) { _%>
-import <%= packageName %>.domain.enumeration.<%= field.fieldType %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 <%_ } } _%>
 import tech.jhipster.service.filter.BooleanFilter;
 import tech.jhipster.service.filter.DoubleFilter;
@@ -68,8 +68,8 @@ filterVariables.push({ filterType : oauthAwareReferenceFilterType,
 });
 _%>
 /**
- * Criteria class for the {@link <%= packageName %>.domain.<%= persistClass %>} entity. This class is used
- * in {@link <%= packageName %>.web.rest.<%= entityClass %>Resource} to receive all the possible filtering options from
+ * Criteria class for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity. This class is used
+ * in {@link <%= entityAbsolutePackage %>.web.rest.<%= entityClass %>Resource} to receive all the possible filtering options from
  * the Http GET request parameters.
  * For example the following could be a valid request:
  * {@code /<%= entityApiUrl %>?id.greaterThan=5&attr1.contains=something&attr2.specified=false}
@@ -105,6 +105,8 @@ public class <%= entityClass %>Criteria implements Serializable, Criteria {
     private <%- filterVariable.filterType %> <%= filterVariable.name %>;
 <%_ }); _%>
 
+    private Boolean distinct;
+
     public <%= entityClass %>Criteria() {
     }
 
@@ -112,6 +114,7 @@ public class <%= entityClass %>Criteria implements Serializable, Criteria {
 <%_ filterVariables.forEach((filterVariable) => { _%>
         this.<%= filterVariable.name %> = other.<%= filterVariable.name %> == null ? null : other.<%= filterVariable.name %>.copy();
 <%_ }); _%>
+        this.distinct = other.distinct;
     }
 
     @Override
@@ -137,6 +140,14 @@ public class <%= entityClass %>Criteria implements Serializable, Criteria {
 
 <%_ }); _%>
 
+    public Boolean getDistinct() {
+        return distinct;
+    }
+
+    public void setDistinct(Boolean distinct) {
+        this.distinct = distinct;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -148,25 +159,18 @@ public class <%= entityClass %>Criteria implements Serializable, Criteria {
         final <%= entityClass %>Criteria that = (<%= entityClass %>Criteria) o;
         return
 <%_ filterVariables.forEach((filterVariable, index) => { _%>
-  <%_ if (filterVariables.length === index + 1) { _%>
-            Objects.equals(<%= filterVariable.name %>, that.<%= filterVariable.name %>);
-  <%_ } else { _%>
             Objects.equals(<%= filterVariable.name %>, that.<%= filterVariable.name %>) &&
-  <%_ } _%>
 <%_ }); _%>
+            Objects.equals(distinct, that.distinct);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(
 <%_ filterVariables.forEach((filterVariable, index) => { _%>
-  <%_ if (filterVariables.length === (index + 1)) { _%>
-        <%= filterVariable.name %>
-  <%_ } else { _%>
         <%= filterVariable.name %>,
-  <%_ } _%>
 <%_ }); _%>
-        );
+        distinct);
     }
 
     // prettier-ignore
@@ -176,6 +180,7 @@ public class <%= entityClass %>Criteria implements Serializable, Criteria {
 <%_ filterVariables.forEach((field) => { _%>
             (<%= field.name %> != null ? "<%= field.name %>=" + <%= field.name %> + ", " : "") +
 <%_ }); _%>
+            (distinct != null ? "distinct=" + distinct + ", " : "") +
             "}";
     }
 

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

@@ -16,10 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.dto;
+package <%= entityAbsolutePackage %>.service.dto;
 
 import java.util.Objects;
-<%_ if (typeof javadoc != 'undefined') { _%>
+<%_ if (typeof javadoc !== 'undefined') { _%>
 import io.swagger.annotations.ApiModel;
 <%_ } if (importApiModelProperty) { _%>
 import io.swagger.annotations.ApiModelProperty;
@@ -57,11 +57,15 @@ import java.util.UUID;
 import javax.persistence.Lob;
 <%_ } _%>
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
 
+<%_ for (const otherEntity of otherEntities.filter(otherEntity => otherEntity.entityPackage !== entityPackage)) { _%>
+import <%= `${otherEntity.entityAbsolutePackage}.service.dto.${otherEntity.dtoClass}` %>;
+<%_ } _%>
+
 /**
- * A DTO for the {@link <%= packageName %>.domain.<%= persistClass %>} entity.
+ * A DTO for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity.
  */
 <%_ if (typeof javadoc !== 'undefined') { _%>
 @ApiModel(description = "<%- formatAsApiDescription(javadoc) %>")

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service<% if (serviceImpl) { %>.impl<% } %>;
+package <%= entityAbsolutePackage %>.service<% if (serviceImpl) { %>.impl<% } %>;
 
 <%_
 const serviceClassName = serviceImpl ? entityClass + 'ServiceImpl' : entityClass + 'Service';
@@ -34,19 +34,19 @@ const searchRepository = entityInstance  + 'SearchRepository';
 
 _%>
 <%_ if (serviceImpl) { _%>
-import <%= packageName %>.service.<%= entityClass %>Service;
+import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } _%>
-import <%= packageName %>.domain.<%= persistClass %>;
-import <%= packageName %>.repository.<%= entityClass %>Repository;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (isUsingMapsId === true) { _%>
-import <%= packageName %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
+import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
-import <%= packageName %>.repository.search.<%= entityClass %>SearchRepository;
+import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
 <%_ if (dtoMapstruct) { _%>
-import <%= packageName %>.service.dto.<%= dtoClass %>;
-import <%= packageName %>.service.mapper.<%= entityClass %>Mapper;
+import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
+import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -257,7 +257,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
         log.debug("Request to search <%= entityClassPlural %> for query {}", query);<%- include('../../common/search_stream_template', {viaService: false, fromResource: false}); -%>
   <%_ } else { _%>
         log.debug("Request to search for a page of <%= entityClassPlural %> for query {}", query);
-        return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(<% if (searchEngineElasticsearch) { %><%= reactive ? 'query' : 'queryStringQuery(query)' %><% } else { %><%= entityClass %>.PREFIX, query<% } %>, pageable)<%_ if (!dtoMapstruct) { _%>;<% } else { %>
+        return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query, pageable)<%_ if (!dtoMapstruct) { _%>;<% } else { %>
             .map(<%= entityToDtoReference %>);
   <%_ } } _%>
     }

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.mapper;
+package <%= entityAbsolutePackage %>.service.mapper;
 
 import org.mapstruct.BeanMapping;
 import org.mapstruct.MappingTarget;

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service.mapper;
+package <%= entityAbsolutePackage %>.service.mapper;
 
 <%_
 let existingMappings = [];
@@ -38,8 +38,12 @@ _%>
 import java.util.Set;
 <%_ } _%>
 
-import <%= packageName %>.domain.*;
-import <%= packageName %>.service.dto.<%= dtoClass %>;
+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` %>;
+<%_ } _%>
 
 import org.mapstruct.*;
 <%_ if (uuidMapMethod) { _%>