Merge pull request #57 from dancier/upgrade-boot

upgrade boot to 3.2 from 2.7
dancier · Jan 14, 2024 · 70ef8f6 · 70ef8f6
2 parents 43aafb1 + 09a8608
commit 70ef8f6
Show file tree

Hide file tree

Showing 91 changed files with 664 additions and 751 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v3
-    - name: Set up JDK 1.17
-      uses: actions/setup-java@v3
+      uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 17.0.4+1
+        java-version: 21
         distribution: zulu
     - name: Build the project with Maven
       run: ./mvnw --batch-mode -update-snapshots package

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openjdk:17-slim
+FROM openjdk:21-slim
 
 ADD target/dancer.jar /dancer.jar
 CMD ["java", "--enable-preview", "-jar", "/dancer.jar"]

diff --git a/Readme.md b/Readme.md
@@ -58,7 +58,7 @@ Here you can configure the connection to the postgres instance:
 # stopping dancer in docker-compose
 docker-compose stop dancer;
 # running the boot app with overwriting the needed host
-./mvnw spring-boot:run -Dspring-boot.run.arguments="--spring.datasource.url=jdbc:postgresql://localhost:5432/dancer --spring.kafka.bootstrap-servers=localhost:9092"
+./mvnw spring-boot:run -Dspring-boot.run.arguments="--spring.datasource.url=jdbc:postgresql://localhost:5432/dancer
 ````
 
 #### checking test-coverage

diff --git a/swagger.yaml → api/swagger.yaml b/swagger.yaml → api/swagger.yaml
@@ -398,7 +398,9 @@ paths:
       tags:
         - Contacts
       requestBody:
-        description: the mail will end up in [email protected]
+        description: >
+          The mail will end up in [email protected], the sender will also get a copy of the mail.
+          When the user of this endpoint is logged in, the senders email-address will be the one from the user. In this case the provided value in this payload will be ignored.
         required: true
         content:
           application/json:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - dancer-db
     environment:
 #   https://ckinan.com/blog/remote-debug-spring-boot-docker-intellij/:
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://dancer-db:5432/dancer
       - SPRING_PROFILES_ACTIVE="dev"
       - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
   dancer-db:
@@ -27,7 +28,7 @@ services:
       - ./volumes/dancer-data:/var/lib/postgresql/data
 
   pg-admin:
-    image: dpage/pgadmin4:7
+    image: dpage/pgadmin4:8.1
     restart: always
     ports:
       - "5050:80"

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.14</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>net.dancier</groupId>
@@ -14,8 +14,7 @@
 	<name>dancer</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<spring-security.version>5.8.8</spring-security.version>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<testcontainers.version>1.15.1</testcontainers.version>
 	</properties>
 	<dependencies>
@@ -51,15 +50,35 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.cloudevents</groupId>
+			<artifactId>cloudevents-kafka</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.cloudevents</groupId>
+			<artifactId>cloudevents-json-jackson</artifactId>
+			<version>2.5.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-springsecurity6</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.vladmihalcea</groupId>
 			<artifactId>hibernate-types-52</artifactId>
@@ -101,6 +120,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>io.minio</groupId>
@@ -151,37 +171,17 @@
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<finalName>dancer</finalName>
 		<plugins>
-			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
-                </configuration>
-            </plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>--enable-preview</argLine>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			    <configuration>
-					<argLine>--enable-preview</argLine>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.7</version>
+				<version>0.8.11</version>
 				<executions>
 					<execution>
 						<goals>
@@ -201,7 +201,12 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<jvmArguments>--enable-preview</jvmArguments>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/src/main/java/net/dancier/dancer/DancerApplication.java b/src/main/java/net/dancier/dancer/DancerApplication.java
@@ -8,7 +8,7 @@
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.TimeZone;
 
 @SpringBootApplication

diff --git a/src/main/java/net/dancier/dancer/authentication/AdminUserInitializer.java b/src/main/java/net/dancier/dancer/authentication/AdminUserInitializer.java
@@ -14,8 +14,8 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.transaction.Transactional;
+import jakarta.annotation.PostConstruct;
+import jakarta.transaction.Transactional;
 import java.util.Collection;
 import java.util.Optional;
 

