generator-jhipster 7.8.1 → 7.9.2

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.elastic_search.ejs

@@ -23,3 +23,20 @@
 <&_ if (fragment.annotationSection) { -&>
 @org.springframework.data.elasticsearch.annotations.Document(indexName = "<%= entityInstance.toLowerCase() %>")
 <&_ } -&>
+
+<%_ for (const field of fields) { -%>
+  <&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+    <%_ if (field.id && field.fieldName != 'id') { _%>
+    @org.springframework.data.annotation.Id
+    <%_ } _%>
+  <&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { -%>
+  <&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+    <% // just break the cycle // in the reactive area, we already have the annotation in place
+      if (!relationship.ownerSide && !reactive) { %>
+        @org.springframework.data.annotation.Transient
+    <% } %>
+  <&_ } -&>
+<%_ } -%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_cassandra.ejs

@@ -30,7 +30,9 @@ import org.springframework.data.cassandra.core.mapping.Table;
 <&_ } -&>
 
 <&_ if (fragment.annotationSection) { -&>
-@Table("<%= entityInstance %>")
+// Since spring-data-cassandra 3.4.2, table names needs to be in lowercase
+// See https://github.com/spring-projects/spring-data-cassandra/issues/1293#issuecomment-1192555467
+@Table("<%= entityInstance.toLowerCase() %>")
 <&_ } -&>
 
 <%_ for (const field of fields) { _%>

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

@@ -55,7 +55,12 @@ import java.util.UUID;
 <%_ } _%>
 
 /**
- * Spring Data <%= officialDatabaseType %> repository for the <%= persistClass %> entity.
+ * <%= springDataDescription %> repository for the <%= persistClass %> entity.
+<%_ if (containsBagRelationships && databaseTypeSql) { _%>
+ *
+ * When extending this class, extend <%= entityClass %>RepositoryWithBagRelationships too.
+ * For more information refer to https://github.com/jhipster/generator-jhipster/issues/17990.
+<%_ } _%>
  */
 <%_ if (!implementsEagerLoadApis) { _%>
 @SuppressWarnings("unused")

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

@@ -86,7 +86,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * Spring Data <%= officialDatabaseType %> reactive custom repository implementation for the <%= persistClass %> entity.
+ * <%= springDataDescription %> custom repository implementation for the <%= persistClass %> entity.
  */
 @SuppressWarnings("unused")
 class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%= persistClass %>, <%= primaryKey.type %>> implements <%= entityClass %>RepositoryInternal {

package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationships.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.List;
 import java.util.Optional;
@@ -26,7 +26,7 @@ import java.util.UUID;
 
 import org.springframework.data.domain.Page;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 public interface <%= entityClass %>RepositoryWithBagRelationships {
     Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>);

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

@@ -16,14 +16,16 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.HashMap;
 <%_ if (fieldsContainUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
+import java.util.stream.IntStream;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
@@ -32,7 +34,7 @@ import org.hibernate.annotations.QueryHints;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 /**
  * Utility repository to load bag relationships based on https://vladmihalcea.com/hibernate-multiplebagfetchexception/
@@ -40,7 +42,7 @@ import <%= packageName %>.domain.<%= persistClass %>;
 public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%= entityClass %>RepositoryWithBagRelationships {
     @PersistenceContext
     private EntityManager entityManager;
- 
+
     @Override
     public Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>) {
         return <%= entityInstance %>
@@ -49,12 +51,12 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
 <%_ } _%>
         ;
     }
- 
+
     @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
@@ -78,7 +80,10 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
     }
 
     List<<%= persistClass %>> fetch<%= relationship.relationshipNameCapitalizedPlural %>(List<<%= persistClass %>> <%= entityInstancePlural %>) {
-        return entityManager
+        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 distinct <%= entityInstance %> from <%= persistClass %> <%= entityInstance %> left join fetch <%= entityInstance %>.<%= relationship.relationshipFieldNamePlural %> where <%= entityInstance %> in :<%= entityInstancePlural %>",
                 <%= persistClass %>.class
@@ -86,6 +91,8 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
             .setParameter("<%= entityInstancePlural %>", <%= entityInstancePlural %>)
             .setHint(QueryHints.PASS_DISTINCT_THROUGH, false)
             .getResultList();
+        Collections.sort(result, (o1, o2) -> Integer.compare(order.get(o1.get<%= primaryKey.nameCapitalized %>()), order.get(o2.get<%= primaryKey.nameCapitalized %>())));
+        return result;
     }
 <%_ } _%>
 }

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

@@ -53,7 +53,7 @@ import java.util.UUID;
 <%_ } _%>
 
 /**
- * Spring Data <%= officialDatabaseType %> reactive repository for the <%= persistClass %> entity.
+ * <%= springDataDescription %> repository for the <%= persistClass %> entity.
  */
 @SuppressWarnings("unused")
 @Repository

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

@@ -19,6 +19,7 @@
 package <%= entityAbsolutePackage %>.repository.search;
 
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.repository.<%= persistClass %>Repository;
 
 <%_ if (!paginationNo) { _%>
   <%_ if (!reactive) { _%>
@@ -27,8 +28,13 @@ import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.elasticsearch.core.SearchHits;
   <%_ } _%>
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.elasticsearch.search.sort.SortBuilder;
+import java.util.List;
+import org.springframework.data.domain.PageRequest;
 
 <%_ } _%>
 <%_ if (reactive) { _%>
@@ -37,9 +43,13 @@ import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 <%_ } _%>
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.repository.<% if (reactive) {%>Reactive<% } %>ElasticsearchRepository;
-
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 <%_ if (reactive) { _%>
 import reactor.core.publisher.Flux;
 <%_ } else { _%>
@@ -61,6 +71,8 @@ public interface <%= entityClass %>SearchRepository extends <% if (reactive) {%>
 
 interface <%= entityClass %>SearchRepositoryInternal {
     Flux<<%= persistClass %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);
+
+    Flux<<%= persistClass %>> search(Query query);
 }
 
 class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass %>SearchRepositoryInternal {
@@ -77,8 +89,13 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
   <%_ if (!paginationNo) { _%>
         nativeSearchQuery.setPageable(pageable);
   <%_ }_%>
+        return search(nativeSearchQuery);
+    }
+
+    @Override
+    public Flux<<%= persistClass %>> search(Query query) {
         return reactiveElasticsearchTemplate
-            .search(nativeSearchQuery, <%= persistClass %>.class)
+            .search(query, <%= persistClass %>.class)
             .map(SearchHit::getContent);
     }
 }
@@ -87,25 +104,38 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
 interface <%= entityClass %>SearchRepositoryInternal {
   <%_ if (paginationNo) { _%>
     Stream<<%= persistClass %>> search(String query);
+
+    Stream<<%= persistClass %>> search(Query query);
   <%_ } else { _%>
     Page<<%= persistClass %>> search(String query, Pageable pageable);
+
+    Page<<%= persistClass %>> search(Query query);
   <%_ } _%>
+
+    void index(<%= persistClass %> entity);
 }
 
 class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass %>SearchRepositoryInternal {
 
     private final ElasticsearchRestTemplate elasticsearchTemplate;
+    private final <%= entityClass %>Repository repository;
 
-    <%= entityClass %>SearchRepositoryInternalImpl(ElasticsearchRestTemplate elasticsearchTemplate) {
+    <%= entityClass %>SearchRepositoryInternalImpl(ElasticsearchRestTemplate elasticsearchTemplate, <%= entityClass %>Repository repository) {
         this.elasticsearchTemplate = elasticsearchTemplate;
+        this.repository = repository;
     }
 
   <%_ if (paginationNo) { _%>
     @Override
     public Stream<<%= persistClass %>> search(String query) {
         NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
+        return search(nativeSearchQuery);
+    }
+
+    @Override
+    public Stream<<%= persistClass %>> search(Query query) {
         return elasticsearchTemplate
-            .search(nativeSearchQuery, <%= persistClass %>.class)
+            .search(query, <%= persistClass %>.class)
             .map(SearchHit::getContent)
             .stream();
     }
@@ -113,13 +143,20 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
     @Override
     public Page<<%= persistClass %>> search(String query, Pageable pageable) {
         NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
-        nativeSearchQuery.setPageable(pageable);
-        List<<%= persistClass %>> hits = elasticsearchTemplate.search(nativeSearchQuery, <%= persistClass %>.class).map(SearchHit::getContent)
-            .stream()
-            .collect(Collectors.toList());
+        return search(nativeSearchQuery.setPageable(pageable));
+    }
 
-        return new PageImpl<>(hits, pageable, hits.size());
+    @Override
+    public Page<<%= persistClass %>> search(Query query) {
+        SearchHits<<%= persistClass %>> searchHits = elasticsearchTemplate.search(query, <%= persistClass %>.class);
+        List<<%= persistClass %>> hits = searchHits.map(SearchHit::getContent).stream().collect(Collectors.toList());
+        return new PageImpl<>(hits, query.getPageable(), searchHits.getTotalHits());
     }
   <%_ } _%>
+
+    @Override
+    public void index(<%= persistClass %> entity) {
+        repository.find<% if (implementsEagerLoadApis) { %>OneWithEagerRelationships<% } else { %>ById<% } %>(entity.get<%= primaryKey.nameCapitalized %>()).ifPresent(elasticsearchTemplate::save);
+    }
 }
 <%_ } _%>

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

@@ -78,7 +78,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public List<<%= instanceType %>> findByCriteria(<%= criteria %> criteria) {
-        log.debug("find by criteria : {}", criteria);
+        log.debug("find by criteria : {}", criteria.toString().replaceAll("[\n\r\t]", "_"));
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
 <%_ if (dtoMapstruct) { _%>
         return <%= entityListToDto %>(<%= repository %>.findAll(specification));
@@ -95,7 +95,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public Page<<%= instanceType %>> findByCriteria(<%= criteria %> criteria, Pageable page) {
-        log.debug("find by criteria : {}, page: {}", criteria, page);
+        log.debug("find by criteria : {}, page: {}", criteria.toString().replaceAll("[\n\r\t]", "_"), page);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
 <%_ if (dtoMapstruct) { _%>
         return <%= repository %>.findAll(specification, page)
@@ -112,7 +112,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public long countByCriteria(<%= criteria %> criteria) {
-        log.debug("count by criteria : {}", criteria);
+        log.debug("count by criteria : {}", criteria.toString().replaceAll("[\n\r\t]", "_"));
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
         return <%= repository %>.count(specification);
     }

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

@@ -166,11 +166,11 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     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 (implementsEagerLoadApis) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (dtoMapstruct) { %><% if (!reactive) { %>.stream()<% } %>
+        return <%= entityInstance %>Repository.findAll()<% if (dtoMapstruct) { %><% if (!reactive) { %>.stream()<% } %>
             .map(<%= entityToDtoReference %>)<% if (!reactive) { %>
             .collect(Collectors.toCollection(LinkedList::new))<% } } %>;
 <%_ } else { _%>
-        return <%= entityInstance %>Repository.findAll<% if (reactive) { %>By<% } %>(pageable)<% if (dto !== 'mapstruct') { %>;<% } else { %>
+        return <%= entityInstance %>Repository.findAll<% if (reactive) { %>By<% } %>(pageable)<% if (!dtoMapstruct) { %>;<% } else { %>
             .map(<%= entityToDtoReference %>);<% } %>
 <%_ } _%>
     }

package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs

@@ -406,9 +406,6 @@ public class <%= entityClass %>Resource {
      * @return the {@link ResponseEntity} with status {@code 204 (NO_CONTENT)}.
      */
     @DeleteMapping("/<%= entityApiUrl %>/{id}")
-  <%_ if (reactive) { _%>
-    @ResponseStatus(code = HttpStatus.NO_CONTENT)
-  <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
         log.debug("REST request to delete <%= entityClass %> : {}", id);
 <%- include('../../common/delete_template', {viaService: viaService, fromResource: true}); -%>
@@ -418,8 +415,8 @@ public class <%= entityClass %>Resource {
                 .headers(HeaderUtil.createEntityDeletionAlert(applicationName, <%= enableTranslation %>, ENTITY_NAME, id<% if (primaryKey.type !== 'String') { %>.toString()<% } %>)).build())
             );
     <%_ } else { %>
-            .map(result -> ResponseEntity.noContent()
-            .headers(HeaderUtil.createEntityDeletionAlert(applicationName, <%= enableTranslation %>, ENTITY_NAME, id<% if (primaryKey.type !== 'String') { %>.toString()<% } %>)).build()
+            .then(Mono.just(ResponseEntity.noContent()
+                .headers(HeaderUtil.createEntityDeletionAlert(applicationName, <%= enableTranslation %>, ENTITY_NAME, id<% if (primaryKey.type !== 'String') { %>.toString()<% } %>)).build())
         );
     <%_ } _%>
   <%_ } else { _%>