Merge pull request #16077 from tchlyah/fix/couchbase-tests

mshima · web-flow · commit 9bf7f9dfbe5c · 2021-09-01T09:40:03.000-03:00
Fix and enable back Couchbase tests
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -70,8 +70,8 @@ jobs:
           - ngx-mariadb-oauth2-infinispan
           - ngx-mongodb-kafka-cucumber
           - ngx-h2mem-ws-nol2
-          #- ngx-couchbase
-          #- ngx-gradle-couchbase-search
+          - ngx-couchbase
+          - ngx-gradle-couchbase-search
           - ngx-gradle-fr
           - ngx-gradle-mysql-es-noi18n-mapsid
           - ngx-gradle-mariadb-oauth2-infinispan
@@ -117,18 +117,18 @@ jobs:
             war: 0
             e2e: 1
             testcontainers: 0
-          #- app-sample: ngx-couchbase
-          #  entity: couchbase
-          #  environment: prod
-          #  war: 0
-          #  e2e: 1
-          #  testcontainers: 1
-          #- app-sample: ngx-gradle-couchbase-search
-          #  entity: couchbase
-          #  environment: prod
-          #  war: 0
-          #  e2e: 1
-          #  testcontainers: 1
+          - app-sample: ngx-couchbase
+            entity: couchbase
+            environment: prod
+            war: 0
+            e2e: 1
+            testcontainers: 1
+          - app-sample: ngx-gradle-couchbase-search
+            entity: couchbase
+            environment: prod
+            war: 0
+            e2e: 1
+            testcontainers: 1
           - app-sample: ngx-gradle-fr
             entity: sql
             environment: prod
diff --git a/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs
@@ -24,6 +24,7 @@ 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.github.couchmove.Couchmove;
 <%_ if (searchEngineCouchbase) { _%>
 import <%= packageName %>.repository.Custom<% if (reactive) { %>Reactive<% } %>CouchbaseRepository;
@@ -39,13 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-<%_ if (searchEngineElasticsearch) { _%>
-import org.springframework.context.annotation.ComponentScan.Filter;
-import org.springframework.context.annotation.FilterType;
-<%_ } _%>
-import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.*;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.GenericConverter;
@@ -65,6 +60,7 @@ 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;
 
@@ -175,12 +171,22 @@ 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");
         couchmove.migrate();
+        couchmove.buildN1qlDeferredIndexes();
         return couchmove;
     }
 
diff --git a/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs
@@ -34,7 +34,6 @@ import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import org.springframework.data.mongodb.repository.<% if (reactive) { %>Reactive<% } %>MongoRepository;
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
-import org.springframework.data.couchbase.repository.<% if (reactive) { %>Reactive<% } %>CouchbaseRepository;
 import org.springframework.data.couchbase.repository.Query;
 import com.couchbase.client.java.query.QueryScanConsistency;
 import org.springframework.data.couchbase.repository.ScanConsistency;
@@ -68,7 +67,7 @@ import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<%
 <%_ if (databaseTypeCouchbase) { _%>
 @Repository
 <%_ } _%>
