Merge pull request #546 from felleslosninger/gne-spring-boot-4

EIN-4905: Spring Boot 4

Author: gne

pom.xml

@@ -7,62 +7,32 @@
   <artifactId>backend</artifactId>
   <version>3.0.0-SNAPSHOT</version>
   <name>backend</name>
-  <description>eInnsyn API v3</description>
+  <description>eInnsyn API</description>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.5.11</version>
+    <version>4.0.4</version>
     <relativePath />
   </parent>
 
   <properties>
     <java.version>25</java.version>
     <bouncycastle.version>1.83</bouncycastle.version>
     <mockito.version>5.14.2</mockito.version>
+    <logstash-logback-encoder.version>9.0</logstash-logback-encoder.version>
+    <ip-client.version>2.5.0</ip-client.version>
+    <nocommons.version>0.17.0</nocommons.version>
+    <shedlock.version>7.7.0</shedlock.version>
+    <java-uuid-generator.version>5.2.0</java-uuid-generator.version>
+    <json.version>20251224</json.version>
+    <mustache.version>0.9.14</mustache.version>
+    <testcontainers.version>1.21.4</testcontainers.version>
+    <spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version>
+    <google-java-format.version>1.28.0</google-java-format.version>
     <jacoco.version>0.8.14</jacoco.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.21.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.nimbusds</groupId>
