generator-jhipster 7.6.0 → 7.7.0

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.2__create_indexes.n1ql.ejs

@@ -0,0 +1,34 @@
+CREATE INDEX user_mail ON `${bucket}`.`${scope}`.`user`(type, LOWER(email))
+    WHERE `type` = "user"
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_activationKey ON `${bucket}`.`${scope}`.`user`(activationKey)
+    WHERE `type` = "user"
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_resetKey ON `${bucket}`.`${scope}`.`user`(resetKey)
+    WHERE `type` = "user"
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_activated ON `${bucket}`.`${scope}`.`user`(activated)
+    WHERE `type` = "user"
+      AND activated = true
+    WITH { "defer_build" : true };
+
+CREATE INDEX user_non_activated ON `${bucket}`.`${scope}`.`user`(createdDate)
+    WHERE `type` = "user"
+      AND activated = false
+      AND activationKey IS NOT NULL
+    WITH { "defer_build" : true };
+
+<%_ if (isUsingBuiltInAuthority()) { _%>
+CREATE INDEX authority_type ON `${bucket}`.`${scope}`.`authority`(type)
+    WHERE `type` = "authority"
+    WITH { "defer_build" : true };
+<%_ } _%>
+
+<%_ if (authenticationTypeSession) { _%>
+CREATE INDEX token_date ON `${bucket}`.`${scope}`.`persistentToken` %>(tokenDate)
+    WHERE `type` = "persistentToken"
+    WITH { "defer_build" : true };
+<%_ } _%>

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_collections.n1ql.ejs

@@ -0,0 +1,8 @@
+CREATE COLLECTION `${bucket}`.`${scope}`.`user`;
+
+<%_ if (isUsingBuiltInAuthority()) { _%>
+CREATE COLLECTION `${bucket}`.`${scope}`.`authority`;
+<%_ } _%>
+<%_ if (authenticationTypeSession) { _%>
+CREATE COLLECTION `${bucket}`.`${scope}`.`persistentToken`;
+<%_ } _%>

package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2020 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,8 +20,7 @@ package <%= packageName %>;
 
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.couchbase.BucketDefinition;
-import org.testcontainers.couchbase.CouchbaseContainer;
+import org.testcontainers.couchbase.*;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -43,12 +42,14 @@ public class CouchbaseTestContainerExtension implements BeforeAllCallback {
                 .asCompatibleSubstituteFor("couchbase/server");
             couchbase = new CouchbaseContainer(dockerImage)
                 .withBucket(new BucketDefinition(getBucketName()).withQuota(100))
+                .withServiceQuota(CouchbaseService.SEARCH, 1024)
                 .withCredentials("user", "secret");
             couchbase.start();
             System.setProperty("spring.couchbase.connection-string", couchbase.getConnectionString());
             System.setProperty("spring.couchbase.username", couchbase.getUsername());
             System.setProperty("spring.couchbase.password", couchbase.getPassword());
             System.setProperty("jhipster.database.couchbase.bucket-name", getBucketName());
+            System.setProperty("jhipster.database.couchbase.scope-name", "testScope");
             started.set(true);
         }
     }

package/generators/server/templates/couchbase/src/test/java/package/repository/{JHipsterCouchbaseRepositoryTest.java.ejs → CouchbaseSearchRepositoryTest.java.ejs}

