Migration

Author: Rakambda

build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-log4j2")
     implementation("org.springframework.boot:spring-boot-starter-validation")
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.apache.logging.log4j:log4j-layout-template-json")
     modules {
@@ -74,8 +74,8 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 tasks.withType<JavaCompile>(){
@@ -90,7 +90,7 @@ springBoot {
 
 jib {
     from {
-        image = "eclipse-temurin:21-jdk"
+        image = "eclipse-temurin:25-jdk"
         platforms {
             platform {
                 os = "linux"

src/main/java/fr/rakambda/rsndiscord/spring/Application.java

@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication(scanBasePackages = "fr.rakambda.rsndiscord.spring")

src/main/java/fr/rakambda/rsndiscord/spring/amqp/AmqpConfiguration.java

@@ -1,6 +1,5 @@
 package fr.rakambda.rsndiscord.spring.amqp;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.CustomExchange;
@@ -9,13 +8,15 @@
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.retry.backoff.ExponentialBackOffPolicy;
-import org.springframework.retry.support.RetryTemplate;
+import org.springframework.core.retry.RetryPolicy;
+import org.springframework.core.retry.RetryTemplate;
+import org.springframework.util.backoff.ExponentialBackOff;
+import tools.jackson.databind.json.JsonMapper;
 import java.util.Map;
 
 @Configuration
@@ -47,14 +48,17 @@ public Binding delayBinding(@Qualifier("delayQueue") Queue testeQueue, @Qualifie
 	}
 
 	@Bean
-	public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, Jackson2JsonMessageConverter messageConverter){
-		var backOffPolicy = new ExponentialBackOffPolicy();
-		backOffPolicy.setInitialInterval(1000);
-		backOffPolicy.setMultiplier(10);
-		backOffPolicy.setMaxInterval(60000);
+	public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, JacksonJsonMessageConverter messageConverter){
+		var backOff = new ExponentialBackOff();
+		backOff.setInitialInterval(1000);
+		backOff.setMultiplier(10);
+		backOff.setMaxInterval(60000);
 
-		var retryTemplate = new RetryTemplate();
-		retryTemplate.setBackOffPolicy(backOffPolicy);
+		var retryPolicy = RetryPolicy.builder()
+				.backOff(backOff)
+				.build();
+		
+		var retryTemplate = new RetryTemplate(retryPolicy);
 
 		var rabbitTemplate = new RabbitTemplate(connectionFactory);
 		rabbitTemplate.setMessageConverter(messageConverter);
@@ -63,7 +67,7 @@ public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, Jackso
 	}
 
 	@Bean
-	public Jackson2JsonMessageConverter producerJackson2MessageConverter(ObjectMapper jsonObjectMapper){
-		return new Jackson2JsonMessageConverter(jsonObjectMapper);
+	public JacksonJsonMessageConverter producerJackson2MessageConverter(JsonMapper jsonMapper){
+		return new JacksonJsonMessageConverter(jsonMapper);
 	}
 }