migrate to spring 3

Author: xerikssonx

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,7 +73,7 @@
 <!-- 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>
@@ -168,7 +168,7 @@
 </configuration>
 </plugin>
 <!-- GPG signing -->
-<plugin>
+<!--<plugin>
 <groupId>org.apache.maven.plugins</groupId>
 <artifactId>maven-gpg-plugin</artifactId>
 <version>3.1.0</version>
@@ -180,15 +180,15 @@
 <goal>sign</goal>
 </goals>
 <configuration>
-<!-- Prevent `gpg` from using pinentry programs -->
+&lt;!&ndash; Prevent `gpg` from using pinentry programs &ndash;&gt;
 <gpgArguments>
-<arg>--pinentry-mode</arg>
+<arg>&#45;&#45;pinentry-mode</arg>
 <arg>loopback</arg>
 </gpgArguments>
 </configuration>
 </execution>
 </executions>
-</plugin>
+</plugin>-->
 </plugins>
 </build>
 <!-- =========================================================================================================== -->

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

@@ -2,12 +2,13 @@
 
 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.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.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
 import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
 
 /**
@@ -16,32 +17,34 @@
 @Configuration
 @EnableWebSecurity
 @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 1)
-public class GraphQLAPISecurityConfiguration extends WebSecurityConfigurerAdapter {
+public final class GraphQLAPISecurityConfiguration {
 
  /** API Key. */
  @Value("${cassandre.trading.bot.api.graphql.key:}")
  private String key;
 
- @Override
- protected final void configure(final HttpSecurity http) throws Exception {
+ @Bean
+ 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-test/autoconfigure/src/main/java/tech/cassandre/trading/bot/domain/BacktestingCandle.java

@@ -8,12 +8,12 @@
 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.time.OffsetDateTime;
 import java.util.Objects;
 
 import static tech.cassandre.trading.bot.configuration.DatabaseAutoConfiguration.PRECISION;
@@ -73,7 +73,7 @@ public class BacktestingCandle {
 
  /** Bucket start time. */
  @Column(name = "TIMESTAMP")
- private ZonedDateTime timestamp;
+ private OffsetDateTime timestamp;
 
  /**
  * Returns currency pair DTO.

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-test/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/BacktestingTickerMapper.java

@@ -2,14 +2,20 @@
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.Named;
 import tech.cassandre.trading.bot.domain.BacktestingCandle;
 import tech.cassandre.trading.bot.domain.ImportedCandle;
 import tech.cassandre.trading.bot.dto.market.TickerDTO;
 
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
 /**
  * Backtesting candle mapper.
  */
-@Mapper(uses = CurrencyMapper.class)
+@Mapper(uses = CurrencyMapper.class, componentModel = MappingConstants.ComponentModel.JAKARTA)
 public interface BacktestingTickerMapper {
 
  // =================================================================================================================

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

@@ -3,6 +3,7 @@
 import info.bitrich.xchangestream.core.ProductSubscription;
 import info.bitrich.xchangestream.core.StreamingExchange;
 import info.bitrich.xchangestream.core.StreamingExchangeFactory;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.knowm.xchange.Exchange;
 import org.knowm.xchange.ExchangeFactory;
@@ -41,7 +42,6 @@
 import tech.cassandre.trading.bot.util.exception.ConfigurationException;
 import tech.cassandre.trading.bot.util.parameters.ExchangeParameters;
 
-import javax.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;

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

@@ -12,12 +12,12 @@
 import tech.cassandre.trading.bot.util.csv.EpochToZonedDateTime;
 import tech.cassandre.trading.bot.util.test.ExcludeFromCoverageGeneratedReport;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.math.BigDecimal;
-import java.time.ZonedDateTime;
+import java.time.OffsetDateTime;
 import java.util.Objects;
 
 import static tech.cassandre.trading.bot.configuration.DatabaseAutoConfiguration.PRECISION;
@@ -72,8 +72,8 @@ public class ImportedCandle {
 
  /** Bucket start time. */
  @CsvCustomBindByName(column = "TIMESTAMP", converter = EpochToZonedDateTime.class)
- @Column(name = "TIMESTAMP")
- private ZonedDateTime timestamp;
+ @Column(name = "TIMESTAMP", columnDefinition = "TIMESTAMP WITH TIME ZONE")
+ private OffsetDateTime timestamp;
 
  /**
  * Returns currency pair DTO.