SONAR-16567 remove confusing select method in UserTokenDao

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDao.java
index 581db16e8634e19960d90ec1b55d035330e2b5e3..0be2206bf1df0c416a81e5b1c7625ee361257dff 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserTokenDao.java
@@ -61,11 +61,6 @@ public class UserTokenDao implements Dao {
     return mapper(dbSession).selectTokensExpiredOnDate(timestamp);
   }
 
-  public List<UserTokenDto> selectExpiredTokens(DbSession dbSession){
-    long timestamp = LocalDate.now().atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli();
-    return mapper(dbSession).selectTokensExpiredOnDate(timestamp);
-  }
-
   public void updateWithoutAudit(DbSession dbSession, UserTokenDto userTokenDto) {
     mapper(dbSession).update(userTokenDto);
   }

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoTest.java
index 4058abe180e5a5bd516ae8c2fe56d3604a0a5b6b..de5d12ba329909211512eefb50940604a970adb3 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoTest.java
@@ -91,17 +91,6 @@ public class UserTokenDaoTest {
       .containsOnly(token2);
   }
 
-  @Test
-  public void select_expired_tokens() {
-    String token1 = insertTokenExpiredInDays(0);
-    String token2 = insertTokenExpiredInDays(7);
-    String token3 = insertTokenExpiredInDays(14);
-    List<UserTokenDto> tokenList = underTest.selectExpiredTokens(dbSession);
-    assertThat(tokenList).hasSize(1)
-      .extracting(UserTokenDto::getTokenHash)
-      .containsOnly(token1);
-  }
-
   private String insertTokenExpiredInDays(long days){
     long expirationDate = LocalDate.now().plusDays(days).atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli();
     UserTokenDto userToken = newUserToken().setExpirationDate(expirationDate);

diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSender.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSender.java
index d40cdcc67dd8673f98ab715b5e3011c67b279296..128fdfa754f9d75c509fd89f8ef2997c9c28dc7d 100644 (file)
--- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSender.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSender.java
@@ -45,7 +45,7 @@ public class TokenExpirationNotificationSender {
     }
     try (var dbSession = dbClient.openSession(false)) {
       var expiringTokens = dbClient.userTokenDao().selectTokensExpiredInDays(dbSession, 7);
-      var expiredTokens = dbClient.userTokenDao().selectExpiredTokens(dbSession);
+      var expiredTokens = dbClient.userTokenDao().selectTokensExpiredInDays(dbSession, 0);
       var tokensToNotify = Stream.concat(expiringTokens.stream(), expiredTokens.stream()).collect(Collectors.toList());
       var usersToNotify = tokensToNotify.stream().map(UserTokenDto::getUserUuid).collect(Collectors.toSet());
       Map<String, String> userUuidToEmail = dbClient.userDao().selectByUuids(dbSession, usersToNotify).stream()

diff --git a/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSenderTest.java b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSenderTest.java
index 39943e8973563771bb9ac7eab1b0d523c5568361..0252a2540b61847ee5af22d256f76ec451e2df91 100644 (file)
--- a/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSenderTest.java
+++ b/server/sonar-webserver-auth/src/test/java/org/sonar/server/usertoken/notification/TokenExpirationNotificationSenderTest.java
@@ -34,7 +34,7 @@ import org.sonar.db.user.UserTokenDto;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -66,8 +66,8 @@ public class TokenExpirationNotificationSenderTest {
     var userTokenDao = mock(UserTokenDao.class);
     var userDao = mock(UserDao.class);
     when(userDao.selectByUuids(any(), any())).thenReturn(List.of(user));
-    when(userTokenDao.selectTokensExpiredInDays(any(), anyLong())).thenReturn(List.of(expiringToken));
-    when(userTokenDao.selectExpiredTokens(any())).thenReturn(List.of(expiredToken));
+    when(userTokenDao.selectTokensExpiredInDays(any(), eq(7L))).thenReturn(List.of(expiringToken));
+    when(userTokenDao.selectTokensExpiredInDays(any(), eq(0L))).thenReturn(List.of(expiredToken));
     when(dbClient.userTokenDao()).thenReturn(userTokenDao);
     when(dbClient.userDao()).thenReturn(userDao);
     when(emailComposer.areEmailSettingsSet()).thenReturn(true);