Upgrade to swagger2

gisaia · Mar 26, 2024 · 3902ac9 · 3902ac9
1 parent fb1241b
commit 3902ac9
Show file tree

Hide file tree

Showing 30 changed files with 2,077 additions and 1,648 deletions.
diff --git a/arlas-persistence-core/pom.xml b/arlas-persistence-core/pom.xml
@@ -23,12 +23,6 @@
             <version>${arlas-commons.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.uuid</groupId>
-            <artifactId>java-uuid-generator</artifactId>
-            <version>${jug.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-hibernate</artifactId>
@@ -37,10 +31,16 @@
 
         <dependency>
             <groupId>io.hypersistence</groupId>
-            <artifactId>hypersistence-utils-hibernate-55</artifactId>
+            <artifactId>hypersistence-utils-hibernate-60</artifactId>
             <version>${hibernate.utils.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -56,6 +56,13 @@
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-firestore-admin</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.uuid</groupId>
+            <artifactId>java-uuid-generator</artifactId>
+            <version>${jug.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/...re/src/main/java/io/arlas/persistence/server/app/ArlasPersistenceServerConfiguration.java b/...re/src/main/java/io/arlas/persistence/server/app/ArlasPersistenceServerConfiguration.java
@@ -24,7 +24,7 @@
 import io.arlas.commons.rest.utils.ServerConstants;
 import io.dropwizard.db.DataSourceFactory;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Arrays;
 import java.util.List;
 

diff --git a/...sistence-core/src/main/java/io/arlas/persistence/server/exceptions/ConflictException.java b/...sistence-core/src/main/java/io/arlas/persistence/server/exceptions/ConflictException.java
@@ -22,7 +22,7 @@
 
 import io.arlas.commons.exceptions.ArlasException;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class ConflictException extends ArlasException {
     public ConflictException() {

diff --git a/...istence-core/src/main/java/io/arlas/persistence/server/exceptions/ForbiddenException.java b/...istence-core/src/main/java/io/arlas/persistence/server/exceptions/ForbiddenException.java
@@ -21,7 +21,7 @@
 
 import io.arlas.commons.exceptions.ArlasException;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 public class ForbiddenException extends ArlasException {
     public ForbiddenException() {

diff --git a/arlas-persistence-core/src/main/java/io/arlas/persistence/server/model/Data.java b/arlas-persistence-core/src/main/java/io/arlas/persistence/server/model/Data.java
@@ -21,13 +21,13 @@
 
 import io.dropwizard.jackson.JsonSnakeCase;
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -36,7 +36,6 @@
 
 @Entity
 @Table(name = "user_data")
-@TypeDef(name = "json", typeClass = JsonBinaryType.class)
 @JsonSnakeCase
 public class Data {
     public static final String idColumn = "id";
@@ -67,7 +66,7 @@ public class Data {
     private Date lastUpdateDate;
 
     @NotNull
-    @Type(type = "json")
+    @Type(JsonBinaryType.class)
     @Column(name = valueColumn, columnDefinition = "json")
     private String docValue;
 

diff --git a/arlas-persistence-rest/src/main/java/io/arlas/persistence/model/Link.java b/arlas-persistence-rest/src/main/java/io/arlas/persistence/model/Link.java
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)

diff --git a/arlas-persistence-rest/src/main/java/io/arlas/persistence/rest/DataHALService.java b/arlas-persistence-rest/src/main/java/io/arlas/persistence/rest/DataHALService.java
@@ -27,7 +27,7 @@
 import io.arlas.persistence.server.utils.SortOrder;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriInfo;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;