generator-jhipster 7.4.1 → 7.7.0

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.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.
@@ -268,14 +268,14 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
   <%_ if (applicationTypeMonolith) { _%>
         .and()
             .httpBasic()
-        <%_ } _%>
+  <%_ } _%>
         .and()
             .apply(securityConfigurerAdapter());
-  <%_ } else if (authenticationTypeOauth2) { _%>
-    <%_ if (applicationTypeMonolith) { _%>
+<%_ } else if (authenticationTypeOauth2) { _%>
+  <%_ if (applicationTypeMonolith) { _%>
         .and()
             .oauth2Login()
-    <%_ } _%>
+  <%_ } _%>
         .and()
             .oauth2ResourceServer()
                 .jwt()
@@ -283,7 +283,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .and()
             .and()
                 .oauth2Client();
-  <%_ } _%>
+<%_ } _%>
         // @formatter:on
     }
 <%_ if (authenticationTypeJwt) { _%>
@@ -326,7 +326,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
     @Bean
     JwtDecoder jwtDecoder(<%_ if (authenticationTypeOauth2 && applicationTypeMonolith) { _%>ClientRegistrationRepository clientRegistrationRepository, RestTemplateBuilder restTemplateBuilder<%_ } _%>) {
-        NimbusJwtDecoder jwtDecoder = (NimbusJwtDecoder) JwtDecoders.fromOidcIssuerLocation(issuerUri);
+        NimbusJwtDecoder jwtDecoder = JwtDecoders.fromOidcIssuerLocation(issuerUri);
 
         OAuth2TokenValidator<Jwt> audienceValidator = new AudienceValidator(jHipsterProperties.getSecurity().getOauth2().getAudience());
         OAuth2TokenValidator<Jwt> withIssuer = JwtValidators.createDefaultWithIssuer(issuerUri);

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_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.
@@ -112,6 +112,7 @@ import org.springframework.security.web.server.authentication.HttpStatusServerEn
 import org.springframework.security.web.server.authentication.logout.HttpStatusReturningServerLogoutSuccessHandler;
 import org.springframework.security.web.server.csrf.CookieServerCsrfTokenRepository;
 <%_ } _%>
+import org.springframework.security.web.server.header.XFrameOptionsServerHttpHeadersWriter.Mode;
 import org.springframework.security.web.server.header.ReferrerPolicyServerHttpHeadersWriter;
 <%_ if (applicationTypeMicroservice) { _%>
 import org.springframework.security.web.server.savedrequest.NoOpServerRequestCache;
@@ -211,7 +212,7 @@ public class SecurityConfiguration {
         // @formatter:off
         http
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
-                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**", "/swagger-resources/**", "/v2/api-docs", "/v3/api-docs", "/test/**"),
+                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**", "/v3/api-docs/**", "/test/**"),
                 pathMatchers(HttpMethod.OPTIONS, "/**")
             )))
             .csrf()
@@ -255,7 +256,7 @@ public class SecurityConfiguration {
             .and()
                 .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
             .and()
-                .frameOptions().disable()
+                .frameOptions().mode(Mode.DENY)
 <%_ if (applicationTypeMicroservice) { _%>
         .and()
             .requestCache()
@@ -278,11 +279,9 @@ public class SecurityConfiguration {
             .pathMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
             .pathMatchers("/api/**").authenticated()
 <%_ if (applicationTypeGateway) { _%>
-  <%_ if (microfrontend && (authenticationTypeJwt || clientFrameworkVue)) { _%>
             // microfrontend resources are loaded by webpack without authentication, they need to be public
             .pathMatchers("/services/*/*.js").permitAll()
             .pathMatchers("/services/*/*.js.map").permitAll()
-  <%_ } _%>
             .pathMatchers("/services/*/v3/api-docs").hasAuthority(AuthoritiesConstants.ADMIN)
 <%_ } _%>
 <%_ if (applicationTypeMonolith || applicationTypeGateway) { _%>
@@ -308,7 +307,7 @@ public class SecurityConfiguration {
     }
 <%_ if (authenticationTypeOauth2) { _%>
 
-    <%_ if (applicationType === 'gateway') { _%>
+  <%_ if (applicationTypeGateway) { _%>
     private ServerOAuth2AuthorizationRequestResolver authorizationRequestResolver(
         ReactiveClientRegistrationRepository clientRegistrationRepository) {
         DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver =
@@ -325,7 +324,7 @@ public class SecurityConfiguration {
                 uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience())
                     .build());
     }
-    <%_ } _%>
+  <%_ } _%>
 
     Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();

package/generators/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.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.

package/generators/server/templates/src/main/java/package/config/WebConfigurer.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.
@@ -183,9 +183,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             log.debug("Registering CORS filter");
             source.registerCorsConfiguration("/api/**", config);
             source.registerCorsConfiguration("/management/**", config);
-            source.registerCorsConfiguration("/v2/api-docs", config);
             source.registerCorsConfiguration("/v3/api-docs", config);
-            source.registerCorsConfiguration("/swagger-resources", config);
             source.registerCorsConfiguration("/swagger-ui/**", config);
 <%_ if (applicationTypeGateway) { _%>
             source.registerCorsConfiguration("/*/api/**", config);

package/generators/server/templates/src/main/java/package/config/WebsocketConfiguration.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.

package/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.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.

package/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.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.
@@ -23,51 +23,66 @@ import <%= packageName %>.domain.<%= asEntity('User') %>;
 import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.config.Constants;
 
-import com.github.cloudyrock.mongock.ChangeLog;
-import com.github.cloudyrock.mongock.ChangeSet;
-import com.github.cloudyrock.mongock.driver.mongodb.springdata.v3.decorator.impl.MongockTemplate;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import org.springframework.data.mongodb.core.MongoTemplate;
 
 import java.time.Instant;
 
 /**
  * Creates the initial database setup.
  */
-@ChangeLog(order = "001")
+@ChangeUnit(id="users-initialization", order = "001")
 public class InitialSetupMigration {
 
-    @ChangeSet(order = "01", author = "initiator", id = "01-addAuthorities")
-    public void addAuthorities(MongockTemplate mongoTemplate) {
-        Authority adminAuthority = new Authority();
-        adminAuthority.setName(AuthoritiesConstants.ADMIN);
-        Authority userAuthority = new Authority();
-        userAuthority.setName(AuthoritiesConstants.USER);
-        mongoTemplate.save(adminAuthority);
-        mongoTemplate.save(userAuthority);
+    private final MongoTemplate template;
+
+    public InitialSetupMigration(MongoTemplate template) {
+        this.template = template;
     }
+
+    @Execution
+    public void changeSet() {
+        Authority userAuthority = createUserAuthority();
+        userAuthority = template.save(userAuthority);
+        Authority adminAuthority = createAdminAuthority();
+        adminAuthority = template.save(adminAuthority);
 <%_ if (!authenticationTypeOauth2) { _%>
+        addUsers(userAuthority, adminAuthority);
+<%_ } _%>
+    }
 
-    @ChangeSet(order = "02", author = "initiator", id = "02-addUsers")
-    public void addUsers(MongockTemplate mongoTemplate) {
+    @RollbackExecution
+    public void rollback() {
+    }
+
+    private Authority createAuthority(String authority) {
         Authority adminAuthority = new Authority();
-        adminAuthority.setName(AuthoritiesConstants.ADMIN);
-        Authority userAuthority = new Authority();
-        userAuthority.setName(AuthoritiesConstants.USER);
+        adminAuthority.setName(authority);
+        return adminAuthority;
+    }
 
-        <%= asEntity('User') %> adminUser = new <%= asEntity('User') %>();
-        adminUser.setId("user-1");
-        adminUser.setLogin("admin");
-        adminUser.setPassword("$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC");
-        adminUser.setFirstName("admin");
-        adminUser.setLastName("Administrator");
-        adminUser.setEmail("admin@localhost");
-        adminUser.setActivated(true);
-        adminUser.setLangKey("<%= nativeLanguage %>");
-        adminUser.setCreatedBy(Constants.SYSTEM);
-        adminUser.setCreatedDate(Instant.now());
-        adminUser.getAuthorities().add(adminAuthority);
-        adminUser.getAuthorities().add(userAuthority);
-        mongoTemplate.save(adminUser);
+    private Authority createAdminAuthority() {
+        Authority adminAuthority = createAuthority(AuthoritiesConstants.ADMIN);
+        return adminAuthority;
+    }
 
+    private Authority createUserAuthority() {
+        Authority userAuthority = createAuthority(AuthoritiesConstants.USER);
+        return userAuthority;
+    }
+<%_ if (!authenticationTypeOauth2) { _%>
+
+    private void addUsers(Authority userAuthority, Authority adminAuthority) {
+        <%= asEntity('User') %> user = createUser(userAuthority);
+        template.save(user);
+        <%= asEntity('User') %> admin = createAdmin(adminAuthority, userAuthority);
+        template.save(admin);
+    }
+
+
+    private <%= asEntity('User') %> createUser(Authority userAuthority) {
         <%= asEntity('User') %> userUser = new <%= asEntity('User') %>();
         userUser.setId("user-2");
         userUser.setLogin("user");
@@ -80,7 +95,25 @@ public class InitialSetupMigration {
         userUser.setCreatedBy(Constants.SYSTEM);
         userUser.setCreatedDate(Instant.now());
         userUser.getAuthorities().add(userAuthority);
-        mongoTemplate.save(userUser);
+        return userUser;
+    }
+
+    private <%= asEntity('User') %> createAdmin(Authority adminAuthority, Authority userAuthority) {
+        <%= asEntity('User') %> adminUser = new <%= asEntity('User') %>();
+        adminUser.setId("user-1");
+        adminUser.setLogin("admin");
+        adminUser.setPassword("$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC");
+        adminUser.setFirstName("admin");
+        adminUser.setLastName("Administrator");
+        adminUser.setEmail("admin@localhost");
+        adminUser.setActivated(true);
+        adminUser.setLangKey("<%= nativeLanguage %>");
+        adminUser.setCreatedBy(Constants.SYSTEM);
+        adminUser.setCreatedDate(Instant.now());
+        adminUser.getAuthorities().add(adminAuthority);
+        adminUser.getAuthorities().add(userAuthority);
+        return adminUser;
     }
 <%_ } _%>
+
 }

package/generators/server/templates/src/main/java/package/config/dbmigrations/package-info.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.

package/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.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.
@@ -20,6 +20,7 @@ package <%= packageName %>.config.neo4j;
 
 import ac.simons.neo4j.migrations.core.JavaBasedMigration;
 import ac.simons.neo4j.migrations.core.MigrationContext;
+import ac.simons.neo4j.migrations.core.MigrationsException;
 
 import java.io.IOException;
 import java.util.List;
@@ -46,11 +47,16 @@ final class Neo4jMigrations {
     static class V0001__CreateUsers implements JavaBasedMigration {
 
         @Override
-        public void apply(MigrationContext context) throws IOException {
+        public void apply(MigrationContext context) {
 
             ObjectMapper om = new ObjectMapper();
             ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-            Resource[] resources = resourcePatternResolver.getResources("classpath:config/neo4j/migrations/user__*.json");
+            Resource[] resources;
+            try {
+              resources = resourcePatternResolver.getResources("classpath:config/neo4j/migrations/user__*.json");
+            } catch (IOException e) {
+              throw new MigrationsException("Could not load user definition resources.", e);
+            }
 
             JavaType type = om.getTypeFactory().
                 constructMapType(Map.class, String.class, Object.class);
@@ -69,13 +75,17 @@ final class Neo4jMigrations {
             try (Session session = context.getSession()) {
 
                 for (Resource resource : resources) {
-                    Map<String, Object> user = om.readValue(resource.getInputStream(), type);
-                    user.put("user_id", UUID.randomUUID().toString());
-                    List<String> authorities = (List<String>) user.remove("authorities");
-                    user.remove("_class");
-
-                    session.writeTransaction(
-                        t -> t.run(query, Values.parameters("user", user, "authorities", authorities)).consume());
+                    try {
+                        Map<String, Object> user = om.readValue(resource.getInputStream(), type);
+                        user.put("user_id", UUID.randomUUID().toString());
+                        List<String> authorities = (List<String>) user.remove("authorities");
+                        user.remove("_class");
+
+                        session.writeTransaction(
+                            t -> t.run(query, Values.parameters("user", user, "authorities", authorities)).consume());
+                    } catch (IOException e) {
+                        throw new MigrationsException("Could not load resource " + resource.getDescription() + ".", e);
+                    }
                 }
             }
         }

package/generators/server/templates/src/main/java/package/config/neo4j/package-info.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.

package/generators/server/templates/src/main/java/package/config/package-info.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.

package/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.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.

package/generators/server/templates/src/main/java/package/domain/Authority.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.
@@ -26,20 +26,25 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.<%= databaseType %>.core.mapping.Document;
 <%_ } _%>
+<%_ if (databaseTypeCouchbase) { _%>
+import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.couchbase.repository.Collection;
+import static <%= packageName %>.domain.Authority.TYPE_NAME;
+<%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import org.springframework.data.neo4j.core.schema.Id;
 import org.springframework.data.neo4j.core.schema.Node;
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
-  <%_ if (!reactive) { _%>
+  <%_ if (reactive) { _%>
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Persistable;
+import org.springframework.data.relational.core.mapping.Table;
+  <%_ } else { _%>
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Column;
-  <%_ } else { _%>
-import org.springframework.data.annotation.Id;
-import org.springframework.data.domain.Persistable;
-import org.springframework.data.relational.core.mapping.Table;
 
   <%_ } _%>
 <%_ } _%>
@@ -73,11 +78,17 @@ import java.util.Objects;
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
 <%_ } _%>
 public class Authority implements Serializable<% if (databaseTypeSql && reactive) { %>, Persistable<String><% } %> {
 
     private static final long serialVersionUID = 1L;
 
+<%_ if (databaseTypeCouchbase) { _%>
+    public static final String TYPE_NAME = "authority";
+<%_ } _%>
+
     @NotNull
     @Size(max = 50)
     @Id

package/generators/server/templates/src/main/java/package/domain/PersistentToken.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.
@@ -31,8 +31,10 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
+<%_ if (!reactive) { _%>
+import org.springframework.data.mongodb.core.mapping.DBRef;
+<%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
@@ -46,7 +48,9 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.Document;
 import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
 import org.springframework.data.couchbase.core.mapping.id.IdAttribute;
-import org.springframework.data.couchbase.core.mapping.id.IdPrefix;
+import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.couchbase.repository.Collection;
+import static <%= packageName %>.domain.Authority.TYPE_NAME;
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
@@ -86,6 +90,8 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   <%_ if (reactive) { _%>
@@ -102,11 +108,7 @@ public class PersistentToken implements Serializable {
     private static final int MAX_USER_AGENT_LEN = 255;
 
 <%_ if (databaseTypeCouchbase) { _%>
-    public static final String PREFIX = "token";
-
-    @SuppressWarnings("unused")
-    @IdPrefix
-    private String prefix = PREFIX;
+    public static final String TYPE_NAME = "persistentToken";
 
     @Id
     @GeneratedValue(strategy = USE_ATTRIBUTES, delimiter = ID_DELIMITER)
@@ -174,7 +176,7 @@ public class PersistentToken implements Serializable {
   <%_ if (databaseTypeSql) { _%>
     @ManyToOne
   <%_ } _%>
-  <%_ if (databaseTypeMongodb) { _%>
+  <%_ if (databaseTypeMongodb && !reactive) { _%>
     @DBRef
   <%_ } _%>
   <%_ if (databaseTypeNeo4j) { _%>

package/generators/server/templates/src/main/java/package/domain/User.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.
@@ -66,7 +66,9 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.Document;
 import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
 import org.springframework.data.couchbase.core.mapping.id.IdAttribute;
-import org.springframework.data.couchbase.core.mapping.id.IdPrefix;
+import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.couchbase.repository.Collection;
+import static <%= packageName %>.domain.User.TYPE_NAME;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -115,6 +117,8 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   <%_ if (reactive) { _%>
@@ -131,6 +135,10 @@ public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongod
 
     private static final long serialVersionUID = 1L;
 
+<%_ if (databaseTypeCouchbase) { _%>
+    public static final String TYPE_NAME = "user";
+<%_ } _%>
+
 <%_ if (databaseTypeSql) { _%>
     @Id
   <%_ if (!reactive) { _%>
@@ -153,12 +161,6 @@ public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongod
   <%_ } _%>
     @Property("user_id")
 <%_ } else { _%>
-  <%_ if (databaseTypeCouchbase) { _%>
-    public static final String PREFIX = "user";
-
-    @IdPrefix
-    private String prefix = PREFIX;
-  <%_ } _%>
   <%_ if (databaseTypeMongodb || databaseTypeCouchbase) { _%>
     @Id
   <%_ } _%>
@@ -166,10 +168,10 @@ public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongod
     @GeneratedValue(strategy = USE_ATTRIBUTES, delimiter = ID_DELIMITER)
   <%_ } _%>
   <%_ if (databaseTypeCassandra) { _%>
-    <%_ if (!reactive) { _%>
-    @PartitionKey
-    <%_ } else { _%>
+    <%_ if (reactive) { _%>
     @PrimaryKey
+    <%_ } else { _%>
+    @PartitionKey
     <%_ } _%>
   <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>

package/generators/server/templates/src/main/java/package/domain/package-info.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.

package/generators/server/templates/src/main/java/package/management/SecurityMetersService.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.

package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.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.
@@ -24,24 +24,19 @@ import org.springframework.stereotype.Repository;
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
-  <%_ if (!reactive) { _%>
-import org.springframework.data.jpa.repository.JpaRepository;
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
+  <%_ } else { _%>
+import org.springframework.data.jpa.repository.JpaRepository;
   <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
 import org.springframework.data.mongodb.repository.<% if (reactive) { %>Reactive<% } %>MongoRepository;
 <%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-import org.springframework.data.couchbase.repository.Query;
-import com.couchbase.client.java.query.QueryScanConsistency;
-import org.springframework.data.couchbase.repository.ScanConsistency;
-<%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository;
 <%_ } _%>
-<%_ if (databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (databaseTypeNeo4j) { _%>
   <%_ if (reactive) { _%>
 import reactor.core.publisher.Flux;
   <%_ } else { _%>
@@ -77,12 +72,7 @@ _%>
 public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (reactive) { %>R2dbc<% } else { %>Jpa<% } %>Repository<% } else { %><% if (reactive && !databaseTypeCouchbase) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCouchbase) { %>JHipsterCouchbaseRepository<% } %><% } %><Authority, String> {
 <%_ if (databaseTypeNeo4j) { _%>
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
-    <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asEntity('Authority') %>> findAll();
-<%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= asEntity('Authority') %>> findAll();
+    <% if (reactive) { %>Flux<% } else { %>List<% } %><Authority> findAll();
 <%_ } _%>
 
 }

package/generators/server/templates/src/main/java/package/{service → repository}/EntityManager.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.
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= packageName %>.repository;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,7 +44,7 @@ import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.core.sql.Table;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.r2dbc.core.Parameter;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import reactor.core.publisher.Flux;
@@ -54,7 +54,7 @@ import reactor.core.publisher.Mono;
  * Helper class to create SQL selects based on the entity, paging parameters and criteria.
  *
  */
-@Service
+@Component
 public class EntityManager {
     public final static String ENTITY_ALIAS = "e";
     public final static String ALIAS_PREFIX = "e_";