Revert "Spike/move to quarkus 3 (#1682)"

This reverts commit 869f957.
DARPA-ASKEM · Aug 10, 2023 · b10db7b · b10db7b
1 parent 869f957
commit b10db7b
Show file tree

Hide file tree

Showing 75 changed files with 272 additions and 279 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,6 @@
 quarkusPluginId=io.quarkus
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusVersion=3.2.3.Final
+quarkusVersion=2.16.6.Final
 lombokVersion=1.18.26
 elasticsearchVersion=8.7.0
diff --git a/packages/services/hmi-server/gradle.properties b/packages/services/hmi-server/gradle.properties
@@ -2,6 +2,6 @@
 quarkusPluginId=io.quarkus
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusVersion=3.2.3.Final
+quarkusVersion=2.16.8.Final
 lombokVersion=1.18.28
 elasticsearchVersion=8.7.0
diff --git a/...er/src/main/java/software/uncharted/terarium/hmiserver/annotations/LogRestClientTime.java b/...er/src/main/java/software/uncharted/terarium/hmiserver/annotations/LogRestClientTime.java
@@ -1,6 +1,6 @@
 package software.uncharted.terarium.hmiserver.annotations;
 
-import jakarta.interceptor.InterceptorBinding;
+import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...server/src/main/java/software/uncharted/terarium/hmiserver/caching/CacheClearService.java b/...server/src/main/java/software/uncharted/terarium/hmiserver/caching/CacheClearService.java
@@ -7,8 +7,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

diff --git a/...java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingRequestFilter.java b/...java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingRequestFilter.java
@@ -5,10 +5,10 @@
 import software.uncharted.terarium.hmiserver.annotations.IgnoreRequestLogging;
 import software.uncharted.terarium.hmiserver.services.StructuredLog;
 
-import jakarta.inject.Inject;
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerRequestFilter;
-import jakarta.ws.rs.ext.Provider;
+import javax.inject.Inject;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.time.Instant;
 

diff --git a/...ava/software/uncharted/terarium/hmiserver/configuration/RequestLoggingResponseFilter.java b/...ava/software/uncharted/terarium/hmiserver/configuration/RequestLoggingResponseFilter.java
@@ -3,11 +3,11 @@
 import lombok.extern.slf4j.Slf4j;
 import software.uncharted.terarium.hmiserver.services.StructuredLog;
 
-import jakarta.inject.Inject;
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerResponseContext;
-import jakarta.ws.rs.container.ContainerResponseFilter;
-import jakarta.ws.rs.ext.Provider;
+import javax.inject.Inject;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.time.Instant;
 

diff --git a/...s/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Annotation.java b/...s/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Annotation.java
@@ -9,11 +9,11 @@
 import lombok.experimental.Accessors;
 
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Index;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.List;

diff --git a/...rvices/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Event.java b/...rvices/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Event.java
@@ -11,11 +11,11 @@
 import software.uncharted.terarium.hmiserver.annotations.TSOptional;
 import software.uncharted.terarium.hmiserver.models.EventType;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Index;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.List;

