generator-jhipster 7.6.0 → 7.8.1

package/generators/server/files.js

@@ -108,8 +108,16 @@ const mongoDbFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/MongoDbTestContainerExtension.java',
-          renameTo: generator => `${generator.testDir}MongoDbTestContainerExtension.java`,
+          file: 'package/config/MongoDbTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/MongoDbTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedMongo.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedMongo.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
         },
       ],
     },
@@ -119,14 +127,8 @@ const mongoDbFiles = {
         {
           file: 'META-INF/spring.factories',
         },
-      ],
-    },
-    {
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
         {
-          file: 'package/TestContainersSpringContextCustomizerFactory.java',
-          renameTo: generator => `${generator.testDir}TestContainersSpringContextCustomizerFactory.java`,
+          file: 'testcontainers.properties',
         },
       ],
     },
@@ -222,7 +224,29 @@ const cassandraFiles = {
           file: 'package/CassandraKeyspaceIT.java',
           renameTo: generator => `${generator.testDir}CassandraKeyspaceIT.java`,
         },
-        { file: 'package/AbstractCassandraTest.java', renameTo: generator => `${generator.testDir}AbstractCassandraTest.java` },
+        {
+          file: 'package/config/CassandraTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/CassandraTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedCassandra.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedCassandra.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
       ],
     },
   ],
@@ -332,10 +356,19 @@ const baseServerFiles = {
         { file: 'config/realm-config/jhipster-users-0.json', method: 'copy', renameTo: () => 'realm-config/jhipster-users-0.json' },
       ],
     },
+    {
+      condition: generator => generator.serviceDiscoveryType || generator.applicationTypeGateway || generator.applicationTypeMicroservice,
+      path: DOCKER_DIR,
+      templates: ['zipkin.yml'],
+    },
   ],
   serverBuild: [
     {
-      templates: [{ file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } }],
+      templates: [
+        { file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } },
+        { file: 'devcontainer/devcontainer.json', renameTo: () => '.devcontainer/devcontainer.json' },
+        { file: 'devcontainer/Dockerfile', renameTo: () => '.devcontainer/Dockerfile' },
+      ],
     },
     {
       condition: generator => generator.buildTool === GRADLE,
@@ -364,13 +397,14 @@ const baseServerFiles = {
       templates: [
         { file: 'mvnw', method: 'copy', noEjs: true },
         { file: 'mvnw.cmd', method: 'copy', noEjs: true },
+        { file: '.mvn/jvm.config', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.jar', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.properties', method: 'copy', noEjs: true },
-        { file: '.mvn/wrapper/MavenWrapperDownloader.java', method: 'copy', noEjs: true },
         { file: 'pom.xml', options: { interpolate: INTERPOLATE_REGEX } },
       ],
     },
     {
+      condition: generator => !generator.skipClient,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -1085,8 +1119,12 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/config/KafkaProperties.java',
-          renameTo: generator => `${generator.javaDir}config/KafkaProperties.java`,
+          file: 'package/config/KafkaSseConsumer.java',
+          renameTo: generator => `${generator.javaDir}config/KafkaSseConsumer.java`,
+        },
+        {
+          file: 'package/config/KafkaSseProducer.java',
+          renameTo: generator => `${generator.javaDir}config/KafkaSseProducer.java`,
         },
       ],
     },
