generator-jhipster 7.6.0 → 7.7.0

package/generators/maven/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';

package/generators/openapi-client/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/openapi-client/index.js

@@ -21,8 +21,15 @@ const shelljs = require('shelljs');
 const chalk = require('chalk');
 
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const { INITIALIZING_PRIORITY, PROMPTING_PRIORITY, CONFIGURING_PRIORITY, WRITING_PRIORITY, POST_WRITING_PRIORITY } =
-  require('../../lib/constants/priorities.cjs').compat;
+const {
+  INITIALIZING_PRIORITY,
+  PROMPTING_PRIORITY,
+  CONFIGURING_PRIORITY,
+  WRITING_PRIORITY,
+  POST_WRITING_PRIORITY,
+  INSTALL_PRIORITY,
+  END_PRIORITY,
+} = require('../../lib/constants/priorities.cjs').compat;
 
 const { GENERATOR_OPENAPI_CLIENT } = require('../generator-list');
 const { OpenAPIOptionsNames, OpenAPIDefaultValues } = require('../../jdl/jhipster/openapi-options');
@@ -152,7 +159,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  install() {
+  get [INSTALL_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._install();
   }
@@ -165,7 +172,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  end() {
+  get [END_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._end();
   }

package/generators/openshift/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/page/esm.mjs

@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';

package/generators/project-name/esm.mjs

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './index.cjs';

package/generators/server/esm.mjs

@@ -16,6 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
 
-export default generator;
+export { default } from './index.js';
+export { serverFiles as files } from './files.js';

package/generators/server/files-couchbase.js

@@ -41,30 +41,6 @@ const couchbaseFiles = {
     {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
-        {
-          file: 'package/config/couchbase/CustomCouchbaseRepositoryFactory.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomCouchbaseRepositoryFactory.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomCouchbaseRepositoryFactoryBean.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomCouchbaseRepositoryQuery.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomCouchbaseRepositoryQuery.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomN1qlQueryCreator.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomN1qlQueryCreator.java`,
-        },
-        {
-          file: 'package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/CustomN1qlRepositoryQueryExecutor.java`,
-        },
-        {
-          file: 'package/config/couchbase/package-info.java',
-          renameTo: generator => `${generator.javaDir}config/couchbase/package-info.java`,
-        },
         {
           file: 'package/repository/JHipsterCouchbaseRepository.java',
           renameTo: generator => `${generator.javaDir}repository/JHipsterCouchbaseRepository.java`,
@@ -81,30 +57,41 @@ const couchbaseFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.searchEngine === COUCHBASE,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/CouchbaseSearchRepository.java',
+          renameTo: generator => `${generator.javaDir}repository/CouchbaseSearchRepository.java`,
+        },
+      ],
+    },
     {
       condition: generator => generator.searchEngine === COUCHBASE,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/repository/JHipsterCouchbaseRepositoryTest.java',
-          renameTo: generator => `${generator.testDir}repository/JHipsterCouchbaseRepositoryTest.java`,
+          file: 'package/repository/CouchbaseSearchRepositoryTest.java',
+          renameTo: generator => `${generator.testDir}repository/CouchbaseSearchRepositoryTest.java`,
         },
       ],
     },
   ],
   serverResource: [
     {
+      condition: generator => !generator.skipUserManagement,
       path: SERVER_MAIN_RES_DIR,
-      templates: ['config/couchmove/changelog/V0__create_indexes.n1ql'],
+      templates: ['config/couchmove/changelog/V0__create_collections.n1ql', 'config/couchmove/changelog/V0.2__create_indexes.n1ql'],
     },
     {
       condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
       path: SERVER_MAIN_RES_DIR,
       templates: [
-        'config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json',
-        'config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json',
-        'config/couchmove/changelog/V0.1__initial_setup/user__admin.json',
-        'config/couchmove/changelog/V0.1__initial_setup/user__user.json',
+        'config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json',
+        'config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json',
+        'config/couchmove/changelog/V0.1__initial_setup/user/admin.json',
+        'config/couchmove/changelog/V0.1__initial_setup/user/user.json',
       ],
     },
   ],
