generator-jhipster 7.9.0 → 7.9.3

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.toString().replaceAll("[\n\r\t]", "_"));
+        log.debug("find by criteria : {}", criteria);
         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.toString().replaceAll("[\n\r\t]", "_"), page);
+        log.debug("find by criteria : {}, page: {}", criteria, 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.toString().replaceAll("[\n\r\t]", "_"));
+        log.debug("count by criteria : {}", criteria);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
         return <%= repository %>.count(specification);
     }
@@ -134,7 +134,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
             }
 <%_
 fields.forEach((field) => {
-  if (field.id) return;
+  if (field.id || field.transient) return;
   if (isFilterableType(field.fieldType)) { _%>
             if (criteria.get<%= field.fieldInJavaBeanMethod %>() != null) {
                 specification = specification.and(<%= getSpecificationBuilder(field.fieldType) %>(criteria.get<%= field.fieldInJavaBeanMethod %>(), <%= persistClass %>_.<%= field.fieldName %>));

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

@@ -142,17 +142,19 @@ public interface <%= entityClass %>Service {
      * @return a Mono to signal the deletion
 <%_ } _%>
      */
-    <%- reactive ? 'Mono<Void>' : 'void' %> delete(<%= primaryKey.type %> id);<% if (searchEngine) { %>
+    <%- reactive ? 'Mono<Void>' : 'void' %> delete(<%= primaryKey.type %> id);
+<%_ if (searchEngine) { _%>
 
     /**
      * Search for the <%= entityInstance %> corresponding to the query.
      *
      * @param query the query of the search.
-<%_ if (!paginationNo) { _%>
+  <%_ if (!paginationNo) { _%>
      *
      * @param pageable the pagination information.
-<%_ } _%>
+  <%_ } _%>
      * @return the list of entities.
      */
-    <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);<% } %>
+    <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);
+<%_ } _%>
 }

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

@@ -7,36 +7,12 @@ import tech.jhipster.service.Criteria;
 <%_ for (const field of fields) { if (field.fieldIsEnum === true) { _%>
 import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 <%_ } } _%>
-import tech.jhipster.service.filter.BooleanFilter;
-import tech.jhipster.service.filter.DoubleFilter;
-import tech.jhipster.service.filter.Filter;
-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) { _%>
-import tech.jhipster.service.filter.BigDecimalFilter;
-<%_ } _%>
-<%_ if (fieldsContainDuration) { _%>
-import tech.jhipster.service.filter.DurationFilter;
-<%_ } _%>
-<%_ if (fieldsContainInstant) { _%>
-import tech.jhipster.service.filter.InstantFilter;
-<%_ } _%>
-<%_ if (fieldsContainLocalDate) { _%>
-import tech.jhipster.service.filter.LocalDateFilter;
-<%_ } _%>
-<%_ if (fieldsContainUUID || otherEntityPrimaryKeyTypesIncludesUUID) { _%>
-import tech.jhipster.service.filter.UUIDFilter;
-<%_ } _%>
-<%_ if (fieldsContainZonedDateTime) { _%>
-import tech.jhipster.service.filter.ZonedDateTimeFilter;
-<%_ } _%>
+import tech.jhipster.service.filter.*;
 
 <%_
 var filterVariables = [];
 var extraFilters = {};