@@ -1171,7 +1209,17 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.messageBroker === KAFKA,
+      condition: generator => generator.messageBroker === KAFKA && generator.reactive,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/KafkaResource_reactive.java',
+          renameTo: generator => `${generator.javaDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResource.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA && !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1420,6 +1468,24 @@ const baseServerFiles = {
     {
       condition: generator => generator.messageBroker === KAFKA,
       path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/KafkaTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/KafkaTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedKafka.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedKafka.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA && !generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
       templates: [
         {
           file: 'package/web/rest/KafkaResourceIT.java',
@@ -1427,6 +1493,28 @@ const baseServerFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.messageBroker === KAFKA && generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/KafkaResourceIT_reactive.java',
+          renameTo: generator => `${generator.testDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResourceIT.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA,
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
+      ],
+    },
   ],
   serverJavaUserManagement: [
     {
@@ -1500,7 +1588,6 @@ const baseServerFiles = {
           file: 'package/repository/UserRepository.java',
           renameTo: generator => `${generator.javaDir}repository/UserRepository.java`,
         },
-        { file: 'package/web/rest/UserResource.java', renameTo: generator => `${generator.javaDir}web/rest/UserResource.java` },
         {
           file: 'package/web/rest/PublicUserResource.java',
           renameTo: generator => `${generator.javaDir}web/rest/PublicUserResource.java`,
@@ -1706,7 +1793,8 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      condition: generator =>
+        !generator.skipUserManagement && generator.cucumberTests && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1716,7 +1804,8 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      condition: generator =>
+        !generator.skipUserManagement && generator.cucumberTests && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
       path: SERVER_TEST_RES_DIR,
       templates: [
         {
@@ -1818,6 +1907,14 @@ function writeFiles() {
       this.generateKeyStore();
     },
 
+    cleanupFiles() {
+      if (this.isJhipsterVersionLessThan('7.6.1')) {
+        if (this.authenticationTypeOauth2 && !this.databaseTypeNo) {
+          this.removeFile(`${this.mainJavaPackageDir}web/rest/UserResource.java`);
+        }
+      }
+    },
+
     cleanupOldServerFiles() {
       serverCleanup.cleanupOldServerFiles(
         this,

package/generators/server/index.js

@@ -68,6 +68,8 @@ const NO_WEBSOCKET = websocketTypes.FALSE;
 
 const { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, MAIN_DIR, TEST_DIR } = constants;
 
+const WAIT_TIMEOUT = 3 * 60000;
+
 module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -187,6 +189,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.DOCKER_PROMETHEUS = constants.DOCKER_PROMETHEUS;
         this.DOCKER_GRAFANA = constants.DOCKER_GRAFANA;
         this.DOCKER_COMPOSE_FORMAT_VERSION = constants.DOCKER_COMPOSE_FORMAT_VERSION;
+        this.DOCKER_ZIPKIN = constants.DOCKER_ZIPKIN;
 
         this.JAVA_VERSION = constants.JAVA_VERSION;
         this.JAVA_COMPATIBLE_VERSIONS = constants.JAVA_COMPATIBLE_VERSIONS;
@@ -348,10 +351,10 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.jhiTablePrefix = this.getTableName(this.jhiPrefix);
 
         this.mainJavaDir = SERVER_MAIN_SRC_DIR;
+        this.mainJavaPackageDir = `${SERVER_MAIN_SRC_DIR}${this.packageFolder}/`;
         this.mainJavaResourceDir = SERVER_MAIN_RES_DIR;
-        this.mainJavaPackageDir = `${SERVER_MAIN_RES_DIR}${this.packageFolder}/`;
         this.testJavaDir = SERVER_TEST_SRC_DIR;
-        this.testJavaPackageDir = `${SERVER_MAIN_RES_DIR}${this.packageFolder}/`;
+        this.testJavaPackageDir = `${SERVER_TEST_SRC_DIR}${this.packageFolder}/`;
         this.testResourceDir = SERVER_TEST_RES_DIR;
         this.srcMainDir = MAIN_DIR;
         this.srcTestDir = TEST_DIR;
@@ -473,6 +476,11 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           this.removeFile(`${this.mainJavaPackageDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
           this.removeFile(`${this.testJavaDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
         }
+        if (this.isJhipsterVersionLessThan('7.7.1')) {
+          if (this.buildToolMaven) {
+            this.removeFile('.mvn/wrapper/MavenWrapperDownloader.java');
+          }
+        }
       },
       ...writeFiles(),
       ...super._missingPostWriting(),
@@ -504,32 +512,31 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           } else {
             scriptsStorage.set({
               'docker:db:up': `docker-compose -f src/main/docker/${prodDatabaseType}.yml up -d`,
-              'docker:db:down': `docker-compose -f src/main/docker/${prodDatabaseType}.yml down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f src/main/docker/${prodDatabaseType}.yml down -v`,
             });
           }
         } else {
           const dockerFile = `src/main/docker/${databaseType}.yml`;
           if (databaseType === CASSANDRA) {
             scriptsStorage.set({
-              'docker:db:await': 'wait-on tcp:9042 && sleep 20',
+              'docker:db:await': `wait-on -t ${WAIT_TIMEOUT} tcp:9042 && sleep 20`,
             });
           }
           if (databaseType === COUCHBASE) {
             scriptsStorage.set({
-              'docker:db:await':
-                'echo "Waiting for Couchbase to start" && wait-on http-get://localhost:8091/ui/index.html && sleep 30 && echo "Couchbase started"',
+              'docker:db:await': `echo "Waiting for Couchbase to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:8091/ui/index.html && sleep 30 && echo "Couchbase started"`,
             });
           }
           if (databaseType === COUCHBASE || databaseType === CASSANDRA) {
             scriptsStorage.set({
               'docker:db:build': `docker-compose -f ${dockerFile} build`,
               'docker:db:up': `docker-compose -f ${dockerFile} up -d`,
-              'docker:db:down': `docker-compose -f ${dockerFile} down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f ${dockerFile} down -v`,
             });
           } else if (this.fs.exists(this.destinationPath(dockerFile))) {
             scriptsStorage.set({
               'docker:db:up': `docker-compose -f ${dockerFile} up -d`,
-              'docker:db:down': `docker-compose -f ${dockerFile} down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f ${dockerFile} down -v`,
             });
           } else {
             scriptsStorage.set('docker:db:up', `echo "Docker for db ${databaseType} not configured for application ${this.baseName}"`);
@@ -537,7 +544,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         }
         if (this.jhipsterConfig.searchEngine === ELASTICSEARCH) {
           dockerAwaitScripts.push(
-            'echo "Waiting for Elasticsearch to start" && wait-on "http-get://localhost:9200/_cluster/health?wait_for_status=green&timeout=60s" && echo "Elasticsearch started"'
+            `echo "Waiting for Elasticsearch to start" && wait-on -t ${WAIT_TIMEOUT} "http-get://localhost:9200/_cluster/health?wait_for_status=green&timeout=60s" && echo "Elasticsearch started"`
           );
         }
 
@@ -552,17 +559,17 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
               dockerBuild.push(`npm run docker:${dockerConfig}:build`);
             } else if (dockerConfig === 'jhipster-registry') {
               dockerAwaitScripts.push(
-                'echo "Waiting for jhipster-registry to start" && wait-on http-get://localhost:8761/management/health && echo "jhipster-registry started"'
+                `echo "Waiting for jhipster-registry to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:8761/management/health && echo "jhipster-registry started"`
               );
             } else if (dockerConfig === 'keycloak') {
               dockerAwaitScripts.push(
-                'echo "Waiting for keycloak to start" && wait-on http-get://localhost:9080/auth/realms/jhipster -t 30000 && echo "keycloak started" || echo "keycloak not running, make sure oauth2 server is running"'
+                `echo "Waiting for keycloak to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:9080/auth/realms/jhipster && echo "keycloak started" || echo "keycloak not running, make sure oauth2 server is running"`
               );
             }
 
             scriptsStorage.set(`docker:${dockerConfig}:up`, `docker-compose -f ${dockerFile} up -d`);
             dockerOthersUp.push(`npm run docker:${dockerConfig}:up`);
-            scriptsStorage.set(`docker:${dockerConfig}:down`, `docker-compose -f ${dockerFile} down -v --remove-orphans`);
+            scriptsStorage.set(`docker:${dockerConfig}:down`, `docker-compose -f ${dockerFile} down -v`);
             dockerOthersDown.push(`npm run docker:${dockerConfig}:down`);
           }
         });
@@ -632,21 +639,20 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           'ci:e2e:package':
             'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment -- -Pe2e -Denforcer.skip=true',
           'preci:e2e:server:start': 'npm run docker:db:await --if-present && npm run docker:others:await --if-present',
-          'ci:e2e:server:start': `java -jar ${e2ePackage}.$npm_package_config_packaging --spring.profiles.active=$npm_package_config_default_environment ${javaCommonLog} ${javaTestLog} --logging.level.org.springframework.web=ERROR`,
+          'ci:e2e:server:start': `java -jar ${e2ePackage}.$npm_package_config_packaging --spring.profiles.active=e2e,$npm_package_config_default_environment ${javaCommonLog} ${javaTestLog} --logging.level.org.springframework.web=ERROR`,
         });
       },
       packageJsonE2eScripts() {
         const scriptsStorage = this.packageJson.createStorage('scripts');
         const buildCmd = this.jhipsterConfig.buildTool === GRADLE ? 'gradlew' : 'mvnw';
         if (scriptsStorage.get('e2e')) {
+          const applicationWaitTimeout = WAIT_TIMEOUT * (this.applicationTypeGateway ? 2 : 1);
           scriptsStorage.set({
-            'ci:server:await':
-              'echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on http-get://localhost:$npm_package_config_backend_port/management/health && echo "Server at port $npm_package_config_backend_port started"',
+            'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} http-get://localhost:$npm_package_config_backend_port/management/health && echo "Server at port $npm_package_config_backend_port started"`,
             'pree2e:headless': 'npm run ci:server:await',
             'ci:e2e:run': 'concurrently -k -s first "npm run ci:e2e:server:start" "npm run e2e:headless"',
             'e2e:dev': `concurrently -k -s first "./${buildCmd}" "npm run e2e"`,
-            'e2e:devserver':
-              'concurrently -k -s first "npm run backend:start" "npm start" "wait-on http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"',
+            'e2e:devserver': `concurrently -k -s first "npm run backend:start" "npm start" "wait-on -t ${WAIT_TIMEOUT} http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"`,
           });
         }
       },