@@ -136,6 +123,16 @@ function writeCouchbaseFiles() {
         this.removeFile(`${this.javaDir}repository/SearchCouchbaseRepository.java`);
         this.removeFile(`${this.testDir}repository/CustomCouchbaseRepositoryTest.java`);
       }
+
+      if (this.isJhipsterVersionLessThan('7.6.1')) {
+        this.removeFile(`${constants.SERVER_TEST_SRC_DIR}${this.testDir}repository/JHipsterCouchbaseRepositoryTest.java`);
+        this.removeFolder(`${constants.SERVER_MAIN_SRC_DIR}${this.javaDir}config/couchbase`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0__create_indexes.n1ql`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/user__admin.json`);
+        this.removeFile(`${constants.SERVER_MAIN_RES_DIR}config/couchmove/changelog/V0.1__initial_setup/user__user.json`);
+      }
     },
 
     async writeCouchbaseFiles() {

package/generators/server/files.js

@@ -332,6 +332,11 @@ 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: [
     {
@@ -371,6 +376,7 @@ const baseServerFiles = {
       ],
     },
     {
+      condition: generator => !generator.skipClient,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -1500,7 +1506,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`,
@@ -1818,6 +1823,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;
@@ -511,13 +514,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           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) {
@@ -537,7 +539,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,11 +554,11 @@ 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"`
               );
             }
 
@@ -632,7 +634,7 @@ 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() {
@@ -640,13 +642,11 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         const buildCmd = this.jhipsterConfig.buildTool === GRADLE ? 'gradlew' : 'mvnw';
         if (scriptsStorage.get('e2e')) {
           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 ${WAIT_TIMEOUT} 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-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/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);
+}

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

@@ -19,96 +19,75 @@
 package <%= packageName %>.repository;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
-import org.springframework.data.couchbase.repository.<% if (reactive) { %>Reactive<% } %>CouchbaseRepository;
-import org.springframework.data.couchbase.repository.ScanConsistency;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.couchbase.repository.*;
+import org.springframework.data.domain.*;
 import org.springframework.data.repository.NoRepositoryBean;
-<%_ if (searchEngineCouchbase) { _%>
-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;
 <%_ } else { _%>
-import org.springframework.data.domain.Page;
-<%_ } _%>
-
 import java.util.List;
 import java.util.stream.Collectors;
-import org.springframework.data.couchbase.core.query.Query;
-
-import static java.lang.String.format;
+<%_ } _%>
 
 /**
- * Couchbase specific {@link org.springframework.data.repository.Repository} interface uses N1QL for all requests.
+ * Couchbase specific {@link org.springframework.data.repository.Repository} interface that use KV first approach to optimize requests.
  */
 <%_
     let listOrFlux = reactive ? 'Flux' : 'List';
     let pageOrFlux = reactive ? 'Flux' : 'Page';
 _%>
 @NoRepositoryBean
