Upgrade spring

mediathekview · Sep 16, 2023 · 1354fa7 · 1354fa7
1 parent 8150820
commit 1354fa7
Show file tree

Hide file tree

Showing 19 changed files with 284 additions and 201 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.6.3</version>
+    <version>3.1.3</version>
     <relativePath/>
     <!-- lookup parent from repository -->
   </parent>
@@ -42,7 +42,7 @@
     <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <camel.version>3.12.0</camel.version>
+    <camel.version>4.0.0</camel.version>
     <logcaptor.version>2.7.8</logcaptor.version>
     <mapstruct.version>1.4.2.Final</mapstruct.version>
     <testcontainers-postgresql.version>1.16.3</testcontainers-postgresql.version>
@@ -74,6 +74,14 @@
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-slf4j-impl</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -105,10 +113,19 @@
       <artifactId>postgresql</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-testcontainers</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>${testcontainers-postgresql.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/de/mediathekview/fimlistmerger/FilmlistMergerApplication.java b/src/main/java/de/mediathekview/fimlistmerger/FilmlistMergerApplication.java
@@ -5,10 +5,11 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
 import org.springframework.context.annotation.Bean;
 import org.springframework.jdbc.support.DatabaseStartupValidator;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.stream.Stream;
 
@@ -39,6 +40,7 @@ public static BeanFactoryPostProcessor dependsOnPostProcessor(
   }
 
   @Bean
+  @DependsOnDatabaseInitialization
   public DatabaseStartupValidator databaseStartupValidator(
       DataSource dataSource,
       @Value("${filmlistmerger.database.startup.timeout}") String timeout,

diff --git a/src/main/java/de/mediathekview/fimlistmerger/persistence/Film.java b/src/main/java/de/mediathekview/fimlistmerger/persistence/Film.java
@@ -11,7 +11,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import lombok.*;
 import lombok.Builder.Default;
 import org.hibernate.annotations.Where;

diff --git a/src/main/java/de/mediathekview/fimlistmerger/persistence/FilmUrl.java b/src/main/java/de/mediathekview/fimlistmerger/persistence/FilmUrl.java
@@ -1,7 +1,7 @@
 package de.mediathekview.fimlistmerger.persistence;
 
 import de.mediathekview.mlib.daten.Resolution;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 # General
-camel.dataformat.json-jackson.auto-discover-object-mapper=true
+camel.dataformat.jackson.auto-discover-object-mapper=true
 camel.springboot.main-run-controller=true
 camel.threadpool.pool-size = 10
 camel.threadpool.max-pool-size = 40
@@ -12,7 +12,7 @@ camel.component.metrics.enabled=true
 
 spring.datasource.hikari.maximum-pool-size=500
 
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL9Dialect
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.properties.hibernate.jdbc.batch_size=30
 spring.jpa.properties.hibernate.order_updates = true
@@ -28,7 +28,7 @@ management.endpoint.env.enabled=false
 management.endpoint.logfile.enabled=true
 management.endpoint.metrics.enabled=true
 ## InfluxDB
-management.metrics.export.influx.enabled=false
+management.influx.metrics.export.enabled=false
 #management.metrics.export.influx.bucket=filmlistmerger
 #management.metrics.export.influx.org=mediathekview
 #management.metrics.export.influx.token=

diff --git a/src/test/java/de/mediathekview/fimlistmerger/persistence/FilmRepositoryIT.java b/src/test/java/de/mediathekview/fimlistmerger/persistence/FilmRepositoryIT.java
@@ -14,13 +14,14 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
@@ -35,8 +36,8 @@
 @DisplayNameGeneration(ReplaceUnderscores.class)
 class FilmRepositoryIT {
 
-  @Inject FilmRepository filmRepository;
-  @Inject FilmPersistenceService filmPersistenceService;
+  @Autowired FilmRepository filmRepository;
+  @Autowired FilmPersistenceService filmPersistenceService;
 
   @Test
   @DisplayName("Save all test films - three are saved")
@@ -56,23 +57,25 @@ void saveAll_newFilms_filmsSavedToDatabase() throws MalformedURLException {
 
   @Test
   @Transactional
-  void save_film_urls_are_saved()throws ExecutionException, InterruptedException {
+  void save_film_urls_are_saved() throws ExecutionException, InterruptedException {
     // GIVEN
     Film filmToSave =
-            Film.builder()
-                    .sender(Sender.ARTE_DE)
-                    .thema("FilmRepositoryIT")
-                    .titel("save_newFilm_filmSavedToDatabase")
-                    .beschreibung("Save a new film to database check if it's saved")
-                    .neu(true)
-                    .time(LocalDateTime.now())
-                    .duration(Duration.ofMinutes(45))
-                    .urls(Set.of(
-                            new FilmUrl(Type.FILM_URL, Resolution.NORMAL, "http://example.org/Test.mp4", 2L),
-                            new FilmUrl(Type.FILM_URL, Resolution.HD, "http://example.org/hd.mp4", 2L),
-                            new FilmUrl(Type.FILM_URL, Resolution.SMALL, "http://example.org/klein.mp4", 2L)
-                    ))
-                    .build();
+        Film.builder()
+            .sender(Sender.ARTE_DE)
+            .thema("FilmRepositoryIT")
+            .titel("save_newFilm_filmSavedToDatabase")
+            .beschreibung("Save a new film to database check if it's saved")
+            .neu(true)
+            .time(LocalDateTime.now())
+            .duration(Duration.ofMinutes(45))
+            .urls(
+                Set.of(
+                    new FilmUrl(
+                        Type.FILM_URL, Resolution.NORMAL, "http://example.org/Test.mp4", 2L),
+                    new FilmUrl(Type.FILM_URL, Resolution.HD, "http://example.org/hd.mp4", 2L),
+                    new FilmUrl(
+                        Type.FILM_URL, Resolution.SMALL, "http://example.org/klein.mp4", 2L)))
+            .build();
     filmToSave.getUrls().forEach(filmUrl -> filmUrl.setFilm(filmToSave));
 
     // WHEN

diff --git a/...va/de/mediathekview/fimlistmerger/processors/PersistenceFilmsToFilmlistProcessorTest.java b/...va/de/mediathekview/fimlistmerger/processors/PersistenceFilmsToFilmlistProcessorTest.java
@@ -1,25 +1,24 @@
 package de.mediathekview.fimlistmerger.processors;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import de.mediathekview.fimlistmerger.persistence.Film;
 import de.mediathekview.mlib.daten.Filmlist;
 import de.mediathekview.mlib.daten.Sender;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
 import org.apache.camel.*;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.spring.junit5.EnableRouteCoverage;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 
-import javax.inject.Inject;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.*;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 @SpringBootTest(
     properties = {
       "camel.springboot.java-routes-include-pattern=**/"
@@ -33,12 +32,12 @@ class PersistenceFilmsToFilmlistProcessorTest {
   static final String ROUTE_ID = "persistenceFilmsToFilmlistProcessorTestRoute";
   private static final String TEST_ROUTE_FROM = "direct:producer";
   private static final String TEST_ROUTE_TO = "mock:direct:result";
-  @Inject CamelContext camelContext;
+  @Autowired CamelContext camelContext;
 
   @EndpointInject(TEST_ROUTE_TO)
   MockEndpoint mockEndpoint;
 
-  @Inject PersistenceFilmsToFilmlistProcessor persistenceFilmsToFilmlistProcessor;
+  @Autowired PersistenceFilmsToFilmlistProcessor persistenceFilmsToFilmlistProcessor;
 
   @Produce(TEST_ROUTE_FROM)
   private ProducerTemplate template;

diff --git a/...st/java/de/mediathekview/fimlistmerger/routes/ConvertOldFilmlistEntryToFilmRouteTest.java b/...st/java/de/mediathekview/fimlistmerger/routes/ConvertOldFilmlistEntryToFilmRouteTest.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import javax.inject.Inject;
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.EndpointInject;
@@ -32,6 +31,7 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 
@@ -45,7 +45,7 @@
 @DisplayNameGeneration(ReplaceUnderscores.class)
 class ConvertOldFilmlistEntryToFilmRouteTest {
 
-  @Inject CamelContext camelContext;
+  @Autowired CamelContext camelContext;
 
   @EndpointInject("mock:direct:result")
   MockEndpoint mockEndpoint;

diff --git a/src/test/java/de/mediathekview/fimlistmerger/routes/FilmToDatabaseTargetRouteIT.java b/src/test/java/de/mediathekview/fimlistmerger/routes/FilmToDatabaseTargetRouteIT.java
@@ -11,13 +11,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Optional;
@@ -33,12 +34,12 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 @EnableRouteCoverage
 class FilmToDatabaseTargetRouteIT {
-  @Inject CamelContext camelContext;
+  @Autowired CamelContext camelContext;
 
   @EndpointInject("mock:direct:result")
   MockEndpoint mockEndpoint;
 
-  @Inject FilmRepository filmRepository;
+  @Autowired FilmRepository filmRepository;
 
   @Produce("direct:producer")
   private ProducerTemplate template;
@@ -66,8 +67,9 @@ void saveFilm_validFilm_FilmSavedToDatabase() throws InterruptedException {
             "FilmToDatabaseTargetRouteIT",
             LocalDateTime.now(),
             Duration.ofMinutes(18));
-    //500 signs lorem ipsum
-    filmToSave.setBeschreibung("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et e");
+    // 500 signs lorem ipsum
+    filmToSave.setBeschreibung(
+        "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et e");
 
     // when
     template.sendBody(FilmToDatabaseTargetRoute.ROUTE_FROM, filmToSave);

diff --git a/src/test/java/de/mediathekview/fimlistmerger/routes/InputFilesRouteTest.java b/src/test/java/de/mediathekview/fimlistmerger/routes/InputFilesRouteTest.java
@@ -1,5 +1,11 @@
 package de.mediathekview.fimlistmerger.routes;
 
+import static de.mediathekview.fimlistmerger.routes.InputFilesRoute.ROUTE_ID;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import org.apache.camel.CamelContext;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
@@ -11,16 +17,9 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.inject.Inject;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-
-import static de.mediathekview.fimlistmerger.routes.InputFilesRoute.ROUTE_ID;
-
 @SpringBootTest(
     properties = {
       "camel.springboot.java-routes-include-pattern=**/" + ROUTE_ID + "*",
@@ -30,7 +29,7 @@
 class InputFilesRouteTest {
   @TempDir File tempDir;
 
-  @Inject CamelContext camelContext;
+  @Autowired CamelContext camelContext;
 
   @EndpointInject("mock:direct:result")
   MockEndpoint mockEndpoint;