generator-jhipster 8.0.0-beta.2 → 8.0.0-beta.3

package/dist/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs

@@ -47,7 +47,7 @@ class TechnicalStructureTest {
         .optionalLayer("Service").definedBy("..service..")
         .layer("Security").definedBy("..security..")
 <%_ if (hasDomainLayer) { _%>
-        .layer("Persistence").definedBy("..repository..")
+        .optionalLayer("Persistence").definedBy("..repository..")
         .layer("Domain").definedBy("..domain..")
 <%_ } _%>
 

package/dist/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs

@@ -32,11 +32,12 @@ public class JHipsterBlockHoundIntegration implements BlockHoundIntegration {
         builder.allowBlockingCallsInside("com.github.couchmove.repository.CouchbaseRepositoryImpl", "lambda$query$2");
         builder.allowBlockingCallsInside("com.github.couchmove.repository.CouchbaseRepositoryImpl", "lambda$importFtsIndex$1");
 <%_ } _%>
-<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+<%_ if (prodDatabaseTypeMariadb) { _%>
         builder.allowBlockingCallsInside("org.mariadb.r2dbc.message.client.HandshakeResponse", "writeConnectAttributes");
         builder.allowBlockingCallsInside("org.mariadb.r2dbc.client.MariadbPacketDecoder", "decode");
+        builder.allowBlockingCallsInside("org.mariadb.r2dbc.client.SimpleClient", "lambda$receive$18");
 <%_ } _%>
-<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
+<%_ if (prodDatabaseTypeMssql) { _%>
         builder.allowBlockingCallsInside("io.r2dbc.mssql.client.ssl.TdsSslHandler", "createSslHandler");
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>

package/dist/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs

@@ -22,7 +22,7 @@ import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 
 import org.apache.commons.lang3.RandomStringUtils;

package/dist/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs

@@ -20,7 +20,7 @@ package <%= packageName %>.service;
 
 import <%= packageName %>.config.Constants;
 import <%= packageName %>.IntegrationTest;
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import tech.jhipster.config.JHipsterProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

package/dist/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs

@@ -24,7 +24,7 @@ import <%= packageName %>.config.Constants;
 import <%= packageName %>.domain.PersistentToken;
 <%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ } _%>
 <%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.repository.PersistentTokenRepository;

package/dist/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs

@@ -18,7 +18,7 @@
 -%>
 package <%= packageName %>.service.mapper;
 
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
 import <%= packageName %>.service.dto.<%= user.dtoClass %>;
 <%_ if (!authenticationTypeOauth2) { _%>

package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_reactive.java.ejs

@@ -2,8 +2,9 @@ package <%= packageName %>.web.filter;
 
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
-import org.springframework.test.web.reactive.server.WebTestClient;
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -45,11 +46,16 @@ class SpaWebFilterIT {
     @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
     void testFilterDoesNotForwardToIndexForV3ApiDocs() {
         webTestClient
+            .mutate()
+            .responseTimeout(Duration.ofMillis(10000))
+            .build()
             .get()
             .uri("/v3/api-docs")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType(MediaType.APPLICATION_JSON);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_JSON);
     }
 
     @Test

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

@@ -23,7 +23,7 @@ import <%= packageName %>.config.Constants;
 <%_ if (authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
 import <%= packageName %>.repository.AuthorityRepository;
 <%_ } _%>
@@ -69,7 +69,6 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
-
 import java.time.Instant;
 <%_ if (authenticationTypeSession && !reactive && (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)) { _%>
 import java.time.LocalDate;
@@ -84,7 +83,6 @@ import static org.mockito.Mockito.*;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItem;
 <%_ } _%>
-import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 <%_ if (reactive) { _%>
   <%_ if (authenticationUsesCsrf) { _%>
 import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
@@ -108,7 +106,6 @@ import static org.springframework.security.test.web.servlet.response.SecurityMoc
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>
-@WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
 class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
@@ -172,6 +169,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
 <%_ if (reactive) { _%>
     void testAuthenticatedUser() {
         accountWebTestClient
@@ -183,10 +181,7 @@ class AccountResourceIT {
 <%_ } else { _%>
     void testAuthenticatedUser() throws Exception {
         restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> {
-                request.setRemoteUser(TEST_USER_LOGIN);
-                return request;
-            })
+            .with(request -> request)
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
@@ -194,6 +189,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
     void testGetExistingAccount()<% if (!reactive) { %> throws Exception<% } %> {
         Set<String> authorities = new HashSet<>();
         authorities.add(AuthoritiesConstants.ADMIN);
@@ -250,12 +246,16 @@ class AccountResourceIT {
         accountWebTestClient.get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
-            .expectStatus().isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
+    <%_ if (authenticationTypeSession) { _%>
+            .expectStatus().isEqualTo(HttpStatus.OK);
+    <%_ } else { _%>
+            .expectStatus().isEqualTo(HttpStatus.UNAUTHORIZED);
+    <%_ } _%>
 <%_ } else { _%>
     void testGetUnknownAccount() throws Exception {
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_PROBLEM_JSON))
-            .andExpect(status().isInternalServerError());
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 

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

@@ -72,7 +72,6 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>
-@WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
 class AccountResourceIT {
 
@@ -151,11 +150,11 @@ class AccountResourceIT {
         webTestClient.get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
-            .expectStatus().is5xxServerError();
+            .expectStatus().is3xxRedirection();
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError());
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 
@@ -177,6 +176,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
     void testAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         webTestClient
@@ -187,10 +187,7 @@ class AccountResourceIT {
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> {
-                request.setRemoteUser(TEST_USER_LOGIN);
-                return request;
-            })
+            .with(request -> request)
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));

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

@@ -18,7 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-import <%= packageName %>.IntegrationTest;
 <%_ if (authenticationTypeJwt) { _%>
 import static <%= packageName %>.security.jwt.JwtAuthenticationTestUtils.createValidTokenForUser;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +30,7 @@ import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
+import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +54,6 @@ import reactor.core.publisher.Mono;
 
 import static org.mockito.Mockito.*;
 <%_ } _%>
-import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 
 /**
  * Integration tests for the {@link AccountResource} REST controller.
@@ -64,7 +63,6 @@ import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>
-@WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
 class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
@@ -131,6 +129,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
     void testAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         accountWebTestClient
@@ -141,10 +140,7 @@ class AccountResourceIT {
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> {
-                request.setRemoteUser(TEST_USER_LOGIN);
-                return request;
-            })
+            .with(request -> request)
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));

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

@@ -23,7 +23,7 @@ import <%= packageName %>.IntegrationTest;
   <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
   <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 <%_ } _%>
 import <%= packageName %>.web.rest.vm.LoginVM;

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

@@ -25,7 +25,7 @@ import <%= packageName %>.config.Constants;
 <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 <%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;

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

@@ -30,7 +30,7 @@ import <%= packageName %>.config.Constants;
 <%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
 import <%= packageName %>.domain.Authority;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.repository.AuthorityRepository;
 <%_ } _%>

package/dist/generators/spring-cache/generator.mjs

@@ -52,9 +52,9 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
                 }
                 else {
                     // Add noop
-                    source.addEntryToCache = ({ entry }) => { };
+                    source.addEntryToCache = () => { };
                     // Add noop
-                    source.addEntityToCache = ({ entityAbsoluteClass }) => { };
+                    source.addEntityToCache = () => { };
                 }
             },
         });

package/dist/generators/spring-cache/templates/src/main/java/package/config/CacheConfiguration.java.ejs

@@ -221,12 +221,12 @@ public class CacheConfiguration {
             createCache(cm, <%= packageName %>.repository.UserRepository.USERS_BY_LOGIN_CACHE);
             createCache(cm, <%= packageName %>.repository.UserRepository.USERS_BY_EMAIL_CACHE);
     <%_ if (enableHibernateCache) { _%>
-            createCache(cm, <%= packageName %>.domain.<%= user.persistClass %>.class.getName());
+            createCache(cm, <%= user.entityAbsoluteClass %>.class.getName());
             createCache(cm, <%= packageName %>.domain.Authority.class.getName());
-            createCache(cm, <%= packageName %>.domain.<%= user.persistClass %>.class.getName() + ".authorities");
+            createCache(cm, <%= user.entityAbsoluteClass %>.class.getName() + ".authorities");
       <%_ if (authenticationTypeSession) { _%>
             createCache(cm, <%= packageName %>.domain.PersistentToken.class.getName());
-            createCache(cm, <%= packageName %>.domain.<%= user.persistClass %>.class.getName() + ".persistentTokens");
+            createCache(cm, <%= user.entityAbsoluteClass %>.class.getName() + ".persistentTokens");
       <%_ } _%>
     <%_ } _%>
   <%_ } _%>
@@ -778,12 +778,12 @@ public class CacheConfiguration {
             createCache(cm, <%= packageName %>.repository.UserRepository.USERS_BY_LOGIN_CACHE, jcacheConfiguration);
             createCache(cm, <%= packageName %>.repository.UserRepository.USERS_BY_EMAIL_CACHE, jcacheConfiguration);
     <%_ if (enableHibernateCache) { _%>
-            createCache(cm, <%= packageName %>.domain.<%= user.persistClass %>.class.getName(), jcacheConfiguration);
+            createCache(cm, <%= user.entityAbsoluteClass %>.class.getName(), jcacheConfiguration);
             createCache(cm, <%= packageName %>.domain.Authority.class.getName(), jcacheConfiguration);
-            createCache(cm, <%= packageName %>.domain.<%= user.persistClass %>.class.getName() + ".authorities", jcacheConfiguration);
+            createCache(cm, <%= user.entityAbsoluteClass %>.class.getName() + ".authorities", jcacheConfiguration);
       <%_ if (authenticationTypeSession) { _%>
             createCache(cm, <%= packageName %>.domain.PersistentToken.class.getName(), jcacheConfiguration);
-            createCache(cm, <%= packageName %>.domain.<%= user.persistClass %>.class.getName() + ".persistentTokens", jcacheConfiguration);
+            createCache(cm, <%= user.entityAbsoluteClass %>.class.getName() + ".persistentTokens", jcacheConfiguration);
       <%_ } _%>
     <%_ } _%>
   <%_ } _%>

package/dist/generators/spring-cloud-stream/generator.mjs

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2023 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 BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.mjs';
 import cleanupFilesTask from './cleanup.mjs';

package/dist/generators/spring-controller/generator.mjs

@@ -25,6 +25,10 @@ import { askForControllerActions } from './prompts.mjs';
 import statistics from '../statistics.mjs';
 import { GENERATOR_SPRING_CONTROLLER } from '../generator-list.mjs';
 import { applicationOptions, cacheTypes, messageBrokerTypes } from '../../jdl/jhipster/index.mjs';
+import { getMainClassName } from '../java/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadLanguagesConfig } from '../languages/support/index.mjs';
 const { OptionNames } = applicationOptions;
 const cacheProviders = cacheTypes;
 const messageBrokers = messageBrokerTypes;
@@ -87,12 +91,13 @@ export default class SpringControllerGenerator extends BaseGenerator {
     get loading() {
         return {
             loadSharedConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadTranslationConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadLanguagesConfig({ application: this, config: this.jhipsterConfigWithDefaults });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
         };
     }
@@ -133,7 +138,7 @@ export default class SpringControllerGenerator extends BaseGenerator {
                     this.mockRequestImports.length > 3
                         ? ['static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*']
                         : this.mockRequestImports;
-                this.mainClass = this.getMainClassName();
+                this.mainClass = getMainClassName({ baseName: this.jhipsterConfig.baseName });
                 this.controllerActions.forEach(action => {
                     action.actionPath = _.kebabCase(action.actionName);
                     action.actionNameUF = _.upperFirst(action.actionName);

package/dist/generators/spring-data-cassandra/entity-files.mjs

@@ -39,7 +39,7 @@ export const entityFiles = {
         },
     ],
 };
-export function cleanupCassandraEntityFilesTask({ application, entities }) { }
+export function cleanupCassandraEntityFilesTask() { }
 export default async function writeEntityCassandraFiles({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.builtIn && !entity.skipServer)) {
         await this.writeFiles({

package/dist/generators/spring-data-cassandra/generator.mjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs';
 import writeCassandraFilesTask from './files.mjs';

package/dist/generators/spring-data-couchbase/generator.mjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs';
 import writeCouchbaseFilesTask, { cleanupCouchbaseFilesTask } from './files.mjs';

package/dist/generators/spring-data-couchbase/templates/src/main/java/package/domain/_PersistClass_.java.jhi.spring_data_couchbase.ejs

@@ -23,7 +23,7 @@
 <&_ if (fragment.staticImportSection) { -&>
 <%_ if (!embedded) { _%>
 import static <%= packageName %>.config.Constants.ID_DELIMITER;
-import static <%= packageName %>.domain.<%= persistClass %>.TYPE_NAME;
+import static <%= entityAbsoluteClass %>.TYPE_NAME;
 import static org.springframework.data.couchbase.core.mapping.id.GenerationStrategy.UNIQUE;
 <%_ } _%>
 <&_ } -&>

package/dist/generators/spring-data-couchbase/templates/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs

@@ -19,7 +19,7 @@
 package <%= packageName %>.repository;
 
 import <%= packageName %>.domain.PersistentToken;
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import org.springframework.data.couchbase.repository.CouchbaseRepository;
 import java.util.List;
 import java.util.Optional;

package/dist/generators/spring-data-couchbase/templates/src/main/java/package/repository/_EntityClass_Repository.java.ejs

@@ -43,7 +43,7 @@ import org.springframework.stereotype.Repository;
 import java.util.UUID;
 <%_ } _%>
 
-import static <%= packageName %>.domain.<%= persistClass %>.TYPE_NAME;
+import static <%= entityAbsoluteClass %>.TYPE_NAME;
 
 /**
  * Spring Data Couchbase repository for the <%= persistClass %> entity.

package/dist/generators/spring-data-elasticsearch/generator.mjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs';
 import writeElasticsearchFilesTask from './files.mjs';

package/dist/generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs

@@ -18,7 +18,7 @@
 -%>
 package <%= packageName %>.repository.search;
 
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.<%= user.persistClass %>Repository;
 
 <%_ if (reactive) { _%>
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.stream.Stream;
 <%_ } _%>
-<%_ if (databaseTypeCassandra) { _%>
+<%_ if (databaseTypeCassandra || user.primaryKey.hasUUID) { _%>
 
 import java.util.UUID;
 <%_ } _%>

package/dist/generators/spring-data-elasticsearch/templates/src/main/java/package/repository/search/_EntityClass_SearchRepository.java.ejs

@@ -30,7 +30,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.elasticsearch.core.SearchHits;
   <%_ } _%>
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder;
 import java.util.List;
 import org.springframework.data.domain.PageRequest;
 

package/dist/generators/spring-data-mongodb/entity-files.mjs

@@ -27,7 +27,7 @@ export const entityFiles = {
         },
     ],
 };
-export function cleanupMongodbEntityFilesTask({ application, entities }) { }
+export function cleanupMongodbEntityFilesTask() { }
 export default async function writeEntityMongodbFiles({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.builtIn && !entity.skipServer)) {
         await this.writeFiles({

package/dist/generators/spring-data-mongodb/generator.mjs

@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_SPRING_DATA_MONGODB, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs';
 import writeMongodbFilesTask from './files.mjs';
@@ -52,7 +51,6 @@ export default class MongoDBGenerator extends BaseApplicationGenerator {
             addDependencies({ application, source }) {
                 const { reactive } = application;
                 if (application.buildToolMaven) {
-                    const reactiveMongock = false; // workaround https://github.com/mongock/mongock/issues/613
                     source.addMavenDefinition?.({
                         dependencies: [
                             { groupId: 'io.mongock', artifactId: 'mongock-springboot-v3' },

package/dist/generators/spring-data-mongodb/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs

@@ -19,7 +19,7 @@
 package <%= packageName %>.config.dbmigrations;
 
 import <%= packageName %>.domain.Authority;
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.config.Constants;
 

package/dist/generators/spring-data-neo4j/entity-files.mjs

@@ -10,7 +10,7 @@ export const entityFiles = {
         },
     ],
 };
-export function cleanupEntitiesTask({ application, entities }) { }
+export function cleanupEntitiesTask() { }
 export default async function writeEntitiesTask({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.builtIn && !entity.skipServer)) {
         await this.writeFiles({

package/dist/generators/spring-data-neo4j/generator.mjs

@@ -1,3 +1,21 @@
+/**
+ * Copyright 2013-2023 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 BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_NEO4J } from '../generator-list.mjs';
 import writeTask from './files.mjs';

package/dist/generators/spring-data-neo4j/templates/src/main/resources/config/neo4j/migrations/user__admin.json.ejs

@@ -14,5 +14,5 @@
     "ROLE_USER",
     "ROLE_ADMIN"
   ],
-  "_class": "<%= packageName %>.domain.<%= user.persistClass %>"
+  "_class": "<%= user.entityAbsoluteClass %>"
 }

package/dist/generators/spring-data-neo4j/templates/src/main/resources/config/neo4j/migrations/user__user.json.ejs

@@ -13,5 +13,5 @@
   "authorities": [
     "ROLE_USER"
   ],
-  "_class": "<%= packageName %>.domain.<%= user.persistClass %>"
+  "_class": "<%= user.entityAbsoluteClass %>"
 }

package/dist/generators/spring-data-relational/cleanup.mjs

@@ -7,7 +7,7 @@ export default function cleanupOldServerFilesTask({ application }) {
         if (application.devDatabaseTypeH2Any) {
             this.removeFile(`${application.javaPackageSrcDir}domain/util/FixedH2Dialect.java`);
         }
-        if (application.devDatabaseTypePostgres || application.prodDatabaseTypePostgres) {
+        if (application.prodDatabaseTypePostgres) {
             this.removeFile(`${application.javaPackageSrcDir}domain/util/FixedPostgreSQL82Dialect`);
         }
     }