@@ -27,12 +27,12 @@ import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class JHipsterCouchbaseRepositoryTest {
+class CouchbaseSearchRepositoryTest {
 
     @MethodSource
     @ParameterizedTest
     void queryString(String query, SearchQuery ftsQuery) {
-        assertThat(JHipsterCouchbaseRepository.searchQuery(query).toString()).isEqualTo(ftsQuery.toString());
+        assertThat(CouchbaseSearchRepository.searchQuery(query).toString()).isEqualTo(ftsQuery.toString());
     }
 
     @SuppressWarnings("unused")

package/generators/server/templates/gradle/profile_prod.gradle.ejs

@@ -31,6 +31,10 @@ if (project.hasProperty("api-docs")) {
     profiles += ",api-docs"
 }
 
+if (project.hasProperty("e2e")) {
+    profiles += ",e2e"
+}
+
 springBoot {
     buildInfo()
 }

package/generators/server/templates/gradle.properties.ejs

@@ -34,7 +34,7 @@ jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
 caffeineVersion=3.0.5
-typesafeConfigVersion=1.4.1
+typesafeConfigVersion=1.4.2
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
 liquibaseHibernate5Version=<%= LIQUIBASE_VERSION %>
@@ -61,23 +61,23 @@ cassandraDriverVersion=4.13.0
 
 # gradle plugin version
 jibPluginVersion=<%= JIB_VERSION %>
-gitPropertiesPluginVersion=2.3.2
+gitPropertiesPluginVersion=2.4.0
 <%_ if (!skipClient) { _%>
-gradleNodePluginVersion=3.1.1
+gradleNodePluginVersion=3.2.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
 liquibasePluginVersion=2.1.1
 <%_ } _%>
 sonarqubePluginVersion=3.3
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=5.3.1
+openapiPluginVersion=5.4.0
 <%_ } _%>
 noHttpCheckstyleVersion=0.0.10
-checkstyleVersion=9.2.1
+checkstyleVersion=9.3
 modernizerPluginVersion=1.6.2
 <%_ if (enableGradleEnterprise) { _%>
 gradleEnterprisePluginVersion=3.8.1
-gradleCommonCustomUserDataPluginVersion=1.6.2
+gradleCommonCustomUserDataPluginVersion=1.6.3
 <%_ } _%>
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

package/generators/server/templates/npmw

@@ -10,22 +10,31 @@ if [ -f "$basedir/mvnw" ]; then
   PATH="$basedir/$builddir/:$PATH"
   NPM_EXE="$basedir/$builddir/node_modules/npm/bin/npm-cli.js"
   NODE_EXE="$basedir/$builddir/node"
-else
+elif [ -f "$basedir/gradlew" ]; then
   bindir="$basedir/build/node/bin"
   repodir="$basedir/build/node/lib/node_modules"
   installCommand="$basedir/gradlew npmSetup"
+else
+  echo "Using npm installed globally"
+  exec npm "$@"
 fi
 
-PATH="$bindir:$PATH"
 NPM_EXE="$repodir/npm/bin/npm-cli.js"
 NODE_EXE="$bindir/node"
 
-if ! [ -x "$NPM_EXE" ]; then
+if [ ! -x "$NPM_EXE" ] || [ ! -x "$NODE_EXE" ]; then
   $installCommand || true
 fi
 
-if ! [ -x "$NPM_EXE" ]; then
-  echo "Using npm installed globally"
+if [ -x "$NODE_EXE" ]; then
+  echo "Using node installed locally $($NODE_EXE --version)"
+  PATH="$bindir:$PATH"
+else
+  NODE_EXE='node'
+fi
+
+if [ ! -x "$NPM_EXE" ]; then
+  echo "Local npm not found, using npm installed globally"
   npm "$@"
 else
   echo "Using npm installed locally $($NODE_EXE $NPM_EXE --version)"

package/generators/server/templates/pom.xml.ejs

@@ -86,6 +86,7 @@
 <%_ } _%>
         <profile.api-docs />
         <profile.tls />
+        <profile.e2e />
 
         <!-- Dependency versions -->
         <jhipster-dependencies.version><%= JHIPSTER_DEPENDENCIES_VERSION %></jhipster-dependencies.version>
@@ -128,27 +129,23 @@
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
         <caffeine.version>3.0.5</caffeine.version>
-        <typesafe.version>1.4.1</typesafe.version>
-<%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-        <!-- This needs to be pinned with the one from neo4j migrations otherwise an older incompatible version from
-        spring fox is used-->
-        <classgraph.version>4.8.87</classgraph.version>
+        <typesafe.version>1.4.2</typesafe.version>
 <%_ } _%>
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-site-plugin.version>3.10.0</maven-site-plugin.version>
+        <maven-site-plugin.version>3.11.0</maven-site-plugin.version>
         <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
-        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+        <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>9.2.1</checkstyle.version>
+        <checkstyle.version>9.3</checkstyle.version>
         <nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
@@ -163,7 +160,7 @@
         <jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 <%_ if (enableSwaggerCodegen) { _%>
-        <openapi-generator-maven-plugin.version>5.3.1</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>5.4.0</openapi-generator-maven-plugin.version>
 <%_ } _%>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
@@ -372,12 +369,6 @@
             <groupId>eu.michael-simons.neo4j</groupId>
             <artifactId>neo4j-migrations-spring-boot-starter</artifactId>
         </dependency>