diff --git a/src/main/java/net/dancier/dancer/authentication/AuthenticationController.java b/src/main/java/net/dancier/dancer/authentication/AuthenticationController.java
@@ -27,9 +27,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
@@ -64,6 +64,7 @@ public ResponseEntity<?> whoami() {
     @Secured({ROLE_HUMAN})
     @PostMapping("/registrations")
     public ResponseEntity<?> register(@Valid @RequestBody RegisterRequestDto registerRequest) {
+        log.info("About to register user: " + registerRequest);
         try {
             authenticationService.registerUser(registerRequest);
         } catch (UserOrEmailAlreadyExistsException userOrEmailAlreadyExistsException) {
@@ -107,19 +108,19 @@ public ResponseEntity<?> loginAsHuman(@RequestHeader(required = false, name = "X
                                           HttpServletResponse httpServletResponse) {
         log.info("Log in as human");
         ResponseCookie cookie = null;
+        String jwt = null;
         try {
            captchaService.verifyToken(token);
+           jwt = authenticationService.generateJwtToken("HUMAN");
            cookie = authenticationService
-                   .generateCookie(
-                           authenticationService.generateJwtToken("HUMAN")
-                   );
+                   .generateCookie(jwt);
            httpServletResponse.addHeader(HttpHeaders.SET_COOKIE, cookie.toString());
         } catch (CaptchaException captchaException) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(
                     new ApiResponse(false, "Not authorized as a human: " + captchaException.getMessage())
             );
         }
-        return ResponseEntity.ok().build();
+        return ResponseEntity.ok(new JwtAuthenticationResponse(jwt));
     }
 
     @GetMapping("/logout")

diff --git a/src/main/java/net/dancier/dancer/authentication/dto/RegisterRequestDto.java b/src/main/java/net/dancier/dancer/authentication/dto/RegisterRequestDto.java
@@ -4,7 +4,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
 
 @Data
 @AllArgsConstructor

diff --git a/src/main/java/net/dancier/dancer/authentication/dto/SendLinkDto.java b/src/main/java/net/dancier/dancer/authentication/dto/SendLinkDto.java
@@ -3,9 +3,9 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 @Data
 @NoArgsConstructor

diff --git a/src/main/java/net/dancier/dancer/authentication/event/NewUserCreatedEventListener.java b/src/main/java/net/dancier/dancer/authentication/event/NewUserCreatedEventListener.java
@@ -4,10 +4,11 @@
 import net.dancier.dancer.authentication.model.EmailValidationCode;
 import net.dancier.dancer.authentication.repository.EmailValidationCodeRepository;
 import net.dancier.dancer.mail.service.MailCreationService;
-import net.dancier.dancer.mail.service.MailEnqueueService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
+import org.springframework.mail.SimpleMailMessage;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
@@ -23,7 +24,8 @@ public class NewUserCreatedEventListener {
     private final static Logger log = LoggerFactory.getLogger(NewUserCreatedEventListener.class);
 
     private final EmailValidationCodeRepository emailValidationCodeRepository;
-    private final MailEnqueueService mailEnqueueService;
+
+    private final ApplicationEventPublisher applicationEventPublisher;
 
     private final MailCreationService mailCreationService;
 
@@ -41,20 +43,20 @@ void handle(NewUserCreatedEvent newUserCreatedEvent) {
         emailValidationCode.setUserId(newUserCreatedEvent.getId());
         emailValidationCode.setCode(UUID.randomUUID().toString());
         emailValidationCodeRepository.save(emailValidationCode);
-        enqueueUserMail(newUserCreatedEvent, emailValidationCode.getCode());
+        applicationEventPublisher.publishEvent(
+            createMailMessage(newUserCreatedEvent, emailValidationCode.getCode())
+        );
         log.debug("Created validation code: " + emailValidationCode.getCode() + " for user: " + newUserCreatedEvent);
     }
 
-    private void enqueueUserMail(NewUserCreatedEvent newUserCreatedEvent, String code) {
-        mailEnqueueService.enqueueMail(
-                mailCreationService.createDancierMessageFromTemplate(
+    private SimpleMailMessage createMailMessage(NewUserCreatedEvent newUserCreatedEvent, String code) {
+        return mailCreationService.createDancierMessageFromTemplate(
                         newUserCreatedEvent.getEmail(),
                         MailCreationService.NO_REPLY_FROM,
                         "Dancier - bestätige Deine E-Mail-Adresse!",
                         MailCreationService.NEW_USER_VALIDATE_EMAIL,
                         Map.of( "validationLink", emailValidationLink(code)
-                        ))
-        );
+                        ));
     }
 
     private String emailValidationLink(String validationCode) {

diff --git a/src/main/java/net/dancier/dancer/authentication/model/EmailValidationCode.java b/src/main/java/net/dancier/dancer/authentication/model/EmailValidationCode.java
@@ -2,8 +2,8 @@
 
 import lombok.Data;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.UUID;
 

diff --git a/src/main/java/net/dancier/dancer/authentication/model/PasswordResetCode.java b/src/main/java/net/dancier/dancer/authentication/model/PasswordResetCode.java
@@ -2,7 +2,7 @@
 
 import lombok.Data;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 import java.util.UUID;
 

diff --git a/src/main/java/net/dancier/dancer/authentication/model/Role.java b/src/main/java/net/dancier/dancer/authentication/model/Role.java
@@ -1,9 +1,8 @@
 package net.dancier.dancer.authentication.model;
 
+import jakarta.persistence.*;
 import lombok.Data;
-import org.hibernate.annotations.NaturalId;
 
-import javax.persistence.*;
 import java.util.UUID;
 
 @Data

diff --git a/src/main/java/net/dancier/dancer/authentication/model/User.java b/src/main/java/net/dancier/dancer/authentication/model/User.java
@@ -2,11 +2,11 @@
 
 import lombok.Data;
 
-import javax.persistence.*;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.Collection;
 import java.util.UUID;
 

diff --git a/src/main/java/net/dancier/dancer/authentication/model/VerifiedActionCode.java b/src/main/java/net/dancier/dancer/authentication/model/VerifiedActionCode.java
@@ -2,8 +2,8 @@
 
 import lombok.Data;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.UUID;