Merge pull request #1310 from xerikssonx/migrate_to_spring_boot_3

Migrate to spring boot 3

Author: straumat

pom.xml

@@ -55,7 +55,7 @@
 <parent>
 <groupId>org.springframework.boot</groupId>
 <artifactId>spring-boot-starter-parent</artifactId>
-<version>2.7.18</version>
+<version>3.3.5</version>
 <relativePath/>
 </parent>
 <!-- =========================================================================================================== -->
@@ -73,12 +73,13 @@
 <!-- Libraries releases -->
 
 <!-- Core -->
-<spring.version>2.7.18</spring.version>
+<spring.version>3.3.5</spring.version>
 <reactor.version>Dysprosium-SR25</reactor.version>
 <xchange.version>5.0.13</xchange.version>
 <bucket4j.version>8.0.1</bucket4j.version>
 <liquibase.version>4.29.1</liquibase.version>
 <opencsv.version>5.9</opencsv.version>
+<javax.ws.rs.version>2.1.1</javax.ws.rs.version>
 
 <!-- Core utils -->
 <lombok.version>1.18.34</lombok.version>
@@ -93,7 +94,7 @@
 <jackson.version>2.15.2</jackson.version>
 
 <!-- GraphQL API -->
-<graphql-dgs.version>5.3.0</graphql-dgs.version>
+<graphql-dgs.version>9.1.3</graphql-dgs.version>
 
 <!-- Maven -->
 <maven.checkstyle.plugin.version>3.5.0</maven.checkstyle.plugin.version>

spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/java/tech/cassandre/trading/bot/configuration/GraphQLAPIKeyAuthenticationFilter.java

@@ -2,7 +2,7 @@
 
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * GraphQL API authentication filter.

spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/java/tech/cassandre/trading/bot/configuration/GraphQLAPISecurityConfiguration.java

@@ -1,47 +1,51 @@
 package tech.cassandre.trading.bot.configuration;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 
 import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
 
 /**
  * GraphQL API security configuration.
  */
+@SuppressWarnings("DesignForExtension")
 @Configuration
-@EnableWebSecurity
-@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 1)
-public class GraphQLAPISecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class GraphQLAPISecurityConfiguration {
 
- /** API Key. */
+ /**
+ * API Key.
+ */
  @Value("${cassandre.trading.bot.api.graphql.key:}")
  private String key;
 
- @Override
- protected final void configure(final HttpSecurity http) throws Exception {
+ @Bean
+ @Order(Ordered.HIGHEST_PRECEDENCE + 1)
+ public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws Exception {
  if (key == null || key.isBlank()) {
  // if key is not set, no security at all. Everything is accessible.
- http.antMatcher("/graphql/**")
- .csrf().disable()
- .sessionManagement().sessionCreationPolicy(STATELESS)
- .and()
- .authorizeRequests().anyRequest().permitAll();
+ http
+ .securityMatcher("/graphql/**")
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(STATELESS))
+ .authorizeHttpRequests(auth -> auth.anyRequest().permitAll());
  } else {
  // If a key is set, we ask for key on every request (X-API-Key header).
  GraphQLAPIKeyAuthenticationFilter filter = new GraphQLAPIKeyAuthenticationFilter();
  filter.setAuthenticationManager(new GraphQLAPIKeyAuthenticationManager(key));
- http.antMatcher("/graphql/**")
- .csrf().disable()
- .sessionManagement().sessionCreationPolicy(STATELESS)
- .and()
+ http
+ .securityMatcher("/graphql/**")
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(STATELESS))
  .addFilter(filter)
- .authorizeRequests().anyRequest().authenticated();
+ .authorizeHttpRequests(auth -> auth.anyRequest().authenticated());
  }
+ return http.build();
  }
 
 }

spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,7 @@
+tech.cassandre.trading.bot.configuration.GraphQLAPISecurityConfiguration
+tech.cassandre.trading.bot.api.graphql.data.AccountDataFetcher
+tech.cassandre.trading.bot.api.graphql.data.ConfigurationDataFetcher
+tech.cassandre.trading.bot.api.graphql.data.OrderDataFetcher
+tech.cassandre.trading.bot.api.graphql.data.PositionDataFetcher
+tech.cassandre.trading.bot.api.graphql.data.StrategyDataFetcher
+tech.cassandre.trading.bot.api.graphql.data.TradeDataFetcher

spring-boot-starter-test/autoconfigure/src/main/java/tech/cassandre/trading/bot/domain/BacktestingCandle.java

@@ -8,10 +8,10 @@
 import org.hibernate.Hibernate;
 import tech.cassandre.trading.bot.dto.util.CurrencyPairDTO;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.math.BigDecimal;
 import java.time.ZonedDateTime;
 import java.util.Objects;
@@ -72,7 +72,7 @@ public class BacktestingCandle {
  private BigDecimal volume;
 
  /** Bucket start time. */
- @Column(name = "TIMESTAMP")
+ @Column(name = "TIMESTAMP", columnDefinition = "TIMESTAMP WITH TIME ZONE")
  private ZonedDateTime timestamp;
 
  /**

spring-boot-starter-test/autoconfigure/src/main/java/tech/cassandre/trading/bot/domain/BacktestingCandleId.java

@@ -7,8 +7,8 @@
 import org.hibernate.Hibernate;
 import tech.cassandre.trading.bot.dto.util.CurrencyPairDTO;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 import java.util.Objects;
 

spring-boot-starter/autoconfigure/pom.xml

@@ -96,6 +96,12 @@
  <version>${opencsv.version}</version>
  </dependency>
 
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${javax.ws.rs.version}</version>
+ </dependency>
+
  <!-- Tests -->
  <dependency>
  <groupId>org.springframework.boot</groupId>

spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/configuration/ExchangeAutoConfiguration.java

@@ -41,7 +41,7 @@
 import tech.cassandre.trading.bot.util.exception.ConfigurationException;
 import tech.cassandre.trading.bot.util.parameters.ExchangeParameters;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;

spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/configuration/ScheduleAutoConfiguration.java

@@ -14,7 +14,7 @@
 import tech.cassandre.trading.bot.batch.TradeFlux;
 import tech.cassandre.trading.bot.util.base.configuration.BaseConfiguration;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**

spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/configuration/StrategiesAutoConfiguration.java

@@ -43,7 +43,7 @@
 import tech.cassandre.trading.bot.util.exception.ConfigurationException;
 import tech.cassandre.trading.bot.util.parameters.ExchangeParameters;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;