-public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (reactive) { %>R2dbc<% } else { %>Jpa<% } %>Repository<% } else { %><% if (reactive) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCouchbase) { %>CouchbaseRepository<% } %><% } %><Authority, String> {
+public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (reactive) { %>R2dbc<% } else { %>Jpa<% } %>Repository<% } else { %><% if (reactive) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCouchbase) { %>N1qlCouchbaseRepository<% } %><% } %><Authority, String> {
 <%_ if (databaseTypeNeo4j) { _%>
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
     <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asEntity('Authority') %>> findAll();
diff --git a/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs
@@ -41,6 +41,10 @@ import static java.lang.String.format;
 @NoRepositoryBean
 public interface N1qlCouchbaseRepository<T, ID> extends CouchbaseRepository<T, ID><% if (searchEngineCouchbase) { %>, SearchCouchbaseRepository<T, ID><% } %> {
 
+    static String pageableStatement(Pageable pageable) {
+        return pageableStatement(pageable, "");
+    }
+
     static String pageableStatement(Pageable pageable, String prefix) {
         Sort sort = Sort.by(
             pageable.getSort().stream()
@@ -67,4 +71,7 @@ public interface N1qlCouchbaseRepository<T, ID> extends CouchbaseRepository<T, I
 
     @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
     Page<T> findAll(Pageable pageable);
+
+    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    void deleteAll();
 }
diff --git a/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs
@@ -96,11 +96,9 @@ import org.springframework.data.mongodb.repository.<% if (reactive) { %>Reactive
 import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository;
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
-import org.springframework.data.domain.Sort;
 import com.couchbase.client.java.query.QueryScanConsistency;
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.couchbase.repository.ScanConsistency;
-import org.springframework.data.couchbase.repository.<% if (reactive) { %>Reactive<% } %>CouchbaseRepository;
 import org.springframework.data.domain.PageImpl;
 <%_ } _%>
 <%_ if (reactive && databaseTypeCassandra) { _%>
@@ -172,7 +170,7 @@ import static <%= packageName %>.config.Constants.ID_DELIMITER;
 _%>
 <%_ if ((databaseTypeSql && !reactive) || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
 @Repository
-public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepository<<%= asEntity('User') %>, <%= user.primaryKey.type %>><% } %><% if (reactive) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeCouchbase) { %>CouchbaseRepository<<%= asEntity('User') %>, String><%if (searchEngineCouchbase) { %>, SearchCouchbaseRepository<<%= asEntity('User') %>, String><% } } %> {
+public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepository<<%= asEntity('User') %>, <%= user.primaryKey.type %>><% } %><% if (reactive) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeCouchbase) { %>N1qlCouchbaseRepository<<%= asEntity('User') %>, String><%if (searchEngineCouchbase) { %>, SearchCouchbaseRepository<<%= asEntity('User') %>, String><% } } %> {
   <%_ if (cacheManagerIsAvailable) { _%>
 
     String USERS_BY_LOGIN_CACHE = "usersByLogin";
@@ -241,18 +239,6 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<% } %>
     <%= listOrFlux %><<%= asEntity('User') %>> findAll();
 
-  <%_ } _%>
-  <%_ if (databaseTypeCouchbase) { _%>
-    @Override
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= asEntity('User') %>> findAll();
-
-  <%_ } _%>
-  <%_ if (databaseTypeCouchbase) { _%>
-    @Override
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= asEntity('User') %>> findAll(Sort sort);
-
   <%_ } _%>
   <%_ if (databaseTypeSql) { _%>
     @EntityGraph(attributePaths = "authorities")
@@ -287,7 +273,7 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
   <% } else { %>
     <%_ if (databaseTypeCouchbase) { _%>
     default Page<<%= asEntity('User') %>> findAllActivatedIsTrue(Pageable pageable) {
-        return new PageImpl<>(findAllActivatedIsTrue(new org.springframework.data.couchbase.core.query.Query().with(pageable).export()), pageable, countAllActivatedIsTrue());
+        return new PageImpl<>(findAllActivatedIsTrue(N1qlCouchbaseRepository.pageableStatement(pageable)), pageable, countAllActivatedIsTrue());
     }
     <%_ } else { _%>
     Page<<%= asEntity('User') %>> findAllByIdNotNullAndActivatedIsTrue(Pageable pageable);
diff --git a/generators/server/templates/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs b/generators/server/templates/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs
@@ -1,4 +1,3 @@
--- create indexes
 CREATE INDEX type ON `${bucket}`(`_class`)
     WITH { "defer_build" : true };
 <%_ if (!skipUserManagement) { _%>
@@ -18,6 +17,3 @@ CREATE INDEX token_date ON `${bucket}`(tokenDate)
     WITH { "defer_build" : true };
   <%_ } _%>
 <%_ } _%>
-
--- build indexes asynchronously
-BUILD INDEX ON `${bucket}`(type<% if (!skipUserManagement) { %>, user_mail<% if (authenticationTypeSession) { %>, token_login, token_date<% } %><% } %>);
diff --git a/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs
@@ -208,7 +208,7 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
 <% } _%>
     }
 
-<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j)
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)
   && (!(authenticationTypeOauth2 && applicationTypeMicroservice))) { _%>
     @Test
   <%_ if (databaseTypeSql && !reactive) { _%>
diff --git a/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs
@@ -482,9 +482,6 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
     }
 <%_ } _%>
 
-<%_ if (databaseTypeCouchbase) { _%>
-    @org.junit.Ignore
-<%_ } _%>
     @Test
 <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas`
`208`	`208`	`<% } _%>`
`209`	`209`	`}`
`210`	`210`
`211`		`-<%_ if ((databaseTypeSql \|\| databaseTypeMongodb \|\| databaseTypeNeo4j)`
	`211`	`+<%_ if ((databaseTypeSql \|\| databaseTypeMongodb \|\| databaseTypeNeo4j \|\| databaseTypeCouchbase)`
`212`	`212`	`&& (!(authenticationTypeOauth2 && applicationTypeMicroservice))) { _%>`
`213`	`213`	`@Test`
`214`	`214`	`<%_ if (databaseTypeSql && !reactive) { _%>`
Original file line number	Diff line number	Diff line change
`@@ -482,9 +482,6 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra`
`482`	`482`	`}`
`483`	`483`	`<%_ } _%>`
`484`	`484`
`485`		`-<%_ if (databaseTypeCouchbase) { _%>`
`486`		`- @org.junit.Ignore`
`487`		`-<%_ } _%>`
`488`	`485`	`@Test`
`489`	`486`	`<%_ if (databaseTypeSql && !reactive) { _%>`
`490`	`487`	`@Transactional`