generator-jhipster 7.6.0 → 7.8.1

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

@@ -26,6 +26,11 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.<%= databaseType %>.core.mapping.Document;
 <%_ } _%>
+<%_ if (databaseTypeCouchbase) { _%>
+import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.couchbase.repository.Collection;
+import static <%= packageName %>.domain.Authority.TYPE_NAME;
+<%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import org.springframework.data.neo4j.core.schema.Id;
 import org.springframework.data.neo4j.core.schema.Node;
@@ -73,11 +78,17 @@ import java.util.Objects;
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
 <%_ } _%>
 public class Authority implements Serializable<% if (databaseTypeSql && reactive) { %>, Persistable<String><% } %> {
 
     private static final long serialVersionUID = 1L;
 
+<%_ if (databaseTypeCouchbase) { _%>
+    public static final String TYPE_NAME = "authority";
+<%_ } _%>
+
     @NotNull
     @Size(max = 50)
     @Id

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

@@ -48,7 +48,9 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.Document;
 import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
 import org.springframework.data.couchbase.core.mapping.id.IdAttribute;
-import org.springframework.data.couchbase.core.mapping.id.IdPrefix;
+import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.couchbase.repository.Collection;
+import static <%= packageName %>.domain.Authority.TYPE_NAME;
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
@@ -88,6 +90,8 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   <%_ if (reactive) { _%>
@@ -104,11 +108,7 @@ public class PersistentToken implements Serializable {
     private static final int MAX_USER_AGENT_LEN = 255;
 
 <%_ if (databaseTypeCouchbase) { _%>
-    public static final String PREFIX = "token";
-
-    @SuppressWarnings("unused")
-    @IdPrefix
-    private String prefix = PREFIX;
+    public static final String TYPE_NAME = "persistentToken";
 
     @Id
     @GeneratedValue(strategy = USE_ATTRIBUTES, delimiter = ID_DELIMITER)

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

@@ -66,7 +66,9 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.Document;
 import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
 import org.springframework.data.couchbase.core.mapping.id.IdAttribute;
-import org.springframework.data.couchbase.core.mapping.id.IdPrefix;
+import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.couchbase.repository.Collection;
+import static <%= packageName %>.domain.User.TYPE_NAME;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -115,6 +117,8 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   <%_ if (reactive) { _%>
@@ -131,6 +135,10 @@ public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongod
 
     private static final long serialVersionUID = 1L;
 
+<%_ if (databaseTypeCouchbase) { _%>
+    public static final String TYPE_NAME = "user";
+<%_ } _%>
+
 <%_ if (databaseTypeSql) { _%>
     @Id
   <%_ if (!reactive) { _%>
@@ -153,12 +161,6 @@ public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongod
   <%_ } _%>
     @Property("user_id")
 <%_ } else { _%>
-  <%_ if (databaseTypeCouchbase) { _%>
-    public static final String PREFIX = "user";
-
-    @IdPrefix
-    private String prefix = PREFIX;
-  <%_ } _%>
   <%_ if (databaseTypeMongodb || databaseTypeCouchbase) { _%>
     @Id
   <%_ } _%>

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

@@ -33,15 +33,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
 <%_ if (databaseTypeMongodb) { _%>
 import org.springframework.data.mongodb.repository.<% if (reactive) { %>Reactive<% } %>MongoRepository;
 <%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-import org.springframework.data.couchbase.repository.Query;
-import com.couchbase.client.java.query.QueryScanConsistency;
-import org.springframework.data.couchbase.repository.ScanConsistency;
-<%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository;
 <%_ } _%>
-<%_ if (databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (databaseTypeNeo4j) { _%>
   <%_ if (reactive) { _%>
 import reactor.core.publisher.Flux;
   <%_ } else { _%>
@@ -79,10 +74,5 @@ public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
     <% if (reactive) { %>Flux<% } else { %>List<% } %><Authority> findAll();
 <%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><Authority> findAll();
-<%_ } _%>
 
 }

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

@@ -33,6 +33,7 @@ import org.springframework.data.r2dbc.core.StatementMapper;
 import org.springframework.data.r2dbc.mapping.OutboundRow;
 import org.springframework.data.r2dbc.query.UpdateMapper;
 import org.springframework.data.relational.core.query.Criteria;
+import org.springframework.data.relational.core.sql.Condition;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.sql.Conditions;
 import org.springframework.data.relational.core.sql.OrderByField;
@@ -90,19 +91,28 @@ public class EntityManager {
      * Creates an SQL select statement from the given fragment and pagination parameters.
      * @param selectFrom a representation of a select statement.
      * @param entityType the entity type which holds the table name.
-     * @param pageable page parameter, or null, if everything needs to be returned
+     * @param pageable page parameter, or null, if everything needs to be returned.
+     * @param where condition or null. The condition to apply as where clause.
      * @return sql select statement
      */
-    public String createSelect(SelectFromAndJoin selectFrom, Class<?> entityType, Pageable pageable, Criteria criteria) {
+    public String createSelect(SelectFromAndJoin selectFrom, Class<?> entityType, Pageable pageable, Condition where) {
         if (pageable != null) {
-            if (criteria != null) {
-                return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(Conditions.just(criteria.toString())), entityType, pageable.getSort());
+            if (where != null) {
+                return createSelectImpl(
+                    selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(where),
+                    entityType,
+                    pageable.getSort()
+                );
             } else {
-                return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()), entityType, pageable.getSort());
+                return createSelectImpl(
+                    selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()),
+                    entityType,
+                    pageable.getSort()
+                );
             }
         } else {
-            if (criteria != null) {
-                return createSelectImpl(selectFrom.where(Conditions.just(criteria.toString())), entityType, null);
+            if (where != null) {
+                return createSelectImpl(selectFrom.where(where), entityType, null);
             } else {
                 return createSelectImpl(selectFrom, entityType, null);
             }
@@ -114,37 +124,32 @@ public class EntityManager {
      * @param selectFrom a representation of a select statement.
      * @param entityType the entity type which holds the table name.
      * @param pageable page parameter, or null, if everything needs to be returned
+     * @param where condition or null. The condition to apply as where clause.
      * @return sql select statement
      */
-    public String createSelect(SelectFromAndJoinCondition selectFrom, Class<?> entityType, Pageable pageable, Criteria criteria) {
+    public String createSelect(SelectFromAndJoinCondition selectFrom, Class<?> entityType, Pageable pageable, Condition where) {
         if (pageable != null) {
-            if (criteria != null) {
-                return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(Conditions.just(criteria.toString())), entityType, pageable.getSort());
+            if (where != null) {
+                return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(where), entityType, pageable.getSort());
             } else {
                 return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()), entityType, pageable.getSort());
             }
         } else {
-            if (criteria != null) {
-                return createSelectImpl(selectFrom.where(Conditions.just(criteria.toString())), entityType, null);
+            if (where != null) {
+                return createSelectImpl(selectFrom.where(where), entityType, null);
             } else {
                 return createSelectImpl(selectFrom, entityType, null);
             }
         }
     }
 
-    private String createSelectImpl(SelectOrdered selectFrom, Class<?> entityType, Sort sortParameter) {
-        if (sortParameter != null && sortParameter.isSorted()) {
-            RelationalPersistentEntity<?> entity = getPersistentEntity(entityType);
-            if (entity != null) {
-                Sort sort = updateMapper.getMappedObject(sortParameter, entity);
-                selectFrom = selectFrom.orderBy(createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort));
-            }
-        }
-        return createSelect(selectFrom.build());
-    }
-
-    private RelationalPersistentEntity<?> getPersistentEntity(Class<?> entityType) {
-        return r2dbcEntityTemplate.getConverter().getMappingContext().getPersistentEntity(entityType);
+    /**
+     * Generate an actual SQL from the given {@link Select}.
+     * @param select a representation of a select statement.
+     * @return the generated SQL select.
+     */
+    public String createSelect(Select select) {
+        return sqlRenderer.render(select);
     }
 
     /**
@@ -166,15 +171,6 @@ public class EntityManager {
         return r2dbcEntityTemplate.getDatabaseClient().sql(statementMapper.getMappedObject(delete)).fetch().rowsUpdated();
     }
 
-    /**
-     * Generate an actual SQL from the given {@link Select}.
-     * @param select a representation of a select statement.
-     * @return the generated SQL select.
-     */
-    public String createSelect(Select select) {
-        return sqlRenderer.render(select);
-    }
-
     /**
      * Inserts the given entity into the database - and sets the id, if it's an autoincrement field.
      * @param <S> the type of the persisted entity.
@@ -192,11 +188,11 @@ public class EntityManager {
      * @param referencedIds the id of the referred entities.
      * @return the number of inserted rows.
      */
-    public Mono<Integer> updateLinkTable(LinkTable table, Long entityId, Stream<Long> referencedIds) {
+    public Mono<Integer> updateLinkTable(LinkTable table, Object entityId, Stream<?> referencedIds) {
         return deleteFromLinkTable(table, entityId)
                 .then(
                     Flux.fromStream(referencedIds)
-                        .flatMap((Long referenceId) -> {
+                        .flatMap((Object referenceId) -> {
                             StatementMapper.InsertSpec insert = r2dbcEntityTemplate
                                 .getDataAccessStrategy()
                                 .getStatementMapper()
@@ -214,7 +210,7 @@ public class EntityManager {
                         .map((List<Integer> updates) -> updates.stream().reduce(Integer::sum).orElse(0)));
     }
 
-    public Mono<Void> deleteFromLinkTable(LinkTable table, Long entityId) {
+    public Mono<Void> deleteFromLinkTable(LinkTable table, Object entityId) {
         Assert.notNull(entityId, "entityId is null");
         StatementMapper.DeleteSpec deleteSpec = r2dbcEntityTemplate.getDataAccessStrategy().getStatementMapper()
             .createDelete(table.tableName)
@@ -222,6 +218,21 @@ public class EntityManager {
         return r2dbcEntityTemplate.getDatabaseClient().sql(statementMapper.getMappedObject(deleteSpec)).then();
     }
 
+    private String createSelectImpl(SelectOrdered selectFrom, Class<?> entityType, Sort sortParameter) {
+        if (sortParameter != null && sortParameter.isSorted()) {
+            RelationalPersistentEntity<?> entity = getPersistentEntity(entityType);
+            if (entity != null) {
+                Sort sort = updateMapper.getMappedObject(sortParameter, entity);
+                selectFrom = selectFrom.orderBy(createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort));
+            }
+        }
+        return createSelect(selectFrom.build());
+    }
+
+    private RelationalPersistentEntity<?> getPersistentEntity(Class<?> entityType) {
+        return r2dbcEntityTemplate.getConverter().getMappingContext().getPersistentEntity(entityType);
+    }
+
     private static Collection<? extends OrderByField> createOrderByFields(Table table, Sort sortToUse) {
 
         List<OrderByField> fields = new ArrayList<>();
@@ -236,5 +247,4 @@ public class EntityManager {
 
         return fields;
     }
-
 }

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

@@ -62,10 +62,7 @@ import org.apache.commons.beanutils.BeanComparator;
 import org.springframework.cache.annotation.Cacheable;
 <%_ } _%>
 <%_ if (databaseTypeSql || databaseTypeCouchbase || databaseTypeMongodb || databaseTypeNeo4j) { _%>
-  <%_ if (!reactive) { _%>
-import org.springframework.data.domain.Page;
-  <%_ } _%>
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.*;
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
   <%_ if (reactive) { _%>
@@ -93,12 +90,7 @@ import org.springframework.data.mongodb.repository.<% if (reactive) { %>Reactive
 import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository;
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
-import com.couchbase.client.java.query.QueryScanConsistency;
 import org.springframework.data.couchbase.repository.Query;
-import org.springframework.data.couchbase.repository.ScanConsistency;
-  <%_ if (!reactive) { _%>
-import org.springframework.data.domain.PageImpl;
-  <%_ } _%>
 <%_ } _%>
 <%_ if (reactive && databaseTypeCassandra) { _%>
 import org.springframework.data.cassandra.ReactiveResultSet;
@@ -157,13 +149,6 @@ import java.util.UUID;
 <%_ if (!databaseTypeCassandra && !(databaseTypeSql && reactive) && !authenticationTypeOauth2) { _%>
 import java.time.Instant;
 <%_ } _%>
-<% if (databaseTypeCouchbase) { %>
-import static <%= packageName %>.config.Constants.ID_DELIMITER;
-<% } %>
-<%_ if (searchEngineCouchbase) { _%>
-import static <%= packageName %>.repository.JHipsterCouchbaseRepository.pageableStatement;
-import static <%= packageName %>.repository.JHipsterCouchbaseRepository.searchQuery;
-<%_ } _%>
 /**
  * Spring Data <% if (databaseTypeSql && !reactive) { %>JPA<% } else if (databaseTypeSql && reactive) { %>R2DBC<% } else if (databaseTypeMongodb) { %>MongoDB<% } else if (databaseTypeCouchbase) { %>Couchbase<% } else if (databaseTypeCassandra) { %>Cassandra<% } else if (databaseTypeNeo4j) { %>Neo4j<% } %> repository for the {@link <%= asEntity('User') %>} entity.
  */
@@ -174,37 +159,45 @@ import static <%= packageName %>.repository.JHipsterCouchbaseRepository.searchQu
 _%>
 <%_ if ((databaseTypeSql && !reactive) || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
 @Repository
-public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepository<<%= asEntity('User') %>, <%= user.primaryKey.type %>><% } %><% if (reactive && !databaseTypeCouchbase) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeCouchbase) { %>JHipsterCouchbaseRepository<<%= asEntity('User') %>, String><% } %> {
+public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepository<<%= asEntity('User') %>, <%= user.primaryKey.type %>><% } %><% if (reactive && !databaseTypeCouchbase) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<<%= asEntity('User') %>, String><% } %><% if (databaseTypeCouchbase) { %>JHipsterCouchbaseRepository<<%= asEntity('User') %>, String><% } %><% if (searchEngineCouchbase) { %>, CouchbaseSearchRepository<<%= asEntity('User') %>, String><% } %> {
   <%_ if (cacheManagerIsAvailable) { _%>
 
     String USERS_BY_LOGIN_CACHE = "usersByLogin";
 
     String USERS_BY_EMAIL_CACHE = "usersByEmail";
   <%_ } _%>
-  <%_ if (databaseTypeCouchbase) { _%>
-    // @ScanConsistency is to fix index issues with Spring Data Couchbase
-    // https://github.com/spring-projects/spring-data-couchbase/issues/897
-  <%_ } _%>
   <%_ if (!authenticationTypeOauth2) { _%>
+      <% if (databaseTypeCouchbase) { %>default <% } %><%= optionalOrMono %><<%= asEntity('User') %>> findOneByActivationKey(String activationKey)<% if (!databaseTypeCouchbase) { %>;<% } else { %> {
+        return findIdByActivationKey(activationKey)
+            .map(User::getId)
+            .flatMap(this::findById);
+    }
 
-    <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    @Query(FIND_IDS_QUERY + " AND activationKey = $1")
+    <%= optionalOrMono %><User> findIdByActivationKey(String activationKey);
     <%_ } _%>
-    <%= optionalOrMono %><<%= asEntity('User') %>> findOneByActivationKey(String activationKey);
   <%_ } _%>
   <%_ if (!authenticationTypeOauth2) { _%>
 
-    <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <% if (databaseTypeCouchbase) { %>default <% } %><%= listOrFlux %><<%= asEntity('User') %>> findAllByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(Instant dateTime)<% if (!databaseTypeCouchbase) { %>;<% } else { %> {
+        return findAllById(toIds(findAllIdsByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(dateTime)));
+    }
+
+    @Query(FIND_IDS_QUERY + " AND activated = false AND activationKey IS NOT NULL AND createdDate < $1")
+    <%= listOrFlux %><User> findAllIdsByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(Instant dateTime);
     <%_ } _%>
-    <%= listOrFlux %><<%= asEntity('User') %>> findAllByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(Instant dateTime);
   <%_ } _%>
 
   <%_ if (!authenticationTypeOauth2) { _%>
-    <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <% if (databaseTypeCouchbase) { %>default <% } %><%= optionalOrMono %><<%= asEntity('User') %>> findOneByResetKey(String resetKey)<% if (!databaseTypeCouchbase) { %>;<% } else { %> {
+        return findIdByResetKey(resetKey)
+            .map(User::getId)
+            .flatMap(this::findById);
+    }
+
+    @Query(FIND_IDS_QUERY + " AND resetKey = $1")
+    <%= optionalOrMono %><User> findIdByResetKey(String resetKey);
     <%_ } _%>
-    <%= optionalOrMono %><<%= asEntity('User') %>> findOneByResetKey(String resetKey);
   <%_ } _%>
 
   <%_ if (!authenticationTypeOauth2) { _%>
@@ -213,20 +206,23 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
     @Cacheable(cacheNames = USERS_BY_EMAIL_CACHE)
       <%_ } _%>
     <%_ } _%>
-    <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    @Query("#{#n1ql.selectEntity} WHERE LOWER(email) = LOWER($1) AND #{#n1ql.filter}")
+    <% if (databaseTypeCouchbase) { %>default <% } %><%= optionalOrMono %><<%= asEntity('User') %>> findOneByEmailIgnoreCase(String email)<% if (!databaseTypeCouchbase) { %>;<% } else { %> {
+        return findIdByEmailIgnoreCase(email)
+            .map(User::getId)
+            .flatMap(this::findById);
+    }
+
+    @Query(FIND_IDS_QUERY + " AND LOWER(email) = LOWER($1)")
+    <%= optionalOrMono %><User> findIdByEmailIgnoreCase(String email);
     <%_ } _%>
-    <%= optionalOrMono %><<%= asEntity('User') %>> findOneByEmailIgnoreCase(String email);
 
   <%_ } _%>
   <%_ if (databaseTypeCouchbase) { _%>
     <%_ if (cacheManagerIsAvailable) { _%>
     @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
     <%_ } _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
     default <%= optionalOrMono %><<%= asEntity('User') %>> findOneByLogin(String login) {
-        return findById(<%= asEntity('User') %>.PREFIX + ID_DELIMITER + login);
+        return findById(login);
     }
   <%_ } else if (databaseTypeMongodb || databaseTypeNeo4j) { _%>
     <%_ if (cacheManagerIsAvailable) { _%>
@@ -260,55 +256,35 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
   <%_ } _%>
 
   <% if (reactive) { %>
-    <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%_ } _%>
+    <%_ if (!databaseTypeCouchbase) { _%>
     Flux<<%= asEntity('User') %>>findAllByIdNotNull(Pageable pageable);
-
-    <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
     <%_ } _%>
-    Flux<<%= asEntity('User') %>>findAllBy<% if (!databaseTypeCouchbase) { %>IdNotNullAnd<% } %>ActivatedIsTrue(Pageable pageable);
 
     <%_ if (databaseTypeCouchbase) { _%>
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    default Flux<User> findAllByActivatedIsTrue(Pageable pageable) {
+        return findAllById(toIds(findAllIdsByActivatedIsTrue(pageable)));
+    }
+
+    @Query(FIND_IDS_QUERY + " AND activated = true")
+    Flux<User> findAllIdsByActivatedIsTrue(Pageable pageable);
+    <%_ } else { _%>
+    Flux<<%= asEntity('User') %>>findAllByIdNotNullAndActivatedIsTrue(Pageable pageable);
     <%_ } _%>
+
     Mono<Long> count();
   <% } else { %>
     <%_ if (databaseTypeCouchbase) { _%>
-    default Page<<%= asEntity('User') %>> findAllByActivatedIsTrue(Pageable pageable) {
-        return new PageImpl<>(findAllByActivatedIsTrue(JHipsterCouchbaseRepository.pageableStatement(pageable)), pageable, countAllByActivatedIsTrue());
+    default Page<User> findAllByActivatedIsTrue(Pageable pageable) {
+        Page<User> page = findAllIdsByActivatedIsTrue(pageable);
+        return new PageImpl<>(findAllById(toIds(page.getContent())), pageable, page.getTotalElements());
     }
+
+    @Query(FIND_IDS_QUERY + " AND activated = true")
+    Page<User> findAllIdsByActivatedIsTrue(Pageable pageable);
     <%_ } else { _%>
     Page<<%= asEntity('User') %>> findAllByIdNotNullAndActivatedIsTrue(Pageable pageable);
     <%_ } _%>
   <% } %>
-
-  <%_ if (databaseTypeCouchbase && !reactive) { _%>
-    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter} AND activated = true #{[0]}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    List<<%= asEntity('User') %>> findAllByActivatedIsTrue(String pageableStatement);
-
-    @Query("SELECT COUNT(*) as count FROM #{#n1ql.bucket} WHERE #{#n1ql.filter} AND activated = true")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    Long countAllByActivatedIsTrue();
-  <%_ } _%>
-
-  <%_ if (searchEngineCouchbase) { _%>
-    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter} AND SEARCH(#{n1ql.bucket}, #{[0]) #{[1]}")
-    <%= listOrFlux %><User> search(String queryString, String pageableStatement);
-
-    default <%= listOrFlux %><User> search(String queryString) {
-        return search(searchQuery(queryString).toString(), "");
-    }
-
-    default <%= pageOrFlux %><User> search(String queryString, Pageable pageable) {
-        return
-            <% if (!reactive) { %>new PageImpl<>(<% } %>
-                search(searchQuery(queryString).toString(), pageableStatement(pageable))
-            <% if (!reactive) { %>)<% } %>;
-    }
-  <%_ } _%>
 }
 <%_ } else if (databaseTypeSql && reactive) { _%>
 @Repository

package/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs

@@ -75,7 +75,7 @@ public class JWTFilter <% if (reactive) { %>implements WebFilter<% } else { %>ex
         if (StringUtils.hasText(jwt) && this.tokenProvider.validateToken(jwt)) {
             Authentication authentication = this.tokenProvider.getAuthentication(jwt);
 <%_ if (reactive) { _%>
-            return chain.filter(exchange).subscriberContext(ReactiveSecurityContextHolder.withAuthentication(authentication));
+            return chain.filter(exchange).contextWrite(ReactiveSecurityContextHolder.withAuthentication(authentication));
         }
         return chain.filter(exchange);
 <%_ } else { _%>

package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs

@@ -106,7 +106,7 @@ public class TokenProvider {
             .signWith(key, SignatureAlgorithm.HS512)
             .setExpiration(validity)
 <%_ if (reactive) { _%>
-            .serializeToJsonWith(new JacksonSerializer())
+            .serializeToJsonWith(new JacksonSerializer<>())
 <%_ } _%>
             .compact();
     }

package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.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://jhipster.github.io/
  for more information.

package/generators/server/templates/src/main/java/package/service/UserService.java.ejs

@@ -136,7 +136,7 @@ public class UserService {
     private final CacheManager cacheManager;
   <%_ } _%>
 
-    public UserService(UserRepository userRepository<% if (!authenticationTypeOauth2) { %>, PasswordEncoder passwordEncoder<% } %><% if (searchEngineElasticsearch) { %>, UserSearchRepository userSearchRepository<% } %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %><% if (authenticationTypeSession  && !reactive) { %>, PersistentTokenRepository persistentTokenRepository<% } %>, AuthorityRepository authorityRepository<% } %><% if (cacheManagerIsAvailable) { %>, CacheManager cacheManager<% } %>) {
+    public UserService(UserRepository userRepository<% if (!authenticationTypeOauth2) { %>, PasswordEncoder passwordEncoder<% } %><% if (searchEngineElasticsearch) { %>, UserSearchRepository userSearchRepository<% } %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %><% if (authenticationTypeSession && !reactive) { %>, PersistentTokenRepository persistentTokenRepository<% } %>, AuthorityRepository authorityRepository<% } %><% if (cacheManagerIsAvailable) { %>, CacheManager cacheManager<% } %>) {
         this.userRepository = userRepository;
   <%_ if (!authenticationTypeOauth2) { _%>
         this.passwordEncoder = passwordEncoder;
@@ -145,7 +145,7 @@ public class UserService {
         this.userSearchRepository = userSearchRepository;
   <%_ } _%>
   <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
-    <%_ if (authenticationTypeSession  && !reactive) { _%>
+    <%_ if (authenticationTypeSession && !reactive) { _%>
         this.persistentTokenRepository = persistentTokenRepository;
     <%_ } _%>
         this.authorityRepository = authorityRepository;
@@ -402,8 +402,10 @@ public class UserService {
     @Transactional
     <%_ } _%>
     public <% if (reactive) { %>Mono<<%= asEntity('User') %>><% } else { %><%= asEntity('User') %><% } %> createUser(<%= asDto('AdminUser') %> userDTO) {
-        <%= asEntity('User') %> user = new <%= asEntity('User') %>();<% if (databaseTypeCassandra) { %>
-        user.setId(UUID.randomUUID().toString());<% } %>
+        <%= asEntity('User') %> user = new <%= asEntity('User') %>();
+    <%_ if (databaseTypeCassandra) { _%>
+        user.setId(UUID.randomUUID().toString());
+    <%_ } _%>
         user.setLogin(userDTO.getLogin().toLowerCase());
         user.setFirstName(userDTO.getFirstName());
         user.setLastName(userDTO.getLastName());
@@ -598,7 +600,7 @@ public class UserService {
         });
     }
     <%_ } _%>
-  <%_ } /* authenticationType !== 'oauth2'*/  _%>
+  <%_ } /* authenticationType !== 'oauth2'*/ _%>
 
     /**
      * Update basic information (first name, last name, email, language) for the current user.
@@ -751,7 +753,7 @@ public class UserService {
   <%_ } _%>
   <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
     public <% if (reactive) { %>Flux<% } else { %>Page<% } %><<%= asDto('AdminUser') %>> getAllManagedUsers(Pageable pageable) {
-        return userRepository.findAll<% if (reactive) { %><% if (databaseTypeSql) { %>WithAuthorities<% } else { %>ByIdNotNull<% }} %>(pageable).map(<%= asDto('AdminUser') %>::new);
+        return userRepository.findAll<% if (reactive) { %><% if (databaseTypeSql) { %>WithAuthorities<% } else { %>By<% if (!databaseTypeCouchbase) { %>IdNotNull<% }}} %>(pageable).map(<%= asDto('AdminUser') %>::new);
     }
 
     <%_ if (databaseTypeSql) { _%>

package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs

@@ -46,7 +46,6 @@ public class OAuth2ReactiveRefreshTokensWebFilter implements WebFilter {
             .filter(principal -> principal instanceof OAuth2AuthenticationToken)
             .cast(OAuth2AuthenticationToken.class)
             .flatMap(authentication -> authorizedClient(exchange, authentication))
-            .onErrorResume(e -> Mono.empty())
             .thenReturn(exchange)
             .flatMap(chain::filter);
     }

package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs

@@ -216,7 +216,7 @@ public class AccountResource {
         }
     }
 }
-<%_ } else {  /* not oauth, not skipUserManagement */ _%>
+<%_ } else { /* not oauth, not skipUserManagement */ _%>
   <%_ if (authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 import <%= packageName %>.repository.PersistentTokenRepository;