generator-jhipster 7.6.0 → 7.8.1

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

@@ -60,9 +60,6 @@ _%>
 <%_ if (entityAbsolutePackage !== packageName) { _%>
 import <%= packageName %>.web.rest.TestUtil;
 <% } %>
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_
@@ -92,7 +89,7 @@ import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCa
 <%_ if (searchEngineElasticsearch) { _%>
 import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
 <%_ } _%>
-<%_ if (!serviceNo && fieldsContainOwnerManyToMany) { _%>
+<%_ if (!serviceNo && implementsEagerLoadApis) { _%>
 import <%= entityAbsolutePackage %>.service.<%= entityClass %>Service;
 <%_ } _%>
 <%_ if (dtoMapstruct) { _%>
@@ -108,7 +105,7 @@ import org.junit.jupiter.api.AfterEach;
 <%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-<%_ if (searchEngineElasticsearch || fieldsContainOwnerManyToMany || cacheProviderRedis || databaseTypeNeo4j || reactiveSqlTestContainers) { _%>
+<%_ if (searchEngineElasticsearch || implementsEagerLoadApis || cacheProviderRedis || databaseTypeNeo4j || reactiveSqlTestContainers) { _%>
 import org.mockito.Mock;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -119,7 +116,7 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWeb
 <%_ } else { _%>
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 <%_ } _%>
-<%_ if (searchEngineElasticsearch && !paginationNo || fieldsContainOwnerManyToMany) { _%>
+<%_ if (searchEngineElasticsearch && !paginationNo || implementsEagerLoadApis) { _%>
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 <%_ } _%>
@@ -141,7 +138,7 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ if (fieldsContainBlob) { _%>
 import org.springframework.util.Base64Utils;
 <%_ } _%>
-<%_ if (reactive && (fieldsContainOwnerManyToMany || searchEngineElasticsearch)) { _%>
+<%_ if (reactive && (implementsEagerLoadApis || searchEngineElasticsearch)) { _%>
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 <%_ } _%>
@@ -173,7 +170,7 @@ import java.time.ZoneId;
 <%_ if (fieldsContainInstant) { _%>
 import java.time.temporal.ChronoUnit;
 <%_ } _%>
-<%_ if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (!reactive && implementsEagerLoadApis) { _%>
 import java.util.ArrayList;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch && !reactive) { _%>
@@ -209,7 +206,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
   <%_ } _%>
 <%_ } _%>
-<%_ if (searchEngineElasticsearch || fieldsContainOwnerManyToMany) { _%>
+<%_ if (searchEngineElasticsearch || implementsEagerLoadApis) { _%>
 import static org.mockito.Mockito.*;
 <%_ } _%>
 <%_ if (!reactive) { _%>
@@ -226,7 +223,7 @@ import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
  * Integration tests for the {@link <%= entityClass %>Resource} REST controller.
  */
 @IntegrationTest
-<%_ if (cacheProviderRedis || searchEngineElasticsearch || fieldsContainOwnerManyToMany) { _%>
+<%_ if (cacheProviderRedis || searchEngineElasticsearch || implementsEagerLoadApis) { _%>
 @ExtendWith(MockitoExtension.class)
 <%_ } _%>
 <%_ if (reactive) { _%>
@@ -235,7 +232,7 @@ import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 @AutoConfigureMockMvc
 <%_ } _%>
 @WithMockUser
-class <%= entityClass %>ResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class <%= entityClass %>ResourceIT {
 <%_
 for (field of fields.filter(field => !field.id && !field.transient)) {
 const defaultValueName = 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase();
@@ -432,7 +429,7 @@ if (field.fieldTypeString || field.blobContentTypeText) {
     @Autowired
     private UserRepository userRepository;
 <%_ } _%>
-<%_ if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (implementsEagerLoadApis) { _%>
 
     @Mock
     private <%= entityClass %>Repository <%= entityInstance %>RepositoryMock;
@@ -442,7 +439,7 @@ if (field.fieldTypeString || field.blobContentTypeText) {
     @Autowired
     private <%= entityClass %>Mapper <%= entityInstance %>Mapper;
 <%_ } if (!serviceNo) { _%>
-  <%_ if (fieldsContainOwnerManyToMany) { _%>
+  <%_ if (implementsEagerLoadApis) { _%>
 
     @Mock
     private <%= entityClass %>Service <%= entityInstance %>ServiceMock;
@@ -481,11 +478,16 @@ if (field.fieldTypeString || field.blobContentTypeText) {
      */
     public static <%= persistClass %> create<% if (fieldStatus === 'UPDATED_') { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
   <%_ if (fluentMethods) { _%>
-        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>()<% for (field of fields.filter(field => !field.id && !field.transient)) { %>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>()<%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
+            .<%= primaryKey.name %>(UUID.randomUUID())
+  <%_ } _%><% for (field of fields.filter(field => !field.id && !field.transient)) { %>
             .<%= field.fieldName %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>)<% if (field.fieldTypeBinary && !field.blobContentTypeText) { %>
             .<%= field.fieldName %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)<% } %><% } %>;
   <%_ } else { _%>
         <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+    <%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
+        <%= persistInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID());
+    <%_ } _%>
     <%_ for (field of fields.filter(field => !field.id && !field.transient)) { _%>
         <%= persistInstance %>.set<%= field.fieldInJavaBeanMethod %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>);
       <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
@@ -517,13 +519,17 @@ if (field.fieldTypeString || field.blobContentTypeText) {
         <%_ } else { _%>
         <%= asEntity(otherEntityNameCapitalized) %> <%= otherEntityName %>;
           <%_ if (databaseTypeSql && !reactive) { _%>
+            <%_ if (!isUsingMapsId || fieldStatus !== "UPDATED_") { _%>
         if (TestUtil.findAll(em, <%= asEntity(otherEntityNameCapitalized) %>.class).isEmpty()) {
+            <%_ } _%>
             <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(em)<%= createEntityPostfix %>;
             em.persist(<%= otherEntityName %>);
             em.flush();
+            <%_ if (!isUsingMapsId || fieldStatus !== "UPDATED_") { _%>
         } else {
             <%= otherEntityName %> = TestUtil.findAll(em, <%= asEntity(otherEntityNameCapitalized) %>.class).get(0);
         }
+            <%_ } _%>
           <%_ } else { _%>
         <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (databaseType === 'sql') { %>em<% } %>)<%= createEntityPostfix %>;
           <%_ } _%>
@@ -554,7 +560,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.
         }
@@ -597,6 +603,13 @@ _%>
         // Configure the mock search repository
         when(mock<%= entityClass %>SearchRepository.save(any()))
             .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
+  <%_ } _%>
+  <%_ 
+      // overwrite the id field again with null
+      // the create method here is supposed to be used for other tests as well,
+      // which may expect an id to be set (at least in the reactive stack)
+      if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
+        <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(null);
   <%_ } _%>
         // Create the <%= entityClass %>
   <%_ if (dtoMapstruct) { _%>
@@ -813,7 +826,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()
@@ -887,7 +900,7 @@ _%>
   if (field.fieldTypeZonedDateTime) { %>)<% } else
   if (!field.fieldTypeString) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
     }
-<% if (fieldsContainOwnerManyToMany && !databaseTypeNeo4j && !databaseTypeCouchbase) { %>
+<% if (implementsEagerLoadApis && !databaseTypeNeo4j && !databaseTypeCouchbase) { %>
     @SuppressWarnings({"unchecked"})
     void getAll<%= entityClassPlural %>WithEagerRelationshipsIsEnabled() <% if (!reactive) { %>throws Exception <% } %>{
   <%_ if (!serviceNo) { _%>
@@ -1577,7 +1590,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 +1627,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 +1664,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`,
+        },
+      ],
+    },
+  ],
+};