generator-jhipster 7.6.0 → 7.8.1

package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -120,7 +117,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 <%_ } _%>
 @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
 @IntegrationTest
-class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class UserResourceIT {
 
     private static final String DEFAULT_LOGIN = "johndoe";
 <%_ if (!authenticationTypeOauth2) { _%>
@@ -128,7 +125,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
 <%_ } _%>
 
 <%_ if (databaseTypeCouchbase) { _%>
-    private static final String DEFAULT_ID = <%= asEntity('User') %>.PREFIX + DEFAULT_LOGIN;
+    private static final String DEFAULT_ID = DEFAULT_LOGIN;
 <%_ } else { _%>
     private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- getPrimaryKeyValue(user.primaryKey.type) %>;
 <%_ } _%>
@@ -266,7 +263,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
     /**
      * Setups the database with one user.
      */
-    public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql ) { %>, EntityManager em<% } _%>) {
+    public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql) { %>, EntityManager em<% } _%>) {
 <%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities().block();
 <%_ } _%>
@@ -336,9 +333,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
             assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
             assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
-            <%_ if (!databaseTypeCassandra) { _%>
+  <%_ if (!databaseTypeCassandra) { _%>
             assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-            <%_ } _%>
+  <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
         });
     }
@@ -479,25 +476,24 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
     }
-<%_ } _%>
 
     @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-<%_ } _%>
+  <%_ } _%>
     void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
         // Initialize the database
         userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
+  <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
         authorityRepository
             .findById(AuthoritiesConstants.USER)
             .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
             .block();
-<%_ } _%>
+  <%_ } _%>
 
         // Get all the users
-<%_ if (reactive) { _%>
-        <%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,DESC")
+  <%_ if (reactive) { _%>
+        <%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,desc")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
@@ -508,14 +504,14 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         assertThat(foundUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
         assertThat(foundUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
         assertThat(foundUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
-  <%_ if (!databaseTypeCassandra) { _%>
+    <%_ if (!databaseTypeCassandra) { _%>
         assertThat(foundUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-  <%_ } _%>
+    <%_ } _%>
         assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
-  <%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
+    <%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
         assertThat(foundUser.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
-  <%_ } _%>
-<%_ } else { _%>
+    <%_ } _%>
+  <%_ } else { _%>
         restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
@@ -524,37 +520,37 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             .andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
             .andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
             .andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
-  <%_ if (!databaseTypeCassandra) { _%>
+    <%_ if (!databaseTypeCassandra) { _%>
             .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
-  <%_ } _%>
+    <%_ } _%>
             .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
-<%_ } _%>
+  <%_ } _%>
     }
 
     @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-<%_ } _%>
+  <%_ } _%>
     void getUser()<% if (!reactive) { %> throws Exception<% } %> {
         // Initialize the database
         userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
+  <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
         authorityRepository
             .findById(AuthoritiesConstants.USER)
             .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
             .block();
-<%_ } _%>
+  <%_ } _%>
 
-<%_ if (searchEngineElasticsearch) { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
         mockUserSearchRepository.save(user);
-<%_ } _%>
-<%_ if (cacheManagerIsAvailable) { _%>
+  <%_ } _%>
+  <%_ if (cacheManagerIsAvailable) { _%>
 
         assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
-<%_ } _%>
+  <%_ } _%>
 
         // Get the user
-<%_ if (reactive) { _%>
+  <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/admin/users/{login}", user.getLogin())
             .exchange()
             .expectStatus().isOk()
@@ -564,16 +560,16 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             .jsonPath("$.firstName").isEqualTo(DEFAULT_FIRSTNAME)
             .jsonPath("$.lastName").isEqualTo(DEFAULT_LASTNAME)
             .jsonPath("$.email").isEqualTo(DEFAULT_EMAIL)
-  <%_ if (!databaseTypeCassandra) { _%>
+    <%_ if (!databaseTypeCassandra) { _%>
             .jsonPath("$.imageUrl").isEqualTo(DEFAULT_IMAGEURL)
-  <%_ } _%>
+    <%_ } _%>
             .jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
                 if (!databaseTypeSql || applicationTypeMicroservice) { %>;
             <%_ } else { _%>
             .jsonPath("$.authorities")
             .isEqualTo(AuthoritiesConstants.USER);
             <% } %>
-<%_ } else { _%>
+  <%_ } else { _%>
         restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -581,36 +577,35 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             .andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
             .andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
             .andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
-  <%_ if (!databaseTypeCassandra) { _%>
+    <%_ if (!databaseTypeCassandra) { _%>
             .andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
-  <%_ } _%>
+    <%_ } _%>
             .andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
-<%_ } _%>
+  <%_ } _%>
 