-        <!-- This needs to be pinned with the one from neo4j migrations otherwise an older incompatible version from spring fox is used-->
-        <dependency>
-            <groupId>io.github.classgraph</groupId>
-            <artifactId>classgraph</artifactId>
-            <version>${classgraph.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>neo4j</artifactId>
@@ -705,6 +696,12 @@
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-jcache</artifactId>
         </dependency>
+  <%_ if (authenticationTypeOauth2 && reactive) { _%>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-security</artifactId>
+        </dependency>
+  <%_ } _%>
 <%_ } _%>
 <%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
         <dependency>
@@ -716,6 +713,18 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.playtika.reactivefeign</groupId>
+            <artifactId>feign-reactor-webclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.playtika.reactivefeign</groupId>
+            <artifactId>feign-reactor-cloud</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.playtika.reactivefeign</groupId>
+            <artifactId>feign-reactor-spring-configuration</artifactId>
+        </dependency>
   <%_ } else { _%>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -726,6 +735,10 @@
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
 <%_ } _%>
 <%_ if (serviceDiscoveryType) { _%>
         <dependency>
@@ -753,30 +766,10 @@
         </dependency>
   <%_ } _%>
 <%_ } _%>
-<%_ if (applicationTypeGateway && authenticationTypeOauth2 && reactive) { _%>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-security</artifactId>
-        </dependency>
-<%_ } _%>
-<%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-<%_ } _%>
-<%_ if (applicationTypeGateway || (applicationTypeMicroservice && reactive)) { _%>
+<%_ if (!reactive && databaseTypeSql) { _%>
         <dependency>
-            <groupId>com.playtika.reactivefeign</groupId>
-            <artifactId>feign-reactor-webclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.playtika.reactivefeign</groupId>
-            <artifactId>feign-reactor-cloud</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.playtika.reactivefeign</groupId>
-            <artifactId>feign-reactor-spring-configuration</artifactId>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-data</artifactId>
         </dependency>
 <%_ } _%>
         <dependency>
@@ -1461,6 +1454,11 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+               </plugin>
 <%_ if (enableSwaggerCodegen) { _%>
                 <plugin>
                     <!--
@@ -2027,7 +2025,7 @@
             </build>
             <properties>
                 <!-- default Spring profiles -->
-                <spring.profiles.active>prod${profile.api-docs}${profile.tls}<%_ if (databaseTypeSql) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
+                <spring.profiles.active>prod${profile.api-docs}${profile.tls}${profile.e2e}<%_ if (databaseTypeSql) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
             </properties>
         </profile>
         <profile>
@@ -2050,7 +2048,11 @@
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-zipkin</artifactId>
+                    <artifactId>spring-cloud-starter-sleuth</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-sleuth-zipkin</artifactId>
                 </dependency>
             </dependencies>
         </profile>
@@ -2165,6 +2167,9 @@
 <%_ if (cypressTests || protractorTests) { _%>
         <profile>
             <id>e2e</id>
+            <properties>
+                <profile.e2e>,e2e</profile.e2e>
+            </properties>
             <build>
                 <finalName>e2e</finalName>
                 <pluginManagement>

package/generators/server/templates/src/main/docker/app.yml.ejs

@@ -76,11 +76,13 @@ _%>
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
       - SPRING_DATA_CASSANDRA_CONTACTPOINTS=<%= baseName.toLowerCase() %>-cassandra
-      - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
-<%_ } else if (prodDatabaseTypeMariadb) { _%>
+<%_ } _%>
+<%_ if (prodDatabaseTypeMariadb) { _%>
       - JHIPSTER_SLEEP=120 # gives time for mariadb server to start
 <%_ } else if (prodDatabaseTypeMssql) { _%>
       - JHIPSTER_SLEEP=60 # gives time for mssql server to start
+<%_ } else if (applicationTypeGateway) { _%>
+      - JHIPSTER_SLEEP=60 # gives time for microservices to boot before the gateway, the entire stack will be ready to accept incomming requests.
 <%_ } else { _%>
       - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
 <%_ } _%>

package/generators/server/templates/src/main/docker/zipkin.yml.ejs

@@ -0,0 +1,25 @@
+<%#
+ 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.
+-%>
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
+services:
+  zipkin:
+    image: <%= DOCKER_ZIPKIN %>
+    ports:
+      - 127.0.0.1:9411:9411

package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs

@@ -24,11 +24,9 @@ import tech.jhipster.config.JHipsterProperties;
 
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.couchbase.client.java.Collection;
 import com.github.couchmove.Couchmove;
 
-import <%= packageName %>.config.couchbase.CustomCouchbaseRepositoryFactoryBean;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties;
@@ -53,7 +51,6 @@ import org.springframework.data.couchbase.core.mapping.event.ValidatingCouchbase
 import org.springframework.data.couchbase.repository.auditing.EnableCouchbaseAuditing;
 <%_ } _%>
 import org.springframework.data.couchbase.repository.config.Enable<%_ if (reactive) { _%>Reactive<% } %>CouchbaseRepositories;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
@@ -61,6 +58,7 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.Duration;
 import java.util.*;
 <%_ if (reactive) { _%>
 import java.lang.reflect.Field;
@@ -74,13 +72,16 @@ import reactor.core.publisher.Flux;
 @Enable<% if (reactive) { %>Reactive<% } %>ElasticsearchRepositories("<%= packageName %>.repository.search")
 <%_ } _%>
 @Profile("!" + JHipsterConstants.SPRING_PROFILE_CLOUD)
-@Enable<% if (reactive) { %>Reactive<% } %>CouchbaseRepositories(basePackages = "<%= packageName %>.repository", repositoryFactoryBeanClass = CustomCouchbaseRepositoryFactoryBean.class<%_ if (searchEngineElasticsearch) { %>,
+@Enable<% if (reactive) { %>Reactive<% } %>CouchbaseRepositories(basePackages = "<%= packageName %>.repository"<%_ if (searchEngineElasticsearch) { %>,
     includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = <% if (reactive) { %>Reactive<% } %>CouchbaseRepository.class)<%_ } _%>)
 <%_ if (!reactive) { _%>
 @EnableCouchbaseAuditing(auditorAwareRef = "springSecurityAuditorAware", dateTimeProviderRef = "")
 <%_ } _%>
 public class DatabaseConfiguration extends AbstractCouchbaseConfiguration {
 
+    private static final String CHANGELOG_COLLECTION = "changelog";
+    private static final String TYPE_KEY = "type";
+
     private final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
 
     private final JHipsterProperties jHipsterProperties;
@@ -164,25 +165,34 @@ public class DatabaseConfiguration extends AbstractCouchbaseConfiguration {
         return mappingCouchbaseConverter;
     }
 
-    /**
-     * Workaround for Couchbase overriding SB default jackson mapper: https://github.com/spring-projects/spring-data-couchbase/issues/1209
-     */
-    @Bean
-    @Primary
-    ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
-        return builder.createXmlMapper(false).build();
-    }
-
     @Bean
     public Couchmove couchmove(Cluster cluster) {
         log.debug("Configuring Couchmove");
         Bucket bucket = cluster.bucket(getBucketName());
-        Couchmove couchmove = new Couchmove(bucket, cluster, "config/couchmove/changelog");
+        Collection collection = bucket.scope(getScopeName()).collection(CHANGELOG_COLLECTION);
+        Couchmove couchmove = new Couchmove(collection, cluster, "config/couchmove/changelog");
         couchmove.migrate();
-        couchmove.buildN1qlDeferredIndexes();
+        couchmove.buildN1qlDeferredIndexes(getScopeName());
         return couchmove;
     }
 
+    @Bean
+    @Profile({JHipsterConstants.SPRING_PROFILE_TEST, JHipsterConstants.SPRING_PROFILE_E2E})
+    public Couchmove waitForIndexes(Couchmove couchmove) {
+        couchmove.waitForN1qlIndexes(getScopeName(), Duration.ofSeconds(60));
+        return couchmove;
+    }
+
+    @Override
+    public String typeKey() {
+        return TYPE_KEY;
+    }
+
+    @Override
+    protected String getScopeName() {
+        return jHipsterProperties.getDatabase().getCouchbase().getScopeName();
+    }
+
     /**
      * Simple singleton to convert {@link ZonedDateTime}s to their {@link Long} representation.
      */

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

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -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;
@@ -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()

package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs

@@ -26,6 +26,11 @@ 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;
@@ -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

@@ -48,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) { _%>
@@ -88,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) { _%>
@@ -104,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)

package/generators/server/templates/src/main/java/package/domain/User.java.ejs

@@ -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
   <%_ } _%>

package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs

@@ -33,15 +33,10 @@ 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 { _%>
@@ -79,10 +74,5 @@ public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
     <% if (reactive) { %>Flux<% } else { %>List<% } %><Authority> findAll();
 <%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><Authority> findAll();
-<%_ } _%>
 
 }