generator-jhipster 7.5.0 → 7.8.0

package/generators/server/templates/build.gradle.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.
@@ -113,7 +113,7 @@ eclipse {
 defaultTasks "bootRun"
 
 springBoot {
-    mainClassName = "<%= packageName %>.<%= mainClass %>"
+    mainClass = "<%= packageName %>.<%= mainClass %>"
 }
 
 test {
@@ -160,10 +160,10 @@ task integrationTest(type: Test) {
     jvmArgs += '-Djava.security.egd=file:/dev/./urandom -Xmx256m'
 <%_ if (databaseTypeSql) { _%>
     if (project.hasProperty('testcontainers')) {
-  <%_ if (!reactive) { _%>
-        environment 'spring.profiles.active', 'testcontainers'
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         environment 'SPRING_PROFILES_ACTIVE', 'testcontainers'
+  <%_ } else { _%>
+        environment 'spring.profiles.active', 'testcontainers'
   <%_ } _%>
     }
 <%_ } _%>
@@ -256,9 +256,9 @@ liquibase {
             defaultSchemaName "<% if (devDatabaseTypeMysql) { %><%= baseName %><% } else if (devDatabaseTypePostgres) { %><% } %>"
             logLevel "debug"
             classpath "$buildDir/classes/java/main"
-<%_ if (authenticationTypeOauth2) { _%>
+  <%_ if (authenticationTypeOauth2) { _%>
             excludeObjects "oauth_access_token, oauth_approvals, oauth_client_details, oauth_client_token, oauth_code, oauth_refresh_token"
-<%_ } _%>
+  <%_ } _%>
         }
     }
 
@@ -323,7 +323,7 @@ dependencies {
     }<% } %>
 <%_ // This is useful for major Spring Boot migration
 if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') > -1) { _%>
-    runtime "org.springframework.boot:spring-boot-properties-migrator"
+    runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
 <%_ } _%>
     implementation "javax.annotation:javax.annotation-api"
 <%_ if (!cacheProviderNo) { _%>
@@ -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) { _%>
@@ -419,10 +420,10 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
 <%_ if (databaseTypeSql) { _%>
-  <%_ if (!reactive) { _%>
-    implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
+  <%_ } else { _%>
+    implementation "org.springframework.boot:spring-boot-starter-data-jpa"
   <%_ } _%>
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
@@ -431,11 +432,6 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ if (databaseTypeMongodb || databaseTypeCassandra || databaseTypeCouchbase) { _%>
     implementation "org.springframework.boot:spring-boot-starter-data-<%= databaseType %><% if (reactive) { %>-reactive<% } %>"
 <%_ } _%>
-<%_ if (databaseTypeMongodb && reactive) { _%>
-    // Mongock doesn't support reactive yet, so this dependency is necessary.
-    // See https://github.com/jhipster/generator-jhipster/pull/12536#issuecomment-696683592 for more information.
-    implementation "org.springframework.boot:spring-boot-starter-data-mongodb"
-<%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
     implementation "org.springframework.boot:spring-boot-starter-data-neo4j"
     implementation "eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter"
@@ -443,7 +439,10 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     // and therefore hibernate validators is not included anymore
     implementation "org.springframework.boot:spring-boot-starter-validation"
     testImplementation "org.testcontainers:neo4j"
-    testImplementation 'org.testcontainers:junit-jupiter'
+<%_ } _%>
+<%_ if (cacheProviderRedis || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j || databaseTypeCassandra || searchEngineElasticsearch || messageBrokerKafka) { _%>
+    testImplementation "org.testcontainers:junit-jupiter"
+    testImplementation "org.testcontainers:testcontainers"
 <%_ } _%>
 <%_ if (prodDatabaseTypeMysql) { _%>
     testImplementation "org.testcontainers:mysql"
@@ -461,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 "org.apache.kafka:kafka-clients"
-  <%_ } else { _%>
-    implementation "io.projectreactor.kafka:reactor-kafka"
-  <%_ } _%>
+    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<% } %>") {
@@ -523,7 +520,7 @@ 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) { _%><%# Can remove when Spring Security 5.5 is released https://github.com/spring-projects/spring-security/issues/8958 -%>
+<%_ if (!reactive && databaseTypeSql) { _%>
     implementation "org.springframework.security:spring-security-data"
 <%_ } _%>
     implementation "org.springframework.security:spring-security-web"
@@ -545,8 +542,19 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     }
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
-    implementation "com.github.cloudyrock.mongock:mongock-spring-v5"
-    implementation "com.github.cloudyrock.mongock:mongodb-springdata-v3-driver"
+    implementation "io.mongock:mongock-springboot"
+    implementation "io.mongock:mongodb-springdata-v3-driver"
+    testImplementation "org.testcontainers:mongodb"
+  <%_ if (reactive) { _%>
+    // Mongock doesn't support reactive yet, so this dependency is necessary.
+    // See https://github.com/jhipster/generator-jhipster/pull/12536#issuecomment-696683592 for more information.
+    implementation "org.springframework.boot:spring-boot-starter-data-mongodb"
+
+    // Mongo db driver was excluded from starter, adding manually
+    implementation "org.mongodb:mongodb-driver-reactivestreams"
+  <%_ } _%>
+    // Mongo db driver was excluded from starter, adding manually
+    implementation "org.mongodb:mongodb-driver-sync"
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
     implementation "com.github.differentway:couchmove"
