generator-jhipster 7.6.0 → 7.7.0

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

@@ -28,7 +28,7 @@ import java.time.LocalDate;
 import java.time.ZonedDateTime;
 <%_ } if (fieldsContainDuration) { _%>
 import java.time.Duration;
-<%_ } if (fieldsContainUUID) { _%>
+<%_ } if (fieldsContainUUID || otherEntityPrimaryKeyTypesIncludesUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
 import java.util.function.BiFunction;

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

@@ -30,7 +30,7 @@ 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 org.elasticsearch.search.sort.SortBuilder;
 import java.util.List;
 import org.springframework.data.domain.PageRequest;
 
@@ -79,14 +79,12 @@ 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());
+        List<SortBuilder<?>> builders = new SortToSortBuilderListConverter().convert(pageable.getSort());
 
         NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder().withQuery(queryStringQuery(query))
             .withPageable(PageRequest.of(pageable.getPageNumber(), pageable.getPageSize()));
 
-        builders.stream().forEach(builder -> {
-            queryBuilder.withSort(builder);
-        });
+        queryBuilder.withSorts(builders);            
 
         NativeSearchQuery nativeSearchQuery = queryBuilder.build();
   <%_ } else { _%>

package/generators/entity-server/templates/src/main/java/package/repository/search/{SortToFieldSortBuilderConverter.java.ejs → SortToSortBuilderListConverter.java.ejs}

@@ -1,6 +1,7 @@
 package <%= entityAbsolutePackage %>.repository.search;
 
 import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Sort;
@@ -8,11 +9,11 @@ import org.springframework.data.domain.Sort;
 import java.util.ArrayList;
 import java.util.List;
 
-public class SortToFieldSortBuilderConverter implements Converter<Sort, List<FieldSortBuilder>> {
+public class SortToSortBuilderListConverter implements Converter<Sort, List<SortBuilder<?>>> {
 
     @Override
-    public List<FieldSortBuilder> convert(Sort sort) {
-        List<FieldSortBuilder> builders = new ArrayList<>();
+    public List<SortBuilder<?>> convert(Sort sort) {
+        List<SortBuilder<?>> builders = new ArrayList<>();
         sort.stream().forEach(order -> {
             String property = order.getProperty() + ".keyword";
             SortOrder sortOrder = SortOrder.fromString(order.getDirection().name());

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/impl/EntityServiceImpl.java.ejs

@@ -213,7 +213,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, relationshipsContainEagerLoad}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>

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

@@ -77,15 +77,15 @@ public interface <%= entityClass %>Mapper extends EntityMapper<<%= dtoClass %>,
 <%_ /***** Id mapping *****/
 const otherIdReferences = otherDtoReferences.filter(r => !r.relatedReference || r.relatedReference.id);
 if (!embedded && otherIdReferences.length > 0) {
-    if (otherIdReferences.some(r => !r.collection)) { _%>
+  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; _%>
+    <%_ 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 %>);
     <%_ } _%>
@@ -140,7 +140,7 @@ if (!embedded && otherIdReferences.length > 0) {
 
     @Named("<%= mapperName %>")
     @BeanMapping(ignoreByDefault = true)
-    <%_ dtoReferences.filter(r => r.id && r != reference).forEach(r => { _%>
+    <%_ dtoReferences.filter(r => r.id && r !== reference).forEach(r => { _%>
     @Mapping(target = "<%= r.name %>", source = "<%= r.name %>")
     <%_ }); _%>
     <%_ if (otherReference.relationship.relatedField && !otherReference.relationship.relatedField.id) { _%>

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

@@ -392,7 +392,7 @@ public class <%= entityClass %>Resource {
     @Transactional(readOnly = true)
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> get<%= entityClass %>(@PathVariable <%= primaryKey.type %> id) {
-        log.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../common/get_template', {asEntity, asDto, viaService, returnDirectly:false}); -%>
+        log.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../common/get_template', {asEntity, asDto, viaService, returnDirectly:false, relationshipsContainEagerLoad}); -%>
         return ResponseUtil.wrapOrNotFound(<%= instanceName %>);
     }
 <%_ if (!readOnly) { _%>

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

@@ -554,7 +554,7 @@ _%>
                 em.deleteAll("<%= rel.joinTable.name %>").block();
     <%_ } _%>
   <%_ }); _%>
-                em.deleteAll(<%= entityClass %>.class).block();
+                em.deleteAll(<%= persistClass %>.class).block();
         } catch (Exception e) {
             // It can fail, if other entities are still referring this - it will be removed later.
         }
@@ -813,7 +813,7 @@ _%>
   <%_ } _%>
         <%= entityInstance %>Repository.save(<%= persistInstance %>)<%= callBlock %>;
 
-        List<<%= asEntity(entityClass) %>> <%= entityInstance %>List = webTestClient.get().uri(ENTITY_API_URL)
+        List<<%= persistClass %>> <%= entityInstance %>List = webTestClient.get().uri(ENTITY_API_URL)
             .accept(MediaType.APPLICATION_NDJSON)
             .exchange()
             .expectStatus().isOk()
@@ -1577,7 +1577,7 @@ _%>
   <%_ if (databaseTypeCouchbase) { _%>
         SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
   <%_ } _%>
-        List<<%= asEntity(entityClass) %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
+        List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
         assertThat(<%= entityInstance %>List).hasSize(databaseSizeBeforeUpdate);
   <%_ if (searchEngineElasticsearch) { _%>
 
@@ -1614,7 +1614,7 @@ _%>
   <%_ if (databaseTypeCouchbase) { _%>
         SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
   <%_ } _%>
-        List<<%= asEntity(entityClass) %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
+        List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
         assertThat(<%= entityInstance %>List).hasSize(databaseSizeBeforeUpdate);
   <%_ if (searchEngineElasticsearch) { _%>
 
@@ -1651,7 +1651,7 @@ _%>
   <%_ if (databaseTypeCouchbase) { _%>
         SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
   <%_ } _%>
-        List<<%= asEntity(entityClass) %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
+        List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
         assertThat(<%= entityInstance %>List).hasSize(databaseSizeBeforeUpdate);
   <%_ if (searchEngineElasticsearch) { _%>
 

package/generators/export-jdl/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/gae/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/generate-blueprint/constants.mjs

@@ -0,0 +1,146 @@
+/**
+ * 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.
+ *
+ * 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.
+ */
+import chalk from 'chalk';
+
+import GENERATOR_LIST from '../generator-list.js';
+import { BASE_PRIORITY_NAMES, ENTITY_PRIORITY_NAMES } from '../../lib/constants/priorities.mjs';
+
+const prioritiesForSub = subGenerator => (subGenerator.startsWith('entit') ? ENTITY_PRIORITY_NAMES : BASE_PRIORITY_NAMES);
+
+export const GENERATORS = 'generators';
+export const SUB_GENERATORS = 'subGenerators';
+export const DYNAMIC = 'dynamic';
+export const JS = 'js';
+
+export const SBS = 'sbs';
+export const COMMAND = 'command';
+export const PRIORITIES = 'priorities';
+export const ALL_GENERATORS = 'allGenerators';
+export const WRITTEN = 'written';
+
+/**
+ * Options exposed to cli
+ */
+export const options = () => ({
+  [SUB_GENERATORS]: {
+    desc: 'Sub generators to generate',
+    type: Array,
+    scope: 'storage',
+  },
+  [DYNAMIC]: {
+    desc: 'Genate dynamic generators (advanced)',
+    type: Boolean,
+    scope: 'storage',
+  },
+  [JS]: {
+    desc: 'Use js extension',
+    type: Boolean,
+    scope: 'storage',
+  },
+  [ALL_GENERATORS]: {
+    desc: 'Use js extension',
+    type: Boolean,
+    scope: 'generator',
+  },
+});
+
+/**
+ * Config that needs to be written to config
+ */
+export const requiredConfig = () => ({});
+
+/**
+ * Default config that will be used for templates
+ */
+export const defaultConfig = () => ({
+  ...requiredConfig,
+  [DYNAMIC]: false,
+  [JS]: false,
+  [SUB_GENERATORS]: [],
+});
+
+export const defaultSubGeneratorConfig = () => ({
+  [SBS]: true,
+  [COMMAND]: false,
+  [WRITTEN]: false,
+  [PRIORITIES]: [],
+});
+
+const allSubGeneratorConfig = subGenerator => ({
+  [SBS]: true,
+  [COMMAND]: false,
+  [PRIORITIES]: prioritiesForSub(subGenerator),
+});
+
+export const allGeneratorsConfig = () => ({
+  ...requiredConfig,
+  [SUB_GENERATORS]: Object.values(GENERATOR_LIST),
+  [DYNAMIC]: false,
+  [JS]: false,
+  [GENERATORS]: Object.fromEntries(
+    Object.values(GENERATOR_LIST).map(subGenerator => {
+      return [subGenerator, allSubGeneratorConfig(subGenerator)];
+    })
+  ),
+});
+
+export const prompts = () => {
+  return [
+    {
+      type: 'checkbox',
+      name: SUB_GENERATORS,
+      message: 'Which sub-generators do you want to override?',
+      choices: Object.values(GENERATOR_LIST),
+      pageSize: 30,
+      loop: false,
+    },
+    {
+      type: 'confirm',
+      name: 'cli',
+      message: 'Add a cli?',
+      default: true,
+    },
+  ];
+};
+
+export const subGeneratorPrompts = subGenerator => {
+  return [
+    {
+      type: 'confirm',
+      name: SBS,
+      message: `Is ${chalk.yellow(subGenerator)} generator a side-by-side blueprint?`,
+      default: true,
+    },
+    {
+      type: 'confirm',
+      name: COMMAND,
+      message: `Is ${chalk.yellow(subGenerator)} generator a cli command?`,
+      default: false,
+    },
+    {
+      type: 'checkbox',
+      name: PRIORITIES,
+      message: `What task do you want do implement at ${chalk.yellow(subGenerator)} generator?`,
+      choices: prioritiesForSub(subGenerator),
+      pageSize: 30,
+      default: answers => (answers.sbs ? [] : prioritiesForSub(subGenerator)),
+      loop: false,
+    },
+  ];
+};

package/generators/generate-blueprint/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ *
+ * 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.
+ */
+export { default, files, generatorFiles } from './index.mjs';

package/generators/generate-blueprint/files.mjs

@@ -0,0 +1,81 @@
+/**
+ * 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.
+ *
+ * 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.
+ */
+
+export const files = {
+  baseFiles: [
+    {
+      templates: [
+        '.github/workflows/generator.yml',
+        '.eslintrc.json',
+        '.mocharc.cjs',
+        'README.md',
+        'test/utils.mjs',
+        '.prettierignore.jhi.blueprint',
+      ],
+    },
+    {
+      condition: ctx => ctx.cli,
+      templates: [{ file: 'cli/cli.mjs', renameTo: ctx => (ctx.js ? 'cli/cli.js' : 'cli/cli.mjs') }],
+    },
+    {
+      condition: ctx => ctx.commands.length > 0,
+      templates: ['cli/commands.cjs'],
+    },
+  ],
+};
+
+export const generatorFiles = {
+  generator: [
+    {
+      path: 'generators/generator',
+      to: ctx => `generators/${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}`,
+      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'),
+      templates: [
+        {
+          file: 'generator.spec.mjs',
+          renameTo: ctx => (ctx.js ? 'generator.spec.js' : 'generator.spec.mjs'),
+        },
+      ],
+    },
+    {
+      path: 'generators/generator',
+      to: ctx => `generators/${ctx.generator}`,
+      condition(ctx) {
+        return (this.options.force || !ctx.written) && ctx.priorities.find(priority => priority.name === 'writing');
+      },
+      transform: false,
+      templates: [
+        {
+          file: 'templates/template-file.ejs',
+          renameTo: ctx => `templates/template-file-${ctx.generator}.ejs`,
+        },
+      ],
+    },
+  ],
+};