migrate spring-bootfrom 2 to 3

Author: thomaswoehlke

pom.xml

@@ -640,6 +640,12 @@
                 <artifactId>antlr-runtime</artifactId>
                 <version>3.5.3</version>
             </dependency>
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>4.11.1</version>
+                <scope>runtime</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1104,13 +1110,11 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
         </dependency>
-        <!--
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
-        -->
     </dependencies>
 
     <build>

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/passwordrecovery/UserAccountPasswordRecoveryServiceImpl.java

@@ -13,6 +13,9 @@
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccountPasswordRecovery;
 import org.woehlke.java.simpleworklist.domain.db.user.token.TokenGeneratorService;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.UUID;
 
@@ -49,8 +52,10 @@ public boolean passwordRecoveryIsRetryAndMaximumNumberOfRetries(String email) {
     public void passwordRecoveryCheckIfResponseIsInTime(String email) {
         UserAccountPasswordRecovery earlierOptIn = userAccountPasswordRecoveryRepository.findByEmail(email);
         if (earlierOptIn != null) {
-            Date now = new Date();
-            if ((simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest() + earlierOptIn.getRowCreatedAt().getTime()) < now.getTime()) {
+            ZoneId zone = ZoneId.systemDefault();
+            ZoneOffset offset = ZoneOffset.UTC;
+            LocalDateTime now = LocalDateTime.now(zone);
+            if ((simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest() + earlierOptIn.getRowCreatedAt().toEpochSecond(offset)) < now.toEpochSecond(offset)) {
                 userAccountPasswordRecoveryRepository.delete(earlierOptIn);
             }
         }

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/signup/UserAccountRegistrationServiceImpl.java

@@ -1,5 +1,8 @@
 package org.woehlke.java.simpleworklist.domain.db.user.signup;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.UUID;
 
@@ -52,9 +55,11 @@ public boolean registrationIsRetryAndMaximumNumberOfRetries(String email) {
     public void registrationCheckIfResponseIsInTime(String email) {
         UserAccountRegistration earlierOptIn = userAccountRegistrationRepository.findByEmail(email);
         if (earlierOptIn != null) {
-            Date now = new Date();
+            ZoneId zone = ZoneId.systemDefault();
+            ZoneOffset offset = ZoneOffset.UTC;
+            LocalDateTime now = LocalDateTime.now(zone);
             if ((simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest()
-                + earlierOptIn.getRowCreatedAt().getTime()) < now.getTime()) {
+                + earlierOptIn.getRowCreatedAt().toEpochSecond(offset)) < now.toEpochSecond(offset)) {
                 userAccountRegistrationRepository.delete(earlierOptIn);
             }
         }

src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserRegistrationServiceIT.java

@@ -18,6 +18,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.java.simpleworklist.domain.db.user.signup.UserAccountRegistrationService;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.UUID;
 
@@ -113,7 +116,8 @@ public void testCheckIfResponseIsInTimeNewUser(){
         UserAccountRegistration o = testHelperService.findRegistrationByEmail(emails[0]);
         //assertNull(o);
         assertNotNull(o);
-        o.setRowCreatedAt(new Date(o.getRowCreatedAt().getTime() - simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest()));
+        LocalDateTime a = o.getRowCreatedAt().minusSeconds(simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest());
+        o.setRowCreatedAt(a);
         o.setNumberOfRetries(0);
         userAccountRegistrationService.registrationClickedInEmail(o);
         userAccountRegistrationService.registrationCheckIfResponseIsInTime(emails[0]);
@@ -133,7 +137,8 @@ public void testCheckIfResponseIsInTime(){
         userAccountPasswordRecoveryService.passwordRecoveryCheckIfResponseIsInTime(emails[0]);
         UserAccountPasswordRecovery o = testHelperService.findPasswordRecoveryByEmail(emails[0]);
         assertNotNull(o);
-        o.setRowCreatedAt(new Date(o.getRowCreatedAt().getTime() -  simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest()));
+        LocalDateTime a = o.getRowCreatedAt().minusSeconds(simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest());
+        o.setRowCreatedAt(a);
         o.setNumberOfRetries(0);
         userAccountPasswordRecoveryService.passwordRecoveryClickedInEmail(o);
         userAccountPasswordRecoveryService.passwordRecoveryCheckIfResponseIsInTime(emails[0]);