@@ -555,26 +563,26 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation ("org.springdoc:springdoc-openapi-webmvc-core")
 <%_ if (prodDatabaseTypeMysql) { _%>
     implementation "mysql:mysql-connector-java"
-  <%_ if (!reactive) { _%>
-    liquibaseRuntime "mysql:mysql-connector-java"
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     implementation "dev.miku:r2dbc-mysql"
+  <%_ } else { _%>
+    liquibaseRuntime "mysql:mysql-connector-java"
   <%_ } _%>
 <%_ } _%>
 <%_ if (prodDatabaseTypePostgres) { _%>
     implementation "org.postgresql:postgresql"
-  <%_ if (!reactive) { _%>
-    liquibaseRuntime "org.postgresql:postgresql"
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     implementation "io.r2dbc:r2dbc-postgresql"
+  <%_ } else { _%>
+    liquibaseRuntime "org.postgresql:postgresql"
   <%_ } _%>
 <%_ } _%>
 <%_ if (prodDatabaseTypeMariadb) { _%>
     implementation "org.mariadb.jdbc:mariadb-java-client"
-  <%_ if (!reactive) { _%>
-    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
+  <%_ if (reactive) { _%>
+    implementation "org.mariadb:r2dbc-mariadb"
   <%_ } else { _%>
-        implementation "org.mariadb:r2dbc-mariadb"
+    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
   <%_ } _%>
 <%_ } _%>
 <%_ if (prodDatabaseTypeMssql) { _%>
@@ -618,9 +626,6 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ } _%>
     testImplementation "com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}"
     testRuntimeOnly "com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}"
-<%_ if (databaseTypeMongodb) { _%>
-    testImplementation "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
-<%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
     testImplementation "org.testcontainers:couchbase"
 <%_ } _%>
@@ -631,10 +636,10 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
   <%_ } _%>
 <%_ } _%>
 <%_ if (devDatabaseTypeH2Any) { _%>
-  <%_ if (!reactive) { _%>
-    liquibaseRuntime "com.h2database:h2"
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     implementation "io.r2dbc:r2dbc-h2"
+  <%_ } else { _%>
+    liquibaseRuntime "com.h2database:h2"
   <%_ } _%>
 <%_ } _%>
 <%_ if (prodDatabaseTypeOracle) { _%>
@@ -643,9 +648,6 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ } _%>
 <%_ if (messageBrokerKafka) { _%>
     testImplementation "org.testcontainers:kafka"
-<%_ } _%>
-<%_ if (cacheProviderRedis) { %>
-    testImplementation "org.testcontainers:testcontainers"
 <%_ } _%>
     developmentOnly "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
     //jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
@@ -672,6 +674,9 @@ wrapper {
 }
 
 <%_ if (!skipClient) { _%>
+task webapp_test(type: NpmTask, dependsOn: "npm_install") {
+    args = ["run", "webapp:test"]
+}
 
 if (project.hasProperty("nodeInstall")) {
     // Workaround node grade plugin not working on apple silicon https://github.com/node-gradle/gradle-node-plugin/issues/154
@@ -704,5 +709,9 @@ bootJar {
     launchScript()
 }
 <%_ } _%>
+
+<%_ if (!skipClient) { _%>
+test.dependsOn webapp_test
+<%_ } _%>
 compileJava.dependsOn processResources
 processResources.dependsOn bootBuildInfo

package/generators/server/templates/checkstyle.xml.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/couchbase/src/main/docker/couchbase-cluster.yml.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/couchbase/src/main/docker/couchbase.yml.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/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

@@ -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.
@@ -19,44 +19,32 @@
 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}";
 
     static String pageableStatement(Pageable pageable, String prefix) {
         Sort sort = Sort.by(
@@ -72,43 +60,57 @@ public interface JHipsterCouchbaseRepository<T, ID> extends <% if (reactive) { %
                     return order.withProperty(format("%s.%s", prefix, property));
                 })
                 .collect(Collectors.toList()));
-        return new Query()
+        return new org.springframework.data.couchbase.core.query.Query()
             .limit(pageable.getPageSize())
             .skip(pageable.getOffset())
             .with(sort)
             .export();
     }
 
-<%_ 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() {
+        return findAllById(toIds(findAllIds()));
+    }
+
+    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());
+<%_ } _%>
+    }
+
+    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

@@ -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,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"
 }

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}

@@ -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.
@@ -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")