Upgrade to swagger2 / DW4

gisaia · Mar 28, 2024 · dbff459 · dbff459
1 parent 11b88fe
commit dbff459
Show file tree

Hide file tree

Showing 132 changed files with 14,714 additions and 8,655 deletions.
diff --git a/.github/workflows/.trivyignore b/.github/workflows/.trivyignore
@@ -1,2 +0,0 @@
-CVE-2023-6378
-CVE-2023-6481

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -70,18 +70,18 @@ jobs:
         DOCKER_USERNAME: ${{ secrets.DOCKER_HUB_USER }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
       run: scripts/ci/tests-integration-stage.sh --stage=CSW_ALIASED
-    - name: Run tests [STAC]
+    - name: Run tests [STAC_ALIASED]
       env:
         # secrets are defined here : https://github.com/organizations/gisaia/settings/secrets/actions
         DOCKER_USERNAME: ${{ secrets.DOCKER_HUB_USER }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      run: scripts/ci/tests-integration-stage.sh --stage=STAC
-    - name: Run tests [STAC_ALIASED]
+      run: scripts/ci/tests-integration-stage.sh --stage=STAC_ALIASED
+    - name: Run tests [STAC]
       env:
         # secrets are defined here : https://github.com/organizations/gisaia/settings/secrets/actions
         DOCKER_USERNAME: ${{ secrets.DOCKER_HUB_USER }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      run: scripts/ci/tests-integration-stage.sh --stage=STAC_ALIASED
+      run: scripts/ci/tests-integration-stage.sh --stage=STAC
     - name: Run tests [DOC]
       env:
         # secrets are defined here : https://github.com/organizations/gisaia/settings/secrets/actions

diff --git a/arlas-commons/pom.xml b/arlas-commons/pom.xml
@@ -22,82 +22,6 @@
             <groupId>com.smoketurner</groupId>
             <artifactId>dropwizard-swagger</artifactId>
             <version>${dropwizard.swagger.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.ben-manes.caffeine</groupId>
-                    <artifactId>caffeine</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-jackson</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-jersey</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-jetty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-servlets</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard</groupId>
-                    <artifactId>dropwizard-util</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.dropwizard.metrics</groupId>
-                    <artifactId>metrics-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.core</groupId>
-                    <artifactId>jersey-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.core</groupId>
-                    <artifactId>jersey-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.containers</groupId>
-                    <artifactId>jersey-container-servlet-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${activation.version}</version>
         </dependency>
 
         <dependency>
@@ -106,6 +30,12 @@
             <version>${hazelcast.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+            <artifactId>jackson-jakarta-rs-base</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
@@ -116,12 +46,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-authz-client</artifactId>
             <version>${keycloak.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.activation</groupId>
-                    <artifactId>jakarta.activation</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/arlas-commons/src/main/java/io/arlas/commons/config/ArlasAuthConfiguration.java b/arlas-commons/src/main/java/io/arlas/commons/config/ArlasAuthConfiguration.java
@@ -22,9 +22,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.arlas.commons.exceptions.ArlasConfigurationException;
 import io.arlas.filter.config.InitConfiguration;
+import jakarta.ws.rs.HttpMethod;
 import org.keycloak.representations.adapters.config.AdapterConfig;
 
-import javax.ws.rs.HttpMethod;
 import java.util.*;
 import java.util.stream.Collectors;
 

diff --git a/arlas-commons/src/main/java/io/arlas/commons/config/ArlasConfiguration.java b/arlas-commons/src/main/java/io/arlas/commons/config/ArlasConfiguration.java
@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.arlas.commons.exceptions.ArlasConfigurationException;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
 
 public class ArlasConfiguration extends Configuration {

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasException.java
@@ -20,9 +20,8 @@
 package io.arlas.commons.exceptions;
 
 import io.arlas.commons.rest.response.Error;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 public class ArlasException extends Exception {
     private static final long serialVersionUID = 1L;

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasExceptionMapper.java
@@ -19,12 +19,12 @@
 
 package io.arlas.commons.exceptions;
 
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
 import java.util.Arrays;
 
 @Provider

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/BadRequestException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/BadRequestException.java
@@ -19,7 +19,7 @@
 
 package io.arlas.commons.exceptions;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class BadRequestException extends ArlasException {
     private static final long serialVersionUID = 1L;

diff --git a/...commons/src/main/java/io/arlas/commons/exceptions/ConstraintViolationExceptionMapper.java b/...commons/src/main/java/io/arlas/commons/exceptions/ConstraintViolationExceptionMapper.java
@@ -19,12 +19,12 @@
 
 package io.arlas.commons.exceptions;
 
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import java.util.Arrays;
 
 public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/IllegalArgumentExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/IllegalArgumentExceptionMapper.java
@@ -19,11 +19,11 @@
 
 package io.arlas.commons.exceptions;
 
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import java.util.Arrays;
 
 public class IllegalArgumentExceptionMapper implements ExceptionMapper<IllegalArgumentException> {

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/InvalidParameterException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/InvalidParameterException.java
@@ -19,7 +19,7 @@
 
 package io.arlas.commons.exceptions;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class InvalidParameterException extends ArlasException {
     private static final long serialVersionUID = 1L;

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/JsonProcessingExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/JsonProcessingExceptionMapper.java
@@ -20,11 +20,11 @@
 package io.arlas.commons.exceptions;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
 import java.util.Arrays;
 
 public class JsonProcessingExceptionMapper implements ExceptionMapper<JsonProcessingException> {

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotAllowedException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotAllowedException.java
@@ -19,7 +19,7 @@
 
 package io.arlas.commons.exceptions;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class NotAllowedException extends ArlasException {
     private static final long serialVersionUID = 1L;

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotFoundException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotFoundException.java
@@ -19,7 +19,7 @@
 
 package io.arlas.commons.exceptions;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class NotFoundException extends ArlasException {
 

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotImplementedException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotImplementedException.java
@@ -19,7 +19,7 @@
 
 package io.arlas.commons.exceptions;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class NotImplementedException extends ArlasException {
     private static final long serialVersionUID = 1L;

diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ParseException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ParseException.java
@@ -19,7 +19,7 @@
 
 package io.arlas.commons.exceptions;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class ParseException extends ArlasException {
 

diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/InsensitiveCaseFilter.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/InsensitiveCaseFilter.java
@@ -19,15 +19,14 @@
 
 package io.arlas.commons.rest.utils;
 
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.Provider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyPrintFilter.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyPrintFilter.java
@@ -19,16 +19,17 @@
 
 package io.arlas.commons.rest.utils;
 
-import com.fasterxml.jackson.jaxrs.cfg.ObjectWriterInjector;
+import com.fasterxml.jackson.jakarta.rs.cfg.ObjectWriterInjector;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map.Entry;
 
-public class PrettyPrintFilter implements javax.ws.rs.container.ContainerResponseFilter {
+public class PrettyPrintFilter implements ContainerResponseFilter {
     private static final String QUERY_PARAM_PRETTY = "pretty";
     private static final String QUERY_PARAM_TRUE = "true";
 

diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyWriterModifier.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyWriterModifier.java
@@ -21,10 +21,10 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase;
-import com.fasterxml.jackson.jaxrs.cfg.ObjectWriterModifier;
+import com.fasterxml.jackson.jakarta.rs.cfg.EndpointConfigBase;
+import com.fasterxml.jackson.jakarta.rs.cfg.ObjectWriterModifier;
+import jakarta.ws.rs.core.MultivaluedMap;
 
-import javax.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 
 public class PrettyWriterModifier extends ObjectWriterModifier {

diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/ResponseFormatter.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/ResponseFormatter.java
@@ -21,9 +21,8 @@
 
 
 import io.arlas.commons.rest.response.Success;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 public class ResponseFormatter {