package/generators/server/needle-api/needle-server-gradle.js

@@ -20,6 +20,7 @@ const chalk = require('chalk');
 const needleServer = require('./needle-server');
 
 const buildGradlePath = 'build.gradle';
+const gradleSettingsPath = 'settings.gradle';
 
 module.exports = class extends needleServer {
   addProperty(name, value) {
@@ -92,4 +93,41 @@ module.exports = class extends needleServer {
 
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
+
+  addPluginToPluginManagement(id, version) {
+    const errorMessage = `${chalk.yellow('Reference to ')}id ${id} version ${version}${chalk.yellow(' not added.')}`;
+    const rewriteFileModel = this.generateFileModel(
+      gradleSettingsPath,
+      'jhipster-needle-gradle-plugin-management-plugins',
+      `id '${id}' version '${version}'`
+    );
+
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
+
+  addPluginManagementRepository(url, username, password) {
+    const errorMessage = chalk.yellow('Reference to ') + url + chalk.yellow(' not added.');
+    let repository = 'maven {\n';
+    if (url) {
+      repository += `        url "${url}"\n`;
+    }
+    if (username || password) {
+      repository += '        credentials {\n';
+      if (username) {
+        repository += `            username = "${username}"\n`;
+      }
+      if (password) {
+        repository += `            password = "${password}"\n`;
+      }
+      repository += '        }\n';
+    }
+    repository += '    }';
+
+    const rewriteFileModel = this.generateFileModel(
+      gradleSettingsPath,
+      'jhipster-needle-gradle-plugin-management-repositories',
+      repository
+    );
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
 };

package/generators/server/needle-api/needle-server-maven.js

@@ -97,7 +97,7 @@ module.exports = class extends needleServer {
   addProperty(name, value) {
     const errorMessage = `${chalk.yellow('Reference to maven property name ')}
             (name: ${name}, value:${value})${chalk.yellow(' not added.\n')}`;
-    const property = `<${name}>${value}</${name}>`;
+    const property = value ? `<${name}>${value}</${name}>` : `<${name}/>`;
     const rewriteFileModel = this.generateFileModel(pomPath, '<!-- jhipster-needle-maven-property -->', property);
 
     this.addBlockContentToFile(rewriteFileModel, errorMessage);

package/generators/server/templates/.mvn/jvm.config

@@ -0,0 +1 @@
+-XX:+TieredCompilation -XX:TieredStopAtLevel=1

package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

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

@@ -386,6 +386,7 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ } _%>
     implementation "javax.transaction:javax.transaction-api"
 <%_ if (databaseTypeCassandra) { _%>
+    testImplementation "org.testcontainers:cassandra"
     implementation "org.lz4:lz4-java"
 <%_ } _%>
 <%_ if (cacheProviderEhCache) { _%>
@@ -459,11 +460,9 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     testImplementation "org.testcontainers:oracle-xe"
 <%_ } _%>
 <%_ if (messageBrokerKafka) { _%>
-  <%_ if (reactive) { _%>
-    implementation "io.projectreactor.kafka:reactor-kafka"
-  <%_ } else { _%>
-    implementation "org.apache.kafka:kafka-clients"
-  <%_ } _%>
+    implementation "org.springframework.cloud:spring-cloud-stream"
+    implementation "org.springframework.cloud:spring-cloud-starter-stream-kafka"
+    testImplementation "org.springframework.cloud:spring-cloud-stream-test-support"
 <%_ } _%>
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation ("org.springframework.boot:spring-boot-starter-web<% if (reactive) { %>flux<% } %>") {
@@ -521,6 +520,9 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "com.playtika.reactivefeign:feign-reactor-spring-configuration"
 <%_ } _%>
     implementation "org.springframework.security:spring-security-config"
+<%_ if (!reactive && databaseTypeSql) { _%>
+    implementation "org.springframework.security:spring-security-data"
+<%_ } _%>
     implementation "org.springframework.security:spring-security-web"
 <%_ if (communicationSpringWebsocket) { _%>
     implementation "org.springframework.security:spring-security-messaging"

package/generators/server/templates/couchbase/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs

@@ -0,0 +1,91 @@
+<%#
+ 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.
+-%>
+package <%= packageName %>.repository;
+
+import org.springframework.data.couchbase.repository.Query;
+import com.couchbase.client.java.query.QueryScanConsistency;
+import org.springframework.data.couchbase.repository.ScanConsistency;
+import org.springframework.data.domain.*;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.couchbase.client.java.search.SearchQuery;
+import com.couchbase.client.java.search.queries.DocIdQuery;
+import com.couchbase.client.java.search.queries.QueryStringQuery;
+import java.util.LinkedList;
+
+<%_ if (reactive) { _%>
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+<%_ } _%>
+
+import java.util.List;
+
+/**
+ * Couchbase specific {@link org.springframework.data.repository.Repository} interface for search queries.
+ */
+<%_
+    let listOrFlux = reactive ? 'Flux' : 'List';
+    let pageOrFlux = reactive ? 'Flux' : 'Page';
+_%>
+@NoRepositoryBean
+public interface CouchbaseSearchRepository<T, ID> extends JHipsterCouchbaseRepository<T, ID> {
+
+    String SEARCH_CONDITION = "SEARCH(b, #{T(<%= packageName %>.repository.CouchbaseSearchRepository).searchQuery([0]).toString()})";
+
+    static SearchQuery searchQuery(String queryString) {
+        List<String> ids = new LinkedList<>();
+        for (String r : queryString.split(" ")) {
+            if (r.indexOf("id:") == 0) {
+                ids.add(r.substring(3));
+                queryString = queryString.replace(r, "").replaceAll("[ ]+", " ").trim();
+            }
+        }
+        QueryStringQuery query = SearchQuery.queryString(queryString);
+        if (ids.size() != 0) {
+            DocIdQuery docIdQuery = SearchQuery.docId(ids.toArray(new String[0]));
+            if (!queryString.isEmpty()) {
+                return SearchQuery.conjuncts(query, docIdQuery);
+            }
+            return docIdQuery;
+        }
+        return query;
+    }
+
+    @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED)
+    default <%= listOrFlux %><T> search(String queryString) {
+        return findAllById(toIds(searchIds(queryString)));
+    }
+
+    @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED)
+    default <%= pageOrFlux %><T> search(String queryString, Pageable pageable) {
+    <%_ if (reactive) { _%>
+        return findAllById(toIds(searchIds(queryString, pageable)));
+    <%_ } else { _%>
+        Page<T> page = searchIds(queryString, pageable);
+        return new PageImpl<>(findAllById(toIds(page.getContent())), pageable, page.getTotalElements());
+    <%_ } _%>
+    }
+
+    @Query(FIND_IDS_QUERY + " AND " + SEARCH_CONDITION)
+    @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED)
+    <%= listOrFlux %><T> searchIds(String queryString);
+
+    @Query(FIND_IDS_QUERY + " AND " + SEARCH_CONDITION)
+    @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED)
+    <%= pageOrFlux %><T> searchIds(String queryString, Pageable pageable);
+}