-fields.forEach((field) => {
+fields.filter(field => !field.transient).forEach((field) => {
   const fieldType = field.fieldType;
   if (isFilterableType(fieldType)) {
     var filterType;
@@ -78,6 +54,7 @@ _%>
  * fix type specific filters.
  */
 @ParameterObject
+@SuppressWarnings("common-java:DuplicatedBlocks")
 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

@@ -68,6 +68,7 @@ import <%= `${otherEntity.entityAbsolutePackage}.service.dto.${otherEntity.dtoCl
 <%_ if (typeof javadoc !== 'undefined') { _%>
 @Schema(description = "<%- formatAsApiDescription(javadoc) %>")
 <%_ } _%>
+@SuppressWarnings("common-java:DuplicatedBlocks")
 public class <%= dtoClass %> implements Serializable {
 
 <%_ for (reference of dtoReferences) {

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

@@ -127,7 +127,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Override
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> update(<%= instanceType %> <%= instanceName %>) {
-        log.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
+        log.debug("Request to update <%= entityClass %> : {}", <%= instanceName %>);
 <%- include('/partials/update_template', {updatableEntity, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: requiresPersistableImplementation}); -%>
     }
 

package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs

@@ -19,7 +19,7 @@
 package <%= entityAbsolutePackage %>.web.rest;
 
 <%_
-
+const fieldsToTest = fields.filter(field => !field.id && !field.autoGenerate && !field.transient);
 let mapsIdEntity;
 let mapsIdEntityInstance;
 let mapsIdRepoInstance;
@@ -104,7 +104,7 @@ import org.assertj.core.util.IterableUtil;
 import org.apache.commons.collections4.IterableUtils;
 import java.util.concurrent.TimeUnit;
 <%_ } _%>
-<%_ if (databaseTypeSql && reactive) { _%>
+<%_ if ((databaseTypeSql && reactive) || searchEngineElasticsearch) { _%>
 import org.junit.jupiter.api.AfterEach;
 <%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
@@ -246,7 +246,7 @@ import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 @WithMockUser
 class <%= entityClass %>ResourceIT {
 <%_
-for (field of fields.filter(field => !field.id && !field.transient)) {
+for (field of fieldsToTest) {
 const defaultValueName = 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase();
 const updatedValueName = 'UPDATED_' + field.fieldNameUnderscored.toUpperCase();
 const smallerValueName = 'SMALLER_' + field.fieldNameUnderscored.toUpperCase();
@@ -487,7 +487,7 @@ if (field.fieldTypeString || field.blobContentTypeText) {
   <%_ if (fluentMethods) { _%>
         <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>()<%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
             .<%= primaryKey.name %>(UUID.randomUUID())
-  <%_ } _%><% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+  <%_ } _%><% for (field of fieldsToTest) { %>
             .<%= field.fieldName %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>)<% if (field.fieldTypeBinary && !field.blobContentTypeText) { %>
             .<%= field.fieldName %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)<% } %><% } %>;
   <%_ } else { _%>
@@ -495,7 +495,7 @@ if (field.fieldTypeString || field.blobContentTypeText) {
     <%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
         <%= persistInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID());
     <%_ } _%>
-    <%_ for (field of fields.filter(field => !field.id && !field.transient)) { _%>
+    <%_ for (field of fieldsToTest) { _%>
         <%= persistInstance %>.set<%= field.fieldInJavaBeanMethod %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>);
       <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
         <%= persistInstance %>.set<%= field.fieldInJavaBeanMethod %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE);
@@ -584,6 +584,14 @@ _%>
         deleteEntities(em);
     }
 
+<%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+    @AfterEach
+    public void cleanupElasticSearchRepository() {
+        <%= entityInstance %>SearchRepository.deleteAll()<%= callBlock %>;
+        assertThat(<%= entityInstance %>SearchRepository.count()<%= callBlock %>).isEqualTo(0);
+    }
+
 <%_ } _%>
 <%_ if (reactive && testsNeedCsrf) { _%>
     @BeforeEach
@@ -598,9 +606,6 @@ _%>
         <%= entityInstance %>Repository.deleteAll()<%= callBlock %>;
 <%_ } else if (databaseTypeSql && reactive) {  _%>
         deleteEntities(em);
-<%_ } _%>
-<%_ if (searchEngineElasticsearch) { _%>
-        <%= entityInstance %>SearchRepository.deleteAll()<%= callBlock %>;
 <%_ } _%>
         <%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
     }
@@ -649,7 +654,7 @@ _%>
         });
   <%_ } _%>
         <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
-  <%_ for (const field of fields.filter(field => !field.id && !field.transient)) {
+  <%_ for (const field of fieldsToTest) {
     if (field.fieldTypeZonedDateTime) { _%>
         assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>);
     <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
@@ -785,7 +790,7 @@ _%>
     <%_ } _%>
     }
   <%_ } _%>
-  <%_ for (field of fields.filter(field => !field.id && !field.transient)) { _%>
+  <%_ for (field of fieldsToTest) { _%>
     <%_ if (field.fieldValidate) {
       let required = false;
       if (!field.fieldTypeBytes && field.fieldValidate && field.fieldValidationRequired) {
@@ -863,7 +868,7 @@ _%>
         assertThat(<%= entityInstance %>List).isNotNull();
         assertThat(<%= entityInstance %>List).hasSize(1);
         <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(0);
-  <%_ for (const field of fields.filter(field => !field.id && !field.transient)) {
+  <%_ for (const field of fieldsToTest) {
     if (field.fieldTypeZonedDateTime) { _%>
         assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>);
     <%_ } else if ((field.fieldTypeBinary) && !field.blobContentTypeText) { _%>
@@ -902,7 +907,7 @@ _%>
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
 <%_ } _%>
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeCassandra) { _%>
-            <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= idValue %>))<%= !reactive ? ')' : '' %><%_ } _%><% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+            <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= idValue %>))<%= !reactive ? ')' : '' %><%_ } _%><% for (field of fieldsToTest) { %>
   <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))<%= !reactive ? ')' : '' %>
   <%_ } _%>
@@ -989,7 +994,7 @@ _%>
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
 <%_ } _%>
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeCassandra) { _%>
-            <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.<%= primaryKey.name %>").value(<%= reactive ? 'is(' : '' %><%= idValue %>))<%_ } _%><% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+            <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.<%= primaryKey.name %>").value(<%= reactive ? 'is(' : '' %><%= idValue %>))<%_ } _%><% for (field of fieldsToTest) { %>
   <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.<%= field.fieldName %>ContentType").value(<%= reactive ? 'is(' : '' %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))
   <%_ } _%>
@@ -1028,7 +1033,7 @@ _%>
   <%_ } _%>
     }
 
-  <%_ fields.filter(field => !field.id && !field.transient).forEach((searchBy) => { /* we can't filter by all the fields. */_%>
+  <%_ fieldsToTest.forEach((searchBy) => { /* we can't filter by all the fields. */_%>
     <%_ if (isFilterableType(searchBy.fieldType)) { _%>
 
     @Test<%= transactionalAnnotation %>
@@ -1219,7 +1224,7 @@ _%>
             .expectStatus().isOk()
             .expectHeader().contentType(MediaType.APPLICATION_JSON)
             .expectBody()
-            .jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= idValue %>))<% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+            .jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= idValue %>))<% for (field of fieldsToTest) { %>
       <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
             .jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))
       <%_ } _%>
@@ -1255,7 +1260,7 @@ _%>
                 'UUID' : '.toString()'
             }[primaryKey.type] || '';
             _%>
-            .andExpect(jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>()<%= primaryKeyConversion %>)))<% fields.filter(field => !field.id && !field.transient).forEach((field) => { %>
+            .andExpect(jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>()<%= primaryKeyConversion %>)))<% fieldsToTest.forEach((field) => { %>
     <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
             .andExpect(jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)))
     <%_ } _%>
@@ -1336,7 +1341,7 @@ _%>
 <%_ if (!readOnly) { _%>
 
     @Test<%= transactionalAnnotation %>
-    void putNew<%= entityClass %>() throws Exception {
+    void putExisting<%= entityClass %>() throws Exception {
         // Initialize the database
   <%_ if (!primaryKey.derived) { _%>
     <%_ for (field of primaryKey.fields.filter(f => !f.autoGenerateByRepository)) { _%>
@@ -1357,12 +1362,12 @@ _%>
         // Disconnect from session so that the updates on updated<%= persistClass %> are not directly saved in db
         em.detach(updated<%= persistClass %>);
   <%_ } _%>
-  <%_ if (fluentMethods && fields.filter(field => !field.id && !field.transient).length > 0) { _%>
-        updated<%= persistClass %><% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+  <%_ if (fluentMethods && fieldsToTest.length > 0) { _%>
+        updated<%= persistClass %><% for (field of fieldsToTest) { %>
             .<%= field.fieldName %>(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>)<% if (field.fieldTypeBinary && !field.blobContentTypeText) { %>
             .<%= field.fieldName %>ContentType(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)<% } %><% } %>;
   <%_ } else { _%>
-    <%_ for (field of fields.filter(field => !field.id && !field.transient)) { _%>
+    <%_ for (field of fieldsToTest) { _%>
         updated<%= persistClass %>.set<%= field.fieldInJavaBeanMethod %>(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>);
       <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
         updated<%= persistClass %>.set<%= field.fieldInJavaBeanMethod %>ContentType(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE);
@@ -1393,7 +1398,7 @@ _%>
         List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
         assertThat(<%= entityInstance %>List).hasSize(databaseSizeBeforeUpdate);
         <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
-  <%_ for (const field of fields.filter(field => !field.id && !field.transient)) { _%>
+  <%_ for (const field of fieldsToTest) { _%>
     <%_ if (field.fieldTypeZonedDateTime) { _%>
         assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>);
     <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
@@ -1411,7 +1416,7 @@ _%>
             assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore);
             List<<%= persistClass %>> <%= entityInstance %>SearchList = IterableUtils.toList(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
         <%= persistClass %> test<%= entityClass %>Search = <%= entityInstance %>SearchList.get(searchDatabaseSizeAfter - 1);
-    <%_ for (const field of fields.filter(field => !field.id && !field.transient)) { _%>
+    <%_ for (const field of fieldsToTest) { _%>
       <%_ if (field.fieldTypeZonedDateTime) { _%>
             assertThat(test<%= entityClass %>Search.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>);
       <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
@@ -1545,7 +1550,7 @@ _%>
   <%_ } _%>
     }
 
-  <%
+  <%_
     const prepareFieldForPatchTest = (field, includeCb) => {
       const includeField = includeCb();
       const fieldNameUnderscoreUppercased = field.fieldNameUnderscored.toUpperCase();
@@ -1553,7 +1558,7 @@ _%>
       const testWithConstant = includeField ? `UPDATED_${fieldNameUnderscoreUppercased}` : `DEFAULT_${fieldNameUnderscoreUppercased}`;
       return { includeField, updateWithValue, testWithConstant, ...field};
     };
-  %>
+  _%>
     @Test<%= transactionalAnnotation %>
     void partialUpdate<%= entityClass %>WithPatch() throws Exception {
         // Initialize the database
@@ -1564,7 +1569,7 @@ _%>
   <%_ } _%>
         <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
-  <% const fieldsToIncludeInPartialPatchTest = fields.filter(field => !field.id && !field.transient).map(field => prepareFieldForPatchTest(field, () => faker.datatype.boolean())); %>
+  <%_ const fieldsToIncludeInPartialPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => faker.datatype.boolean())); _%>
 <%- include('/partials/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInPartialPatchTest, saveMethod, asEntity, callBlock, callListBlock}); -%>
     }
 
@@ -1578,7 +1583,7 @@ _%>
   <%_ } _%>
         <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 
-  <% const fieldsToIncludeInFullPatchTest = fields.filter(field => !field.id && !field.transient).map(field => prepareFieldForPatchTest(field, () => true)); %>
+  <% const fieldsToIncludeInFullPatchTest = fieldsToTest.map(field => prepareFieldForPatchTest(field, () => true)); %>
 <%- include('/partials/it_patch_update.partial.java.ejs', {fields: fieldsToIncludeInFullPatchTest, saveMethod, asEntity, callBlock, callListBlock}); -%>
     }
 
@@ -1714,7 +1719,7 @@ _%>
         <%= entityInstance %>SearchRepository.save(<%= persistInstance %>)<%= callBlock %>;
   <%_ } _%>
 
-    int databaseSizeBeforeDelete = <%= entityInstance %>Repository.findAll()<%= callListBlock %>.size();
+        int databaseSizeBeforeDelete = <%= entityInstance %>Repository.findAll()<%= callListBlock %>.size();
   <%_ if (searchEngineElasticsearch) { _%>
         int searchDatabaseSizeBefore = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
         assertThat(searchDatabaseSizeBefore).isEqualTo(databaseSizeBeforeDelete);
@@ -1779,7 +1784,7 @@ _%>
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
   <%_ } _%>
   <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeCassandra) { _%>
-            <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= idValue %>))<%= !reactive ? ')' : '' %><%_ } _%><% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+            <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= primaryKey.name %>").value(hasItem(<%= idValue %>))<%= !reactive ? ')' : '' %><%_ } _%><% for (field of fieldsToTest) { %>
   <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
             <%= !reactive ? '.andExpect(' : '.' %>jsonPath("$.[*].<%= field.fieldName %>ContentType").value(hasItem(<%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE))<%= !reactive ? ')' : '' %>
   <%_ } _%>

package/generators/generate-blueprint/constants.mjs

@@ -23,22 +23,36 @@ import { BASE_PRIORITY_NAMES, ENTITY_PRIORITY_NAMES } from '../../lib/constants/
 
 const prioritiesForSub = subGenerator => (subGenerator.startsWith('entit') ? ENTITY_PRIORITY_NAMES : BASE_PRIORITY_NAMES);
 
+export const GENERATE_SNAPSHOTS = 'generateSnapshots';
+export const LINK_JHIPSTER_DEPENDENCY = 'linkJhipsterDependency';
 export const GENERATORS = 'generators';
 export const SUB_GENERATORS = 'subGenerators';
 export const ADDITIONAL_SUB_GENERATORS = 'additionalSubGenerators';
 export const DYNAMIC = 'dynamic';
 export const JS = 'js';
+export const LOCAL_BLUEPRINT_OPTION = 'localBlueprint';
+export const CLI_OPTION = 'cli';
 
 export const SBS = 'sbs';
 export const COMMAND = 'command';
 export const PRIORITIES = 'priorities';
 export const ALL_GENERATORS = 'allGenerators';
+export const ALL_PRIORITIES = 'allPriorities';
 export const WRITTEN = 'written';
 
 /**
  * Options exposed to cli
  */
 export const options = () => ({
+  [GENERATE_SNAPSHOTS]: {
+    desc: 'Generate test snapshots',
+    type: Boolean,
+  },
+  [LINK_JHIPSTER_DEPENDENCY]: {
+    desc: 'Link JHipster dependency for testing',
+    type: Boolean,
+    hide: true,
+  },
   [SUB_GENERATORS]: {
     desc: 'Sub generators to generate',
     type: Array,
@@ -59,11 +73,25 @@ export const options = () => ({
     type: Boolean,
     scope: 'storage',
   },
+  [LOCAL_BLUEPRINT_OPTION]: {
+    desc: 'Generate a local blueprint',
+    type: Boolean,
+    scope: 'storage',
+  },
+  [CLI_OPTION]: {
+    desc: 'Generate a cli for the blueprint',
+    type: Boolean,
+    scope: 'storage',
+  },
   [ALL_GENERATORS]: {
-    desc: 'Use js extension',
+    desc: 'Generate every sub generator',
     type: Boolean,
     scope: 'generator',
   },
+  [ALL_PRIORITIES]: {
+    desc: 'Generate every priority',
+    type: Boolean,
+  },
 });
 
 /**
@@ -74,10 +102,12 @@ export const requiredConfig = () => ({});
 /**
  * Default config that will be used for templates
  */
-export const defaultConfig = () => ({
+export const defaultConfig = ({ config = {} } = {}) => ({
   ...requiredConfig,
   [DYNAMIC]: false,
   [JS]: false,
+  [LOCAL_BLUEPRINT_OPTION]: false,
+  [CLI_OPTION]: !config[LOCAL_BLUEPRINT_OPTION],
   [SUB_GENERATORS]: [],
   [ADDITIONAL_SUB_GENERATORS]: '',
 });
@@ -109,7 +139,14 @@ export const allGeneratorsConfig = () => ({
 });
 
 export const prompts = () => {
+  const { [LOCAL_BLUEPRINT_OPTION]: LOCAL_BLUEPRINT_OPTION_DEFAULT_VALUE, [CLI_OPTION]: CLI_OPTION_DEFAULT_VALUE } = defaultConfig();
   return [
+    {
+      type: 'confirm',
+      name: LOCAL_BLUEPRINT_OPTION,
+      message: 'Do you want to generate a local blueprint inside your application?',
+      default: LOCAL_BLUEPRINT_OPTION_DEFAULT_VALUE,
+    },
     {
       type: 'checkbox',
       name: SUB_GENERATORS,
@@ -130,24 +167,27 @@ export const prompts = () => {
       },
     },
     {
+      when: answers => !answers[LOCAL_BLUEPRINT_OPTION],
       type: 'confirm',
-      name: 'cli',
+      name: CLI_OPTION,
       message: 'Add a cli?',
-      default: true,
+      default: CLI_OPTION_DEFAULT_VALUE,
     },
   ];
 };
 
-export const subGeneratorPrompts = (subGenerator, additionalSubGenerator) => {
+export const subGeneratorPrompts = ({ subGenerator, additionalSubGenerator, localBlueprint }) => {
+  const { [SBS]: SBS_DEFAULT_VALUE } = defaultSubGeneratorConfig();
   return [
     {
       type: 'confirm',
       name: SBS,
       when: !additionalSubGenerator,
       message: `Is ${chalk.yellow(subGenerator)} generator a side-by-side blueprint?`,
-      default: true,
+      default: SBS_DEFAULT_VALUE,
     },
     {
+      when: !localBlueprint,
       type: 'confirm',
       name: COMMAND,
       message: `Is ${chalk.yellow(subGenerator)} generator a cli command?`,

package/generators/generate-blueprint/files.mjs

@@ -16,10 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { LOCAL_BLUEPRINT_OPTION } from './constants.mjs';
 
 export const files = {
   baseFiles: [
     {
+      condition: ctx => !ctx[LOCAL_BLUEPRINT_OPTION],
       templates: [
         '.github/workflows/generator.yml',
         '.eslintrc.json',
@@ -44,18 +46,18 @@ export const generatorFiles = {
   generator: [
     {
       path: 'generators/generator',
-      to: ctx => `generators/${ctx.generator}`,
+      to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
       templates: [{ file: 'generator.mjs.jhi', renameTo: ctx => (ctx.js ? 'generator.js.jhi' : 'generator.mjs.jhi') }],
     },
     {
       path: 'generators/generator',
-      to: ctx => `generators/${ctx.generator}`,
+      to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
       templates: [{ file: 'index.mjs', renameTo: ctx => (ctx.js ? 'index.js' : 'index.mjs') }],
     },
     {
       path: 'generators/generator',
-      to: ctx => `generators/${ctx.generator}`,
-      condition: ctx => !ctx.generator.startsWith('entity'),
+      to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
+      condition: ctx => !ctx.generator.startsWith('entity') && !ctx.application[LOCAL_BLUEPRINT_OPTION],
       templates: [
         {
           file: 'generator.spec.mjs',
@@ -65,7 +67,7 @@ export const generatorFiles = {
     },
     {
       path: 'generators/generator',
-      to: ctx => `generators/${ctx.generator}`,
+      to: ctx => `${ctx.application.blueprintsPath}${ctx.generator}`,
       condition(ctx) {
         return (this.options.force || !ctx.written) && ctx.priorities.find(priority => priority.name === 'writing');
       },