generator-jhipster 7.4.1 → 7.7.0

package/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.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.

package/generators/server/templates/src/main/java/package/repository/UserRepository.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.
@@ -62,16 +62,10 @@ 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) { _%>
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.JpaRepository;
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
 import org.springframework.data.domain.Sort;
 import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
@@ -84,6 +78,9 @@ import org.springframework.data.relational.core.sql.Table;
 
 import static org.springframework.data.relational.core.query.Criteria.where;
 import static org.springframework.data.relational.core.query.Query.query;
+  <%_ } else { _%>
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
   <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
@@ -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,22 +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)
     <%_ } _%>
-    <%_ if (databaseTypeCouchbase) { _%>
-    @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) { _%>
@@ -262,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
@@ -474,18 +448,18 @@ public class UserRepository {
     public static final String USERS_BY_EMAIL_CACHE = "usersByEmail";
   <%_ } _%>
 
-  <%_ if (!reactive) { _%>
-    private final CqlSession session;
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     private final ReactiveSession session;
+  <%_ } else { _%>
+    private final CqlSession session;
   <%_ } _%>
 
     private final Validator validator;
 
-  <%_ if (!reactive) { _%>
-    private UserDao userDao;
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     private final ReactiveCassandraTemplate cqlTemplate;
+  <%_ } else { _%>
+    private UserDao userDao;
   <%_ } _%>
 
   <%_ if (reactive) { _%>
@@ -531,13 +505,13 @@ public class UserRepository {
     public UserRepository(<% if (reactive) { %>ReactiveCassandraTemplate cqlTemplate, Reactive<% } else { %>Cql<% } %>Session session, Validator validator<% if (!reactive) { %>, CassandraProperties cassandraProperties<% } %>) {
         this.session = session;
         this.validator = validator;
-  <%_ if (!reactive) { _%>
-        UserTokenMapper userTokenMapper = new UserTokenMapperBuilder(session).build();
-        userDao = userTokenMapper.userTokenDao(CqlIdentifier.fromCql(cassandraProperties.getKeyspaceName()));
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         this.cqlTemplate = cqlTemplate;
 
         findAllStmt = session.prepare("SELECT * FROM user")<% if (reactive) { %>.block()<% } %>;
+  <%_ } else { _%>
+        UserTokenMapper userTokenMapper = new UserTokenMapperBuilder(session).build();
+        userDao = userTokenMapper.userTokenDao(CqlIdentifier.fromCql(cassandraProperties.getKeyspaceName()));
   <%_ } _%>
 
         findOneByActivationKeyStmt = session.prepare(
@@ -608,9 +582,7 @@ public class UserRepository {
     }
 
     public <%= optionalOrMono %><<%= asEntity('User') %>> findById(String id) {
-  <%_ if (!reactive) { _%>
-        return userDao.get(id);
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         return cqlTemplate.selectOneById(id, <%= asEntity('User') %>.class)
             .map(user -> {
                 if (user.getAuthorities() == null) {
@@ -618,6 +590,8 @@ public class UserRepository {
                 }
                 return user;
             });
+  <%_ } else { _%>
+        return userDao.get(id);
   <%_ } _%>
     }
 
@@ -648,9 +622,7 @@ public class UserRepository {
     }
 
     public <%= listOrFlux %><<%= asEntity('User') %>> findAll() {
-  <%_ if (!reactive) { _%>
-        return userDao.findAll().all();
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         return cqlTemplate.select(findAllStmt.bind(), <%= asEntity('User') %>.class)
             .map(user -> {
                 if (user.getAuthorities() == null) {
@@ -658,6 +630,8 @@ public class UserRepository {
                 }
                 return user;
             });
+  <%_ } else { _%>
+        return userDao.findAll().all();
   <%_ } _%>
     }
 
@@ -666,44 +640,7 @@ public class UserRepository {
         if (violations != null && !violations.isEmpty()) {
             throw new ConstraintViolationException(violations);
         }
-  <%_ if (!reactive) { _%>
-        <%= asEntity('User') %> oldUser = userDao.get(user.getId()).orElse(null);
-        if (oldUser != null) {
-            if (!StringUtils.isEmpty(oldUser.getActivationKey()) && !oldUser.getActivationKey().equals(user.getActivationKey())) {
-                session.execute(deleteByActivationKeyStmt.bind().setString("activation_key", oldUser.getActivationKey()));
-            }
-            if (!StringUtils.isEmpty(oldUser.getResetKey()) && !oldUser.getResetKey().equals(user.getResetKey())) {
-                session.execute(deleteByResetKeyStmt.bind().setString("reset_key", oldUser.getResetKey()));
-            }
-            if (!StringUtils.isEmpty(oldUser.getLogin()) && !oldUser.getLogin().equals(user.getLogin())) {
-                session.execute(deleteByLoginStmt.bind().setString("login", oldUser.getLogin()));
-            }
-            if (!StringUtils.isEmpty(oldUser.getEmail()) && !oldUser.getEmail().equalsIgnoreCase(user.getEmail())) {
-                session.execute(deleteByEmailStmt.bind().setString("email", oldUser.getEmail().toLowerCase()));
-            }
-        }
-        BatchStatementBuilder batch = BatchStatement.builder(DefaultBatchType.LOGGED);
-        batch.addStatement(userDao.saveQuery(user));
-        if (!StringUtils.isEmpty(user.getActivationKey())) {
-            batch.addStatement(insertByActivationKeyStmt.bind()
-                .setString("activation_key", user.getActivationKey())
-                .setString("id", user.getId()));
-        }
-        if (!StringUtils.isEmpty(user.getResetKey())) {
-            batch.addStatement(insertByResetKeyStmt.bind()
-                .setString("reset_key", user.getResetKey())
-                .setString("id", user.getId()));
-        }
-        batch.addStatement(insertByLoginStmt.bind()
-            .setString("login", user.getLogin())
-            .setString("id", user.getId()));
-        batch.addStatement(insertByEmailStmt.bind()
-            .setString("email", user.getEmail().toLowerCase())
-            .setString("id", user.getId()));
-        session.execute(batch.build());
-        return user;
-    }
-  <%_ } else { /* reactive */ _%>
+  <%_ if (reactive) { _%>
         return this.findById(user.getId())
             .flatMapMany(oldUser -> {
                 Flux<ReactiveResultSet> deleteOps = Flux.empty();
@@ -758,11 +695,48 @@ public class UserRepository {
         }
         return insert.build();
     }
+  <%_ } else { /* !reactive */ _%>
+        <%= asEntity('User') %> oldUser = userDao.get(user.getId()).orElse(null);
+        if (oldUser != null) {
+            if (!StringUtils.isEmpty(oldUser.getActivationKey()) && !oldUser.getActivationKey().equals(user.getActivationKey())) {
+                session.execute(deleteByActivationKeyStmt.bind().setString("activation_key", oldUser.getActivationKey()));
+            }
+            if (!StringUtils.isEmpty(oldUser.getResetKey()) && !oldUser.getResetKey().equals(user.getResetKey())) {
+                session.execute(deleteByResetKeyStmt.bind().setString("reset_key", oldUser.getResetKey()));
+            }
+            if (!StringUtils.isEmpty(oldUser.getLogin()) && !oldUser.getLogin().equals(user.getLogin())) {
+                session.execute(deleteByLoginStmt.bind().setString("login", oldUser.getLogin()));
+            }
+            if (!StringUtils.isEmpty(oldUser.getEmail()) && !oldUser.getEmail().equalsIgnoreCase(user.getEmail())) {
+                session.execute(deleteByEmailStmt.bind().setString("email", oldUser.getEmail().toLowerCase()));
+            }
+        }
+        BatchStatementBuilder batch = BatchStatement.builder(DefaultBatchType.LOGGED);
+        batch.addStatement(userDao.saveQuery(user));
+        if (!StringUtils.isEmpty(user.getActivationKey())) {
+            batch.addStatement(insertByActivationKeyStmt.bind()
+                .setString("activation_key", user.getActivationKey())
+                .setString("id", user.getId()));
+        }
+        if (!StringUtils.isEmpty(user.getResetKey())) {
+            batch.addStatement(insertByResetKeyStmt.bind()
+                .setString("reset_key", user.getResetKey())
+                .setString("id", user.getId()));
+        }
+        batch.addStatement(insertByLoginStmt.bind()
+            .setString("login", user.getLogin())
+            .setString("id", user.getId()));
+        batch.addStatement(insertByEmailStmt.bind()
+            .setString("email", user.getEmail().toLowerCase())
+            .setString("id", user.getId()));
+        session.execute(batch.build());
+        return user;
+    }
   <%_ } _%>
 
     public <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> delete(<%= asEntity('User') %> user) {
         BatchStatementBuilder batch = BatchStatement.builder(DefaultBatchType.LOGGED);
-        batch.addStatement(<% if (!reactive) { %>userDao.deleteQuery(user)<% } else { %>deleteByIdStmt.bind().setString("id", user.getId())<% } %>);
+        batch.addStatement(<% if (reactive) { %>deleteByIdStmt.bind().setString("id", user.getId())<% } else { %>userDao.deleteQuery(user)<% } %>);
         if (!StringUtils.isEmpty(user.getActivationKey())) {
             batch.addStatement(deleteByActivationKeyStmt.bind().setString("activation_key", user.getActivationKey()));
         }
@@ -771,14 +745,27 @@ public class UserRepository {
         }
         batch.addStatement(deleteByLoginStmt.bind().setString("login", user.getLogin()));
         batch.addStatement(deleteByEmailStmt.bind().setString("email", user.getEmail().toLowerCase()));
-  <%_ if (!reactive) { _%>
-        session.execute(batch.build());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         return session.execute(batch.build()).then();
+  <%_ } else { _%>
+        session.execute(batch.build());
   <%_ } _%>
     }
 
-  <%_ if (!reactive) { _%>
+  <%_ if (reactive) { _%>
+    private Mono<<%= asEntity('User') %>> findOneFromIndex(BoundStatement stmt) {
+        return session.execute(stmt).flatMap(rs -> rs.rows().next())
+            .map(row -> row.getString("id"))
+            .flatMap(this::findById);
+    }
+
+    public Mono<Void> deleteAll() {
+        return Flux.just(truncateStmt, truncateByEmailStmt, truncateByLoginStmt, truncateByResetKeyStmt)
+            .map(PreparedStatement::bind)
+            .flatMap(session::execute)
+            .then();
+    }
+  <%_ } else { _%>
     private Optional<<%= asEntity('User') %>> findOneFromIndex(BoundStatement stmt) {
         ResultSet rs = session.execute(stmt);
         return Optional
@@ -800,19 +787,6 @@ public class UserRepository {
         BoundStatement truncateByResetKey = truncateByResetKeyStmt.bind();
         session.execute(truncateByResetKey);
     }
-  <%_ } else { _%>
-    private Mono<<%= asEntity('User') %>> findOneFromIndex(BoundStatement stmt) {
-        return session.execute(stmt).flatMap(rs -> rs.rows().next())
-            .map(row -> row.getString("id"))
-            .flatMap(this::findById);
-    }
-
-    public Mono<Void> deleteAll() {
-        return Flux.just(truncateStmt, truncateByEmailStmt, truncateByLoginStmt, truncateByResetKeyStmt)
-            .map(PreparedStatement::bind)
-            .flatMap(session::execute)
-            .then();
-    }
   <%_ } _%>
 }
   <%_ if (!reactive) { _%>

package/generators/server/templates/src/main/java/package/repository/package-info.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.

package/generators/server/templates/src/main/java/package/{service → repository/rowmapper}/ColumnConverter.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.
@@ -16,13 +16,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= packageName %>.repository.rowmapper;
 
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
 import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
 import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import org.springframework.util.ClassUtils;
 
 import io.r2dbc.spi.Row;
@@ -30,7 +30,7 @@ import io.r2dbc.spi.Row;
 /**
  * This service provides helper function dealing with the low level {@link Row} and Spring's {@link R2dbcCustomConversions}, so type conversions can be applied.
  */
-@Service
+@Component
 public class ColumnConverter {
 
     private final ConversionService conversionService;

package/generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.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.
@@ -25,7 +25,6 @@ import java.util.function.BiFunction;
 import org.springframework.stereotype.Service;
 
 import <%= packageName %>.domain.<%= asEntity('User') %>;
-import <%= packageName %>.service.ColumnConverter;
 
 import io.r2dbc.spi.Row;
 

package/generators/server/templates/src/main/java/package/repository/search/UserSearchRepository.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.

package/generators/server/templates/src/main/java/package/repository/search/package-info.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.

package/generators/server/templates/src/main/java/package/security/AuthoritiesConstants.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.

package/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.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.
@@ -62,7 +62,7 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<%
 <%_ if (databaseTypeSql) { _%>
     @Transactional
 <%_ } _%>
-    public <% if (!reactive) { %>UserDetails loadUserByUsername<% } else { %>Mono<UserDetails> findByUsername<% } %>(final String login) {
+    public <% if (reactive) { %>Mono<UserDetails> findByUsername<% } else { %>UserDetails loadUserByUsername<% } %>(final String login) {
         log.debug("Authenticating {}", login);
 
         if (new EmailValidator().isValid(login, null)) {

package/generators/server/templates/src/main/java/package/security/IatTokenEnhancer.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.

package/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.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.