diff --git a/...ain/java/software/uncharted/terarium/hmiserver/exceptions/HmiResponseExceptionMapper.java b/...ain/java/software/uncharted/terarium/hmiserver/exceptions/HmiResponseExceptionMapper.java
@@ -4,7 +4,7 @@
 import lombok.EqualsAndHashCode;
 import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
 
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.core.Response;
 
 public class HmiResponseExceptionMapper implements ResponseExceptionMapper<RuntimeException> {
 

diff --git a/.../main/java/software/uncharted/terarium/hmiserver/proxies/RestClientTimingInterceptor.java b/.../main/java/software/uncharted/terarium/hmiserver/proxies/RestClientTimingInterceptor.java
@@ -10,11 +10,11 @@
 import software.uncharted.terarium.hmiserver.services.EventService;
 import software.uncharted.terarium.hmiserver.services.StructuredLog;
 
-import jakarta.annotation.Priority;
-import jakarta.inject.Inject;
-import jakarta.interceptor.AroundInvoke;
-import jakarta.interceptor.Interceptor;
-import jakarta.interceptor.InvocationContext;
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
 import java.lang.reflect.Method;
 import java.util.UUID;
 
@@ -90,19 +90,19 @@ public Object measureInvocationTime(InvocationContext context) throws Exception
 	 * @return				The method type (GET, POST, etc)
 	 */
 	private String getType(InvocationContext context) {
-		if (context.getMethod().getAnnotation(jakarta.ws.rs.GET.class) != null) {
+		if (context.getMethod().getAnnotation(javax.ws.rs.GET.class) != null) {
 			return "GET";
-		} else if (context.getMethod().getAnnotation(jakarta.ws.rs.POST.class) != null) {
+		} else if (context.getMethod().getAnnotation(javax.ws.rs.POST.class) != null) {
 			return "POST";
-		} else if (context.getMethod().getAnnotation(jakarta.ws.rs.PUT.class) != null) {
+		} else if (context.getMethod().getAnnotation(javax.ws.rs.PUT.class) != null) {
 			return "PUT";
-		} else if (context.getMethod().getAnnotation(jakarta.ws.rs.DELETE.class) != null) {
+		} else if (context.getMethod().getAnnotation(javax.ws.rs.DELETE.class) != null) {
 			return "DELETE";
-		} else if (context.getMethod().getAnnotation(jakarta.ws.rs.HEAD.class) != null) {
+		} else if (context.getMethod().getAnnotation(javax.ws.rs.HEAD.class) != null) {
 			return "HEAD";
-		} else if (context.getMethod().getAnnotation(jakarta.ws.rs.OPTIONS.class) != null) {
+		} else if (context.getMethod().getAnnotation(javax.ws.rs.OPTIONS.class) != null) {
 			return "OPTIONS";
-		} else if (context.getMethod().getAnnotation(jakarta.ws.rs.PATCH.class) != null) {
+		} else if (context.getMethod().getAnnotation(javax.ws.rs.PATCH.class) != null) {
 			return "PATCH";
 		}
 		return null;
@@ -128,8 +128,8 @@ private String getPath(InvocationContext context) {
 	 * @return			The value of the annotation or an empty string if it doesn't exist
 	 */
 	private String getPath(Class<?> clazz) {
-		if (clazz.getAnnotation(jakarta.ws.rs.Path.class) != null) {
-			return clazz.getAnnotation(jakarta.ws.rs.Path.class).value();
+		if (clazz.getAnnotation(javax.ws.rs.Path.class) != null) {
+			return clazz.getAnnotation(javax.ws.rs.Path.class).value();
 		}
 		return "";
 	}
@@ -140,8 +140,8 @@ private String getPath(Class<?> clazz) {
 	 * @return				The value of the annotation or an empty string if it doesn't exist
 	 */
 	private String getPath(Method method) {
-		if (method.getAnnotation(jakarta.ws.rs.Path.class) != null) {
-			return method.getAnnotation(jakarta.ws.rs.Path.class).value();
+		if (method.getAnnotation(javax.ws.rs.Path.class) != null) {
+			return method.getAnnotation(javax.ws.rs.Path.class).value();
 		}
 		return "";
 	}

diff --git a/...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ArtifactProxy.java b/...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ArtifactProxy.java
@@ -6,9 +6,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.Artifact;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.PresignedURL;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import java.util.List;
 
 /**

diff --git a/...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ConceptProxy.java b/...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ConceptProxy.java
@@ -6,9 +6,9 @@
 
 import java.util.List;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @RegisterRestClient(configKey = "data-service")
 @Path("/concepts")

diff --git a/...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/DatasetProxy.java b/...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/DatasetProxy.java
@@ -6,9 +6,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.PresignedURL;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import java.util.List;
 
 @RegisterRestClient(configKey = "data-service")

diff --git a/...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ExternalProxy.java b/...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ExternalProxy.java
@@ -7,9 +7,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.DocumentAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.Software;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @RegisterRestClient(configKey = "data-service")
 @Path("/external")

diff --git a/...va/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelConfigurationProxy.java b/...va/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelConfigurationProxy.java
@@ -8,9 +8,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.Model;
 import com.fasterxml.jackson.databind.JsonNode;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @RegisterRestClient(configKey = "data-service")
 @Path("/model_configurations")

diff --git a/...r/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelProxy.java b/...r/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelProxy.java
@@ -7,9 +7,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.ModelOperationCopy;
 import software.uncharted.terarium.hmiserver.models.dataservice.ModelConfiguration;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import java.util.Map;
 import java.util.List;
 

diff --git a/.../src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/PersonProxy.java b/.../src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/PersonProxy.java
@@ -5,9 +5,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.Association;
 import software.uncharted.terarium.hmiserver.models.dataservice.Person;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @RegisterRestClient(configKey = "data-service")
 @Path("/persons")

diff --git a/...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProjectProxy.java b/...src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProjectProxy.java
@@ -8,9 +8,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResourceType;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import java.util.*;
 
 

diff --git a/.../main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProvenanceProxy.java b/.../main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProvenanceProxy.java
@@ -5,9 +5,9 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.Provenance;
 import software.uncharted.terarium.hmiserver.models.dataservice.ProvenanceQueryParam;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @RegisterRestClient(configKey = "data-service")
 @Path("/provenance")

diff --git a/.../main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/SimulationProxy.java b/.../main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/SimulationProxy.java
@@ -7,8 +7,8 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.PresignedURL;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
 
 @RegisterRestClient(configKey = "data-service")
 @Path("/simulations")

diff --git a/...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/WorkflowProxy.java b/...rc/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/WorkflowProxy.java
@@ -6,9 +6,9 @@
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import java.util.*;
 
 @RegisterRestClient(configKey = "data-service")

diff --git a/...ain/java/software/uncharted/terarium/hmiserver/proxies/documentservice/DocumentProxy.java b/...ain/java/software/uncharted/terarium/hmiserver/proxies/documentservice/DocumentProxy.java
@@ -6,8 +6,8 @@
 import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;
 import software.uncharted.terarium.hmiserver.resources.documentservice.responses.*;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
 
 @RegisterRestClient(configKey = "xdd-dev-service")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/...ain/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ESSearchProxy.java b/...ain/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ESSearchProxy.java
@@ -5,12 +5,12 @@
 import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime;
 import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;
 
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 /**
  * This is a temporary proxy as currently the ES endpoint is just on xDD's development

diff --git a/...n/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ExtractionProxy.java b/...n/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ExtractionProxy.java
@@ -8,8 +8,8 @@
 import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDExtractionsResponseOK;
 import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDResponse;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
 
 @RegisterRestClient(configKey = "xdd-document-service")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/...ftware/uncharted/terarium/hmiserver/proxies/extractionservice/ExtractionServiceProxy.java b/...ftware/uncharted/terarium/hmiserver/proxies/extractionservice/ExtractionServiceProxy.java
@@ -4,15 +4,15 @@
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 import software.uncharted.terarium.hmiserver.exceptions.HmiResponseExceptionMapper;
 import software.uncharted.terarium.hmiserver.models.extractionservice.ExtractionResponse;
 
 import java.util.List;
 import java.util.Map;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
 
 @RegisterRestClient(configKey = "extraction-service-api")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/...erver/src/main/java/software/uncharted/terarium/hmiserver/proxies/github/GithubProxy.java b/...erver/src/main/java/software/uncharted/terarium/hmiserver/proxies/github/GithubProxy.java
@@ -4,9 +4,9 @@
 import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime;
 import software.uncharted.terarium.hmiserver.models.code.GithubFile;
 
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
+import javax.ws.rs.*;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
 import java.util.List;
 
 @RegisterRestClient(configKey = "github")