Spring boot 3 (#84)

* Fungerende VeilarblestTestApp og oppdatert README

* Oppgradering til spring boot 3. Kompilerer og kjører itest. NB Jooq er holdt tilbake

* Oppgrader jooq, caffeine, shedlock

* Oppgrader vault-integrasjon

* Fikset deprekert jooq-kode. Byttet ut merge med insert .. on conflict update..

README.md

@@ -14,7 +14,6 @@ mvn test
 
 # starte
 # Kjør main-metoden i no.nav.veilarblest.VeilarblestApp.java
-# For lokal test kjøring kjør MainTest.java
 ```
 
 ## Database
@@ -25,21 +24,9 @@ Database parameters med Vault:
 vault read postgresql/preprod-fss/creds/veilarblest-q1-user
 ```
 
-Man må sette følgenede environmentvariabler for tilkobling til postgres database:
+Postgres database:
 
 ```
-VEILARBLEST_DB_URL=jdbc:postgresql://<HOST>:<PORT>/veilarblest
-VEILARBLEST_DB_USER=<USERNAME>
-VEILARBLEST_DB_PASSWORD=<PASSWORD>
-```
-
-For å sette opp en postgres database lokalt kan man bruke docker.
-
-```sh
-docker run --name veilarblest -e POSTGRES_PASSWORD=<PASSWORD> -d -p 5432:5432 postgres
-docker ps (finn container id)
-docker exec -it <container_id> bash
-psql -U postgres
-CREATE DATABASE veilarblest;
+Postgres database startes opp i docker (jdbc:tc:postgresql:15.2:///veilarblest) via testcontainerts
 ```
 

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
+        <version>3.0.3</version>
         <relativePath/>
     </parent>
 
@@ -17,12 +17,19 @@
 
     <properties>
         <java.version>17</java.version>
-        <common.version>2.2022.09.26_07.11-9c0037f021cb</common.version>
-        <springfox.version>2.9.2</springfox.version>
-        <!-- Override spring boot okhttp3.version-->
-        <okhttp3.version>4.9.3</okhttp3.version>
+        <common.version>3.2023.02.28_14.59-ff398ca0d33e</common.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
 
     <build>
         <plugins>
@@ -35,15 +42,10 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-            <version>2.8.1</version>
-        </dependency>
         <dependency>
             <groupId>net.javacrumbs.shedlock</groupId>
             <artifactId>shedlock-provider-jdbc-template</artifactId>
-            <version>4.42.0</version>
+            <version>4.44.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -65,86 +67,73 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.2.0</version>
         </dependency>
-        <!--  Overskriv gammel avhengighet fra nimbus -->
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
-            <version>2.3</version>
         </dependency>
 
 
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>metrics</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>rest</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>client</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>token-client</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>util</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>types</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>abac</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>auth</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>log</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>health</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>kafka</artifactId>
             <version>${common.version}</version>
         </dependency>
         <dependency>
-            <groupId>no.nav.common</groupId>
+            <groupId>com.github.navikt.common-java-modules</groupId>
             <artifactId>test</artifactId>
             <version>${common.version}</version>
             <scope>test</scope>
@@ -167,11 +156,11 @@
             <optional>true</optional>
         </dependency>
 
-
+        <!-- Postgres - vault integrasjon for rotasjon av passord-->
         <dependency>
             <groupId>no.nav</groupId>
             <artifactId>vault-jdbc</artifactId>
-            <version>1.2.2</version>
+            <version>1.3.10</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -186,14 +175,13 @@
         <dependency>
             <groupId>com.bettercloud</groupId>
             <artifactId>vault-java-driver</artifactId>
-            <version>3.1.0</version>
+            <version>5.1.0</version>
         </dependency>
 
         <!-- Database -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.5</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
@@ -203,27 +191,23 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jooq</artifactId>
-            <version>2.2.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>3.12.4</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-meta</artifactId>
-            <version>3.11.7</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-codegen</artifactId>
-            <version>3.11.7</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-meta-extensions</artifactId>
-            <version>3.11.7</version>
+            <version>${jooq.version}</version>
         </dependency>
 
         <!-- test -->
@@ -245,7 +229,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version> 1.17.6</version>
+            <version>1.17.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/no/nav/veilarblest/config/DatabaseConfig.java

@@ -10,7 +10,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.sql.DataSource;
 
 import static no.nav.veilarblest.config.ApplicationConfig.APPLICATION_NAME;

src/main/java/no/nav/veilarblest/config/FilterConfig.java

@@ -4,7 +4,7 @@
 import no.nav.common.auth.oidc.filter.AzureAdUserRoleResolver;
 import no.nav.common.auth.oidc.filter.OidcAuthenticationFilter;
 import no.nav.common.auth.oidc.filter.OidcAuthenticatorConfig;
-import no.nav.common.log.LogFilter;
+import no.nav.common.rest.filter.LogRequestFilter;
 import no.nav.common.rest.filter.SetStandardHttpHeadersFilter;
 import no.nav.common.token_client.utils.env.TokenXEnvironmentvariables;
 import org.springframework.beans.factory.annotation.Value;
@@ -86,8 +86,8 @@ public FilterRegistrationBean authenticationFilterRegistrationBean(EnvironmentPr
 
     @Bean
     public FilterRegistrationBean logFilterRegistrationBean() {
-        FilterRegistrationBean<LogFilter> registration = new FilterRegistrationBean<>();
-        registration.setFilter(new LogFilter(applicationName, isDevelopment().orElse(false)));
+        FilterRegistrationBean<LogRequestFilter> registration = new FilterRegistrationBean<>();
+        registration.setFilter(new LogRequestFilter(applicationName, isDevelopment().orElse(false)));
         registration.setOrder(3);
         registration.addUrlPatterns("/*");
         return registration;

src/main/java/no/nav/veilarblest/config/PingFilter.java

@@ -2,9 +2,9 @@
 
 import org.springframework.http.HttpStatus;
 
-import javax.servlet.FilterConfig;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class PingFilter implements Filter {
 

src/main/java/no/nav/veilarblest/kafka/KafkaConfigCommon.java

@@ -15,7 +15,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.List;
 import java.util.Properties;