-<%_ if (cacheProviderMemcached) { _%>
+  <%_ if (cacheProviderMemcached) { _%>
         if (!(cacheManager instanceof NoOpCacheManager)) {
             assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
         }
-<%_ } else if (cacheManagerIsAvailable) { _%>
+  <%_ } else if (cacheManagerIsAvailable) { _%>
         assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
-<%_ } _%>
+  <%_ } _%>
     }
 
     @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-<%_ } _%>
+  <%_ } _%>
     void getNonExistingUser()<% if (!reactive) { %> throws Exception<% } %> {
-<%_ if (reactive) { _%>
+  <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/admin/users/unknown")
             .exchange()
             .expectStatus().isNotFound();
-<%_ } else { _%>
+  <%_ } else { _%>
         restUserMockMvc.perform(get("/api/admin/users/unknown"))
             .andExpect(status().isNotFound());
-<%_ } _%>
+  <%_ } _%>
     }
-<%_ if (!authenticationTypeOauth2) { _%>
 
     @Test
   <%_ if (databaseTypeSql && !reactive) { _%>

package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest.errors;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +43,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @WithMockUser
 @AutoConfigureMockMvc
 @IntegrationTest
-class ExceptionTranslatorIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class ExceptionTranslatorIT {
 
     @Autowired
     private MockMvc mockMvc;

package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest.errors;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +42,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
 @WithMockUser
 @AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 @IntegrationTest
-class ExceptionTranslatorIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class ExceptionTranslatorIT {
 
     @Autowired
     private WebTestClient webTestClient;

package/generators/server/templates/src/test/resources/META-INF/spring.factories.ejs

@@ -1 +1 @@
-org.springframework.test.context.ContextCustomizerFactory = <%= packageName %>.TestContainersSpringContextCustomizerFactory
+org.springframework.test.context.ContextCustomizerFactory = <%= packageName %>.config.TestContainersSpringContextCustomizerFactory

package/generators/server/templates/src/test/resources/config/application.yml.ejs

@@ -72,13 +72,14 @@ spring:
     exclude:
       - org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration
 <%_ } _%>
-<%_ if (serviceDiscoveryEureka) { _%>
+<%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul || messageBrokerKafka) { _%>
   cloud:
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
     config:
       enabled: false
 <%_ } _%>
 <%_ if (serviceDiscoveryConsul) { _%>
-  cloud:
     consul:
       discovery:
         enabled: false
@@ -87,6 +88,23 @@ spring:
         enabled: false
       enabled: false
 <%_ } _%>
+<%_ if (messageBrokerKafka) { _%>
+    stream:
+      kafka:
+        binder:
+          replicationFactor: 1
+          auto-create-topics: true
+        bindings:
+          binding-in-sse:
+            destination: sse-topic
+            content-type: text/plain
+            group: <%= dasherizedBaseName %>
+          binding-out-sse:
+            destination: sse-topic
+            content-type: text/plain
+            group: <%= dasherizedBaseName %>
+<%_ } _%>
+
 <%_ if (databaseTypeSql && !reactive) { _%>
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
@@ -124,10 +142,7 @@ spring:
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
     cassandra:
-      contact-points: localhost
       compression: NONE
-      keyspace-name: cassandra_unit_keyspace
-      local-datacenter: datacenter1
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
   couchbase:
@@ -146,7 +161,6 @@ spring:
     host: localhost
   main:
     allow-bean-definition-overriding: true
-    allow-circular-references: true
 <%_ if (!reactive) { _%>
   mvc:
     pathmatch:
@@ -176,7 +190,7 @@ spring:
     scheduling:
       thread-name-prefix: <%= dasherizedBaseName %>-scheduling-
       pool:
-        size: 1
+        size: 20
   thymeleaf:
     mode: HTML
 <%_ if (authenticationTypeOauth2) { _%>
@@ -198,7 +212,6 @@ server:
 #
 # Full reference is available at: https://www.jhipster.tech/common-application-properties/
 # ===================================================================
-
 jhipster:
   clientApp:
     name: "<%= frontendAppName %>"
@@ -230,18 +243,6 @@ jhipster:
       # security key (this key should be unique for your application, and kept secret)
       key: <%= rememberMeKey %>
 <%_ } _%>
-<%_ if (messageBrokerKafka) { _%>
-kafka:
-  bootstrap-servers: localhost:9092
-  consumer:
-    key.deserializer: org.apache.kafka.common.serialization.StringDeserializer
-    value.deserializer: org.apache.kafka.common.serialization.StringDeserializer
-    group.id: <%= dasherizedBaseName %>
-    auto.offset.reset: earliest
-  producer:
-    key.serializer: org.apache.kafka.common.serialization.StringSerializer
-    value.serializer: org.apache.kafka.common.serialization.StringSerializer
-<%_ } _%>
 
 # ===================================================================
 # Application specific properties

package/generators/server/templates/src/test/resources/testcontainers.properties.ejs

@@ -0,0 +1 @@
+testcontainers.reuse.enable=true

package/generators/spring-boot/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 } from './index.cjs';

package/generators/spring-controller/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/spring-service/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/upgrade/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/upgrade-config/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/workspaces/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/workspaces/index.js

@@ -174,6 +174,7 @@ module.exports = class extends BaseBlueprintGenerator {
             packages: this.packages,
           },
           devDependencies: {
+            rxjs: '^7', // Not required, workaround https://github.com/npm/cli/issues/4437
             concurrently: this.dependabotPackageJson.devDependencies.concurrently,
           },
           scripts: {
@@ -235,7 +236,7 @@ module.exports = class extends BaseBlueprintGenerator {
     if (this.dockerCompose) {
       return {
         'ci:e2e:prepare': 'docker-compose -f docker-compose/docker-compose.yml up -d',
-        'ci:e2e:teardown': 'docker-compose -f docker-compose/docker-compose.yml down -v --remove-orphans',
+        'ci:e2e:teardown': 'docker-compose -f docker-compose/docker-compose.yml down -v',
       };
     }
     return {};

package/lib/constants/logo.cjs

@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+const chalk = require('chalk');
+const packagejs = require('../../package.json');
+
+module.exports.logo = `${chalk.green('        ██╗')}${chalk.red(' ██╗   ██╗ ████████╗ ███████╗   ██████╗ ████████╗ ████████╗ ███████╗')}
+${chalk.green('        ██║')}${chalk.red(' ██║   ██║ ╚══██╔══╝ ██╔═══██╗ ██╔════╝ ╚══██╔══╝ ██╔═════╝ ██╔═══██╗')}
+${chalk.green('        ██║')}${chalk.red(' ████████║    ██║    ███████╔╝ ╚█████╗     ██║    ██████╗   ███████╔╝')}
+${chalk.green('  ██╗   ██║')}${chalk.red(' ██╔═══██║    ██║    ██╔════╝   ╚═══██╗    ██║    ██╔═══╝   ██╔══██║')}
+${chalk.green('  ╚██████╔╝')}${chalk.red(' ██║   ██║ ████████╗ ██║       ██████╔╝    ██║    ████████╗ ██║  ╚██╗')}
+${chalk.green('   ╚═════╝ ')}${chalk.red(' ╚═╝   ╚═╝ ╚═══════╝ ╚═╝       ╚═════╝     ╚═╝    ╚═══════╝ ╚═╝   ╚═╝')}
+                            https://www.jhipster.tech
+${chalk.white('Welcome to JHipster')} ${chalk.yellow(`v${packagejs.version}`)}
+`;