-        <artifactId>nimbus-jose-jwt</artifactId>
-        <version>10.8</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk18on</artifactId>
-        <version>${bouncycastle.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk18on</artifactId>
-        <version>${bouncycastle.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker-qual</artifactId>
-        <version>3.54.0</version>
-      </dependency>
-      <dependency>
-        <groupId>io.opentelemetry</groupId>
-        <artifactId>opentelemetry-api-incubator</artifactId>
-        <version>1.60.1-alpha</version>
-      </dependency>
-      <dependency>
-        <groupId>net.logstash.logback</groupId>
-        <artifactId>logstash-logback-encoder</artifactId>
-        <version>9.0</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -80,12 +50,6 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-crypto</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.retry</groupId>
-      <artifactId>spring-retry</artifactId>
-    </dependency>
-
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-oauth2-authorization-server</artifactId>
@@ -98,6 +62,22 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-elasticsearch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-flyway</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.data</groupId>
@@ -109,15 +89,10 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>co.elastic.clients</groupId>
-      <artifactId>elasticsearch-java</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>no.einnsyn.common</groupId>
       <artifactId>ip-client</artifactId>
-      <version>2.4.1</version>
+      <version>${ip-client.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.assertj</groupId>
@@ -126,72 +101,60 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.flywaydb</groupId>
-      <artifactId>flyway-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-database-postgresql</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <scope>runtime</scope>
     </dependency>
+
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
 
     <!-- Foedselsnummer -->
     <dependency>
       <groupId>no.bekk.bekkopen</groupId>
       <artifactId>nocommons</artifactId>
-      <version>0.17.0</version>
+      <version>${nocommons.version}</version>
     </dependency>
 
     <!-- Scheduler lock -->
     <dependency>
       <groupId>net.javacrumbs.shedlock</groupId>
       <artifactId>shedlock-spring</artifactId>
-      <version>7.7.0</version>
+      <version>${shedlock.version}</version>
     </dependency>
     <dependency>
       <groupId>net.javacrumbs.shedlock</groupId>
       <artifactId>shedlock-provider-jdbc-template</artifactId>
-      <version>7.7.0</version>
+      <version>${shedlock.version}</version>
     </dependency>
 
 
     <!-- Used for UUIDv7 generation-->
     <dependency>
       <groupId>com.fasterxml.uuid</groupId>
       <artifactId>java-uuid-generator</artifactId>
-      <version>5.2.0</version>
+      <version>${java-uuid-generator.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20251224</version>
+      <version>${json.version}</version>
     </dependency>
 
     <!-- E-mail templates -->
     <dependency>
       <groupId>com.github.spullara.mustache.java</groupId>
       <artifactId>compiler</artifactId>
-      <version>0.9.14</version>
+      <version>${mustache.version}</version>
     </dependency>
 
     <!-- Metrics -->
@@ -216,13 +179,14 @@
     <dependency>
       <groupId>net.logstash.logback</groupId>
       <artifactId>logstash-logback-encoder</artifactId>
+      <version>${logstash-logback-encoder.version}</version>
     </dependency>
 
     <!-- Tests -->
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.21.4</version>
+      <version>${testcontainers.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -235,7 +199,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>elasticsearch</artifactId>
-      <version>1.21.4</version>
+      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -260,12 +224,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
@@ -307,7 +265,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>3.4.0</version>
+        <version>${spotless-maven-plugin.version}</version>
         <executions>
           <execution>
             <goals>
@@ -318,7 +276,7 @@
         <configuration>
           <java>
             <googleJavaFormat>
-              <version>1.28.0</version>
+              <version>${google-java-format.version}</version>
               <style>GOOGLE</style>
             </googleJavaFormat>
           </java>

src/main/java/no/einnsyn/backend/EInnsynApplication.java

@@ -6,13 +6,13 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.retry.annotation.EnableRetry;
+import org.springframework.resilience.annotation.EnableResilientMethods;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
 @EnableJpaRepositories
 @EnableAsync
-@EnableRetry
+@EnableResilientMethods
 @ComponentScan("no.einnsyn")
 public class EInnsynApplication {
 

src/main/java/no/einnsyn/backend/configuration/GsonConfiguration.java

@@ -9,7 +9,7 @@
 import no.einnsyn.backend.configuration.typeadapters.ExpandableFieldSerializer;
 import no.einnsyn.backend.configuration.typeadapters.NoUnknownPropertiesTypeAdapterFactory;
 import no.einnsyn.backend.utils.id.IdResolver;
-import org.springframework.boot.autoconfigure.gson.GsonBuilderCustomizer;
+import org.springframework.boot.gson.autoconfigure.GsonBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

src/main/java/no/einnsyn/backend/entities/apikey/ApiKeyService.java

@@ -16,7 +16,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.retry.annotation.Retryable;
+import org.springframework.resilience.annotation.Retryable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/no/einnsyn/backend/entities/base/BaseService.java

@@ -80,8 +80,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
-import org.springframework.retry.annotation.Backoff;
-import org.springframework.retry.annotation.Retryable;
+import org.springframework.resilience.annotation.Retryable;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -623,9 +622,7 @@ public D get(String id, GetParameters query) throws EInnsynException {
    */
   @NewSpan
   @Transactional(rollbackFor = Exception.class)
-  @Retryable(
-      retryFor = {ObjectOptimisticLockingFailureException.class},
-      backoff = @Backoff(delay = 100, random = true))
+  @Retryable(includes = {ObjectOptimisticLockingFailureException.class})
   public D add(D dto) throws EInnsynException {
     authorizeAdd(dto);
 
@@ -661,9 +658,7 @@ public D add(D dto) throws EInnsynException {
    */
   @NewSpan
   @Transactional(rollbackFor = Exception.class)
-  @Retryable(
-      retryFor = {ObjectOptimisticLockingFailureException.class},
-      backoff = @Backoff(delay = 100, random = true))
+  @Retryable(includes = {ObjectOptimisticLockingFailureException.class})
   public D update(String id, D dto) throws EInnsynException {
     var paths = ExpandPathResolver.resolve(dto);
     var obj = getProxy().findForUpdateOrThrow(id, dto);
@@ -682,9 +677,7 @@ public D update(String id, D dto) throws EInnsynException {
    */
   @NewSpan
   @Transactional(rollbackFor = Exception.class)
-  @Retryable(
-      retryFor = {ObjectOptimisticLockingFailureException.class},
-      backoff = @Backoff(delay = 100, random = true))
+  @Retryable(includes = {ObjectOptimisticLockingFailureException.class})
   public D delete(String id) throws EInnsynException {
     authorizeDelete(id);
 

src/main/java/no/einnsyn/backend/entities/base/models/Base.java

@@ -11,7 +11,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import no.einnsyn.backend.utils.id.IdGenerator;
-import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.UpdateTimestamp;
@@ -42,7 +41,6 @@ public abstract class Base {
   @Column(name = "_external_id")
   protected String externalId;
 
-  @CreationTimestamp
   @Column(name = "_created")
   protected Instant created;
 

src/main/java/no/einnsyn/backend/entities/bruker/BrukerService.java

@@ -32,7 +32,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.retry.annotation.Retryable;
+import org.springframework.resilience.annotation.Retryable;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;

src/main/java/no/einnsyn/backend/entities/dokumentobjekt/DokumentobjektService.java

@@ -268,9 +268,10 @@ public URI getSourceUri(String id) throws EInnsynException {
       // Preserve already-encoded source URLs exactly as stored.
       return URI.create(sourceUrl);
     } catch (IllegalArgumentException _) {
+      // Fall back to encoding for user-provided URLs with spaces/non-ASCII.
       try {
         return UriComponentsBuilder.fromUriString(sourceUrl).encode().build().toUri();
-      } catch (IllegalArgumentException e) {
+      } catch (Exception e) {
         throw new NotFoundException("Invalid source URL for " + id, e);
       }
     }