+@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 public interface JHipsterCouchbaseRepository<T, ID> extends <% if (reactive) { %>Reactive<% } %>CouchbaseRepository<T, ID> {
 
-    static String pageableStatement(Pageable pageable) {
-        return pageableStatement(pageable, "");
+    String FIND_IDS_QUERY = "SELECT meta().id as __id, 0 as __cas FROM #{#n1ql.bucket} WHERE #{#n1ql.filter}";
+
+    default <%= listOrFlux %><T> findAll() {
+        return findAllById(toIds(findAllIds()));
     }
 
-    static String pageableStatement(Pageable pageable, String prefix) {
-        Sort sort = Sort.by(
-            pageable.getSort().stream()
-                .map(order -> {
-                    String property = order.getProperty();
-                    if ("id".equals(property)) {
-                        return order.withProperty(format("meta(%s).id", prefix));
-                    }
-                    if (prefix.isEmpty()) {
-                        return order;
-                    }
-                    return order.withProperty(format("%s.%s", prefix, property));
-                })
-                .collect(Collectors.toList()));
-        return new Query()
-            .limit(pageable.getPageSize())
-            .skip(pageable.getOffset())
-            .with(sort)
-            .export();
+    default <%= pageOrFlux %><T> findAll<% if (reactive) { %>By<% } %>(Pageable pageable) {
+<%_ if (reactive) { _%>
+        return findAllById(toIds(findAllIds(pageable)));
+<%_ } else { _%>
+        Page<T> page = findAllIds(pageable);
+        return new PageImpl<>(findAllById(toIds(page.getContent())), pageable, page.getTotalElements());
+<%_ } _%>
     }
 
-<%_ if (searchEngineCouchbase) { _%>
-    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;
+    default <%= listOrFlux %><T> findAll(Sort sort) {
+        return findAllById(toIds(findAllIds(sort)));
     }
+
+    default <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> deleteAll() {
+<%_ if (reactive) { _%>
+        return toIds(findAllIds())
+            .collectList()
+            .flatMap(this::deleteAllById);
+<%_ } else { _%>
+        deleteAllById(toIds(findAllIds()));
 <%_ } _%>
+    }
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><T> findAll();
+    @Query(FIND_IDS_QUERY)
+    <%= listOrFlux %><T> findAllIds();
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><T> findAll(Sort sort);
+    @Query(FIND_IDS_QUERY)
+    <%= pageOrFlux %><T> findAllIds(Pageable pageable);
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= pageOrFlux %><T> findAll<% if (reactive) { %>By<% } %>(Pageable pageable);
+    @Query(FIND_IDS_QUERY)
+    <%= listOrFlux %><T> findAllIds(Sort sort);
 
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> deleteAll();
+    @SuppressWarnings("unchecked")
+    default <%= listOrFlux %><ID> toIds(<%= listOrFlux %><T> entities) {
+<%_ if (reactive) { _%>
+        return entities.mapNotNull(entity -> (ID) getEntityInformation().getId(entity));
+<%_ } else { _%>
+        return entities.stream()
+            .map(entity -> (ID) getEntityInformation().getId(entity))
+            .collect(Collectors.toList());
+<%_ } _%>
+    }
 }

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

@@ -31,11 +31,11 @@ import static <%= packageName %>.config.Constants.ID_DELIMITER;
 public interface PersistentTokenRepository extends CouchbaseRepository<PersistentToken, String> {
 
     default Optional<PersistentToken> findBySeries(String series) {
-        return findById(PersistentToken.PREFIX + ID_DELIMITER + series);
+        return findById(series);
     }
 
     default void deleteBySeries(String series) {
-        deleteById(PersistentToken.PREFIX + ID_DELIMITER + series);
+        deleteById(series);
     }
 
     default List<PersistentToken> findByUser(<%= asEntity('User') %> user) {

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json.ejs

@@ -0,0 +1,3 @@
+{
+  "type": "authority"
+}

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json.ejs

@@ -0,0 +1,3 @@
+{
+  "type": "authority"
+}

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__admin.json.ejs → user/admin.json.ejs}

@@ -2,7 +2,7 @@
   "login": "admin",
 <%_ if (!authenticationTypeOauth2) { _%>
   "password": "$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC",
-<% } %>
+<%_ } _%>
   "firstName": "Administrator",
   "lastName": "Administrator",
   "email": "admin@localhost",
@@ -14,5 +14,5 @@
     "ROLE_USER",
     "ROLE_ADMIN"
   ],
-  "_class": "<%= packageName %>.domain.<%= asEntity('User') %>"
+  "type": "user"
 }

package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__user.json.ejs → user/user.json.ejs}

@@ -2,7 +2,7 @@
   "login": "user",
 <%_ if (!authenticationTypeOauth2) { _%>
   "password": "$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K",
-<% } %>
+<%_ } _%>
   "firstName": "User",
   "lastName": "User",
   "email": "user@localhost",
@@ -13,5 +13,5 @@
   "authorities": [
     "ROLE_USER"
   ],
-  "_class": "<%= packageName %>.domain.<%= asEntity('User') %>"
+  "type": "user"
 }