diff --git a/gradle.properties b/gradle.properties index 8624274d53..32585237e7 100644 --- 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 index b88bfeef83..eb742eb4f8 100644 --- 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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/annotations/LogRestClientTime.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/annotations/LogRestClientTime.java index 09ac98fb12..2f6f1d5885 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/annotations/LogRestClientTime.java +++ b/packages/services/hmi-server/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/caching/CacheClearService.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/caching/CacheClearService.java index 9a6624222f..5378a4d9b9 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/caching/CacheClearService.java +++ b/packages/services/hmi-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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingRequestFilter.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingRequestFilter.java index 9798b0d88b..34652abe62 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingRequestFilter.java +++ b/packages/services/hmi-server/src/main/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingResponseFilter.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingResponseFilter.java index 66127842c7..6c27c5cabe 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/configuration/RequestLoggingResponseFilter.java +++ b/packages/services/hmi-server/src/main/java/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Annotation.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Annotation.java index b7f801aa1a..7121c52624 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Annotation.java +++ b/packages/services/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Event.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Event.java index 530845d9bc..97f621525a 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/entities/Event.java +++ b/packages/services/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/exceptions/HmiResponseExceptionMapper.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/exceptions/HmiResponseExceptionMapper.java index 6dadeaf1ed..7ac82f9380 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/exceptions/HmiResponseExceptionMapper.java +++ b/packages/services/hmi-server/src/main/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 { diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/RestClientTimingInterceptor.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/RestClientTimingInterceptor.java index 382f52641e..63e918cf26 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/RestClientTimingInterceptor.java +++ b/packages/services/hmi-server/src/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ArtifactProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ArtifactProxy.java index ae36552d3a..01548cf93b 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ArtifactProxy.java +++ b/packages/services/hmi-server/src/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ConceptProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ConceptProxy.java index 629f91ed85..36caa07266 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ConceptProxy.java +++ b/packages/services/hmi-server/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/DatasetProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/DatasetProxy.java index 741b85bbfd..a26f14f41e 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/DatasetProxy.java +++ b/packages/services/hmi-server/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ExternalProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ExternalProxy.java index 4d88a8457f..7da72646fa 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ExternalProxy.java +++ b/packages/services/hmi-server/src/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelConfigurationProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelConfigurationProxy.java index 6abd25222e..1523ff29b8 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelConfigurationProxy.java +++ b/packages/services/hmi-server/src/main/java/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelProxy.java index 61344c193e..bcc35fe1b6 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ModelProxy.java +++ b/packages/services/hmi-server/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/PersonProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/PersonProxy.java index 316fae04ff..74b6679e2c 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/PersonProxy.java +++ b/packages/services/hmi-server/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProjectProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProjectProxy.java index e132344869..b76b1c26c3 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProjectProxy.java +++ b/packages/services/hmi-server/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProvenanceProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProvenanceProxy.java index 0c0f2610e7..f7d3ea4ed1 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/ProvenanceProxy.java +++ b/packages/services/hmi-server/src/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/SimulationProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/SimulationProxy.java index bb93578d32..0a6e2cebbc 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/SimulationProxy.java +++ b/packages/services/hmi-server/src/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/WorkflowProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/WorkflowProxy.java index d7580f1491..770c3c4135 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/WorkflowProxy.java +++ b/packages/services/hmi-server/src/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/DocumentProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/DocumentProxy.java index 6f94e57e70..718bfc4469 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/DocumentProxy.java +++ b/packages/services/hmi-server/src/main/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ESSearchProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ESSearchProxy.java index cbd88ddbbe..8c9bb63588 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ESSearchProxy.java +++ b/packages/services/hmi-server/src/main/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ExtractionProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ExtractionProxy.java index fee7588b33..56deb9db15 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/documentservice/ExtractionProxy.java +++ b/packages/services/hmi-server/src/main/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/extractionservice/ExtractionServiceProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/extractionservice/ExtractionServiceProxy.java index 7530784676..5450cf6980 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/extractionservice/ExtractionServiceProxy.java +++ b/packages/services/hmi-server/src/main/java/software/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/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/github/GithubProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/github/GithubProxy.java index 12b88ec7fa..e23db3f460 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/github/GithubProxy.java +++ b/packages/services/hmi-server/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") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/jsdelivr/JsDelivrProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/jsdelivr/JsDelivrProxy.java index e8a390aa02..08c48bdc7f 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/jsdelivr/JsDelivrProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/jsdelivr/JsDelivrProxy.java @@ -3,10 +3,10 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; -import jakarta.ws.rs.*; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.*; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; @RegisterRestClient(configKey = "jsdelivr") public interface JsDelivrProxy { diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mira/MIRAProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mira/MIRAProxy.java index a4aedeb42d..de3254a461 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mira/MIRAProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mira/MIRAProxy.java @@ -8,8 +8,8 @@ import software.uncharted.terarium.hmiserver.models.dataservice.Model; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; import java.util.List; @RegisterProvider(HmiResponseExceptionMapper.class) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mit/MitProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mit/MitProxy.java index a6457cc850..2c48afa44b 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mit/MitProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/mit/MitProxy.java @@ -4,11 +4,11 @@ import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; import software.uncharted.terarium.hmiserver.models.modelservice.PetriNet; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Response; import java.util.List; @RegisterRestClient(configKey = "mit") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/modelservice/ModelServiceProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/modelservice/ModelServiceProxy.java index d39dc8dcaa..554fb28a2d 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/modelservice/ModelServiceProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/modelservice/ModelServiceProxy.java @@ -6,9 +6,9 @@ import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; import software.uncharted.terarium.hmiserver.models.modelservice.PetriNet; -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 = "model-service") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationCiemssServiceProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationCiemssServiceProxy.java index 87c48a7407..cce6b64c0b 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationCiemssServiceProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationCiemssServiceProxy.java @@ -3,9 +3,9 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; 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; import software.uncharted.terarium.hmiserver.models.simulationservice.SimulationRequest; import software.uncharted.terarium.hmiserver.models.simulationservice.JobResponse; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationServiceProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationServiceProxy.java index 098115897d..d1b8d36a55 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationServiceProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/simulationservice/SimulationServiceProxy.java @@ -3,9 +3,9 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; 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; import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; import software.uncharted.terarium.hmiserver.models.simulationservice.SimulationRequest; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaProxy.java index cf28f6d863..6db464813f 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaProxy.java @@ -4,11 +4,11 @@ import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; import software.uncharted.terarium.hmiserver.models.code.CodeRequest; -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.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @RegisterRestClient(configKey = "skema") public interface SkemaProxy { diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaRustProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaRustProxy.java index 605f8a87d2..f10e24d3ea 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaRustProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaRustProxy.java @@ -5,14 +5,14 @@ import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @RegisterRestClient(configKey = "skema-rust") public interface SkemaRustProxy { diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaUnifiedProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaUnifiedProxy.java index 960f952fed..d0fc6b2cd4 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaUnifiedProxy.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/skema/SkemaUnifiedProxy.java @@ -6,8 +6,8 @@ import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime; import software.uncharted.terarium.hmiserver.models.dataservice.Model; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; @RegisterRestClient(configKey = "skema-unified") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AdobeResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AdobeResource.java index e0ffc621a0..f91d4592b5 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AdobeResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AdobeResource.java @@ -4,9 +4,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; import java.util.Optional; @Path("/api/adobe") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AnnotationResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AnnotationResource.java index c80a5247e5..8f027f5083 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AnnotationResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/AnnotationResource.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.tags.Tag; import software.uncharted.terarium.hmiserver.entities.Annotation; -import jakarta.inject.Inject; -import jakarta.transaction.Transactional; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.transaction.Transactional; +import javax.ws.rs.*; +import javax.ws.rs.core.Response; import java.time.Instant; @Path("/api/annotations") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/ConfigurationResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/ConfigurationResource.java index 55d8929f67..52f5574723 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/ConfigurationResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/ConfigurationResource.java @@ -4,9 +4,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; import java.util.Optional; /** diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DevTestResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DevTestResource.java index 046895dfa2..9557c1a459 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DevTestResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DevTestResource.java @@ -8,9 +8,9 @@ import software.uncharted.terarium.hmiserver.models.user.UserEvent; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -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.UUID; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DownloadResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DownloadResource.java index ebab373122..3bfc646d42 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DownloadResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/DownloadResource.java @@ -11,12 +11,12 @@ import org.jsoup.nodes.Document; import org.jsoup.select.Elements; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/EventResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/EventResource.java index 72b65c58a8..57b6552bf3 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/EventResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/EventResource.java @@ -8,14 +8,14 @@ import software.uncharted.terarium.hmiserver.models.EventType; import software.uncharted.terarium.hmiserver.services.StructuredLog; -import jakarta.inject.Inject; -import jakarta.transaction.Transactional; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.transaction.Transactional; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Response; @Path("/api/events") @Tag(name = "Events REST Endpoints") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TGPTResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TGPTResource.java index 0150a4b96f..9ec536b467 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TGPTResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TGPTResource.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; import java.util.Optional; @Path("/api/tgpt") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TransformResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TransformResource.java index 566664d70c..5986815de5 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TransformResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/TransformResource.java @@ -12,12 +12,12 @@ import lombok.extern.slf4j.Slf4j; -import jakarta.inject.Inject; +import javax.inject.Inject; import java.util.List; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.Response; @Path("/api/transforms") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/code/CodeResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/code/CodeResource.java index 1ed5e21ed7..11dec8ba0a 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/code/CodeResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/code/CodeResource.java @@ -13,13 +13,13 @@ import software.uncharted.terarium.hmiserver.proxies.skema.SkemaProxy; import software.uncharted.terarium.hmiserver.proxies.skema.SkemaRustProxy; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.QueryParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ArtifactResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ArtifactResource.java index 2e5491a796..b54f6d81e9 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ArtifactResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ArtifactResource.java @@ -12,10 +12,10 @@ import software.uncharted.terarium.hmiserver.resources.DataStorageResource; import software.uncharted.terarium.hmiserver.resources.SnakeCaseResource; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream; import java.util.List; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ConceptResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ConceptResource.java index a2fb7518ae..031a774e54 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ConceptResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ConceptResource.java @@ -12,10 +12,10 @@ import java.util.List; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @Path("/api/concepts") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/DatasetResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/DatasetResource.java index a48cfef87f..b605567336 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/DatasetResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/DatasetResource.java @@ -25,10 +25,10 @@ import software.uncharted.terarium.hmiserver.resources.DataStorageResource; import software.uncharted.terarium.hmiserver.resources.SnakeCaseResource; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ExternalResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ExternalResource.java index b9034802d3..c9e47c853d 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ExternalResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ExternalResource.java @@ -9,10 +9,10 @@ import software.uncharted.terarium.hmiserver.models.dataservice.Software; import software.uncharted.terarium.hmiserver.proxies.dataservice.ExternalProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @Path("/api/external") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelConfigurationResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelConfigurationResource.java index d74b68064c..a821b8adba 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelConfigurationResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelConfigurationResource.java @@ -9,10 +9,10 @@ import com.fasterxml.jackson.databind.JsonNode; import software.uncharted.terarium.hmiserver.utils.Converter; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.*; @Path("/api/model_configurations") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelResource.java index 60f38113ff..b6202beb8e 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ModelResource.java @@ -12,10 +12,10 @@ import software.uncharted.terarium.hmiserver.models.dataservice.ModelConfiguration; import software.uncharted.terarium.hmiserver.proxies.dataservice.ModelProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.*; import static io.smallrye.jwt.config.ConfigLogging.log; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/PersonResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/PersonResource.java index f55111c7c9..0b7b457dd3 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/PersonResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/PersonResource.java @@ -6,10 +6,10 @@ import software.uncharted.terarium.hmiserver.models.dataservice.Person; import software.uncharted.terarium.hmiserver.proxies.dataservice.PersonProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @Path("/api/persons") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProjectResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProjectResource.java index df6d710a46..d5881730a3 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProjectResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProjectResource.java @@ -5,10 +5,10 @@ import software.uncharted.terarium.hmiserver.models.dataservice.Project; import software.uncharted.terarium.hmiserver.proxies.dataservice.ProjectProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.*; @Path("/api/projects") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProvenanceResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProvenanceResource.java index b6f98b6187..1365e3fae8 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProvenanceResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/ProvenanceResource.java @@ -6,10 +6,10 @@ import software.uncharted.terarium.hmiserver.models.dataservice.ProvenanceQueryParam; import software.uncharted.terarium.hmiserver.proxies.dataservice.ProvenanceProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @Path("/api/provenance") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/SimulationResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/SimulationResource.java index bef638847e..5c03e1c977 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/SimulationResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/SimulationResource.java @@ -19,10 +19,10 @@ import software.uncharted.terarium.hmiserver.resources.SnakeCaseResource; import software.uncharted.terarium.hmiserver.utils.Converter; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.nio.charset.StandardCharsets; @Path("/api/simulations") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/WorkflowResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/WorkflowResource.java index 804cfe069c..505e47d764 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/WorkflowResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/WorkflowResource.java @@ -5,10 +5,10 @@ import software.uncharted.terarium.hmiserver.models.dataservice.Workflow; import software.uncharted.terarium.hmiserver.proxies.dataservice.WorkflowProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.Map; @Path("/api/workflows") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DictionariesResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DictionariesResource.java index 54b3baa5fe..0ac6edf8d5 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DictionariesResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DictionariesResource.java @@ -13,9 +13,9 @@ import software.uncharted.terarium.hmiserver.proxies.documentservice.DocumentProxy; -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; @Tag(name = "Dictionaries REST Endpoint") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DocumentResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DocumentResource.java index cdff7a454d..588e4380ea 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DocumentResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/DocumentResource.java @@ -10,9 +10,9 @@ import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDResponse; import software.uncharted.terarium.hmiserver.proxies.documentservice.DocumentProxy; -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.Optional; @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/ExtractionResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/ExtractionResource.java index 743615fb95..e51e8c1527 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/ExtractionResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/ExtractionResource.java @@ -12,9 +12,9 @@ import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDResponse; import software.uncharted.terarium.hmiserver.proxies.documentservice.ExtractionProxy; -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.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/RelatedResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/RelatedResource.java index 1e3c33504f..20e2a585cd 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/RelatedResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/RelatedResource.java @@ -10,9 +10,9 @@ import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDRelatedWordsResponse; -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; @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/SetResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/SetResource.java index 8ebb686b3c..ed36e8888d 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/SetResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/SetResource.java @@ -11,12 +11,12 @@ import software.uncharted.terarium.hmiserver.resources.documentservice.responses.XDDSetsResponse; import software.uncharted.terarium.hmiserver.proxies.documentservice.DocumentProxy; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -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.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @Path("/api/document/sets") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/responses/XDDResponse.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/responses/XDDResponse.java index e26bedd0ba..c3f334058b 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/responses/XDDResponse.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/documentservice/responses/XDDResponse.java @@ -3,7 +3,7 @@ import lombok.Data; import lombok.experimental.Accessors; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.core.Response; import java.io.Serializable; @Data diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/evaluation/EvaluationResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/evaluation/EvaluationResource.java index 2df2c36054..49e9323842 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/evaluation/EvaluationResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/evaluation/EvaluationResource.java @@ -21,10 +21,10 @@ import software.uncharted.terarium.hmiserver.models.EvaluationScenarioSummary; import software.uncharted.terarium.hmiserver.models.EventType; -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.QueryParam; import java.io.File; import java.io.IOException; import java.io.StringWriter; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/extractionservice/ExtractionResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/extractionservice/ExtractionResource.java index b0b1836b63..6247ccc3c4 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/extractionservice/ExtractionResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/extractionservice/ExtractionResource.java @@ -13,10 +13,10 @@ import software.uncharted.terarium.hmiserver.proxies.skema.SkemaUnifiedProxy; import software.uncharted.terarium.hmiserver.proxies.dataservice.ArtifactProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; @Path("/api/extract") diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/loggingservice/LoggingResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/loggingservice/LoggingResource.java index 673e53fcbb..8917d19d86 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/loggingservice/LoggingResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/loggingservice/LoggingResource.java @@ -5,14 +5,14 @@ import software.uncharted.terarium.hmiserver.services.LogMessage; import software.uncharted.terarium.hmiserver.services.LoggingService; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; @Path("/api") @ApplicationScoped diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/miraservice/MIRAResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/miraservice/MIRAResource.java index d7ff0587d2..de940657a6 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/miraservice/MIRAResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/miraservice/MIRAResource.java @@ -10,9 +10,9 @@ import software.uncharted.terarium.hmiserver.models.mira.DKG; import software.uncharted.terarium.hmiserver.proxies.mira.MIRAProxy; -import jakarta.inject.Inject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.*; +import javax.inject.Inject; +import javax.ws.rs.*; +import javax.ws.rs.core.*; import java.util.List; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/modelservice/ModelingRequestResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/modelservice/ModelingRequestResource.java index 10957301d6..1addc48f15 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/modelservice/ModelingRequestResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/modelservice/ModelingRequestResource.java @@ -4,9 +4,9 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; import software.uncharted.terarium.hmiserver.models.modelservice.StratifyRequest; -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 software.uncharted.terarium.hmiserver.proxies.modelservice.ModelServiceProxy; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/simulationservice/SimulationRequestResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/simulationservice/SimulationRequestResource.java index e4981afdca..b754881f5c 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/simulationservice/SimulationRequestResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/simulationservice/SimulationRequestResource.java @@ -17,9 +17,9 @@ import software.uncharted.terarium.hmiserver.proxies.simulationservice.SimulationServiceProxy; import software.uncharted.terarium.hmiserver.proxies.simulationservice.SimulationCiemssServiceProxy; -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; @Path("/api/simulation-request") @Produces(MediaType.APPLICATION_JSON) diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/user/ServerSentEventResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/user/ServerSentEventResource.java index 601b2b3d4a..ffb8cefc3a 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/user/ServerSentEventResource.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/user/ServerSentEventResource.java @@ -1,24 +1,20 @@ package software.uncharted.terarium.hmiserver.resources.user; - +import com.oracle.svm.core.annotate.Inject; import io.quarkus.security.identity.SecurityIdentity; import io.smallrye.mutiny.Multi; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.reactive.messaging.Channel; import org.jboss.resteasy.annotations.SseElementType; - +import org.reactivestreams.Publisher; import software.uncharted.terarium.hmiserver.models.user.UserEvent; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import java.util.concurrent.Flow; - +import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; @Path("/api/user/") @ApplicationScoped @@ -29,8 +25,7 @@ public class ServerSentEventResource { SecurityIdentity securityIdentity; @Inject - @Channel("user-event") - Flow.Publisher userEvents; + @Channel("user-event") Publisher userEvents; /** * Gets all user events @@ -39,7 +34,7 @@ public class ServerSentEventResource { @Path("/server-sent-events") @Produces(MediaType.SERVER_SENT_EVENTS) @SseElementType(MediaType.APPLICATION_JSON) - public Flow.Publisher stream() { + public Publisher stream() { return Multi.createFrom().publisher(userEvents); } } diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/EventService.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/EventService.java index c67ff5952b..7ed663d30c 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/EventService.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/EventService.java @@ -2,8 +2,8 @@ import software.uncharted.terarium.hmiserver.entities.Event; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.transaction.Transactional; +import javax.enterprise.context.ApplicationScoped; +import javax.transaction.Transactional; @ApplicationScoped public class EventService { diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/LoggingService.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/LoggingService.java index 301d631cbc..e27f27e643 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/LoggingService.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/LoggingService.java @@ -1,7 +1,7 @@ package software.uncharted.terarium.hmiserver.services; import java.util.List; -import jakarta.enterprise.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; import lombok.Data; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/StructuredLog.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/StructuredLog.java index bf03000868..712db6a1bd 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/StructuredLog.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/services/StructuredLog.java @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.microprofile.config.inject.ConfigProperty; -import jakarta.enterprise.context.ApplicationScoped; +import javax.enterprise.context.ApplicationScoped; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/utils/Converter.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/utils/Converter.java index 5d5c6cb77b..8d17ae45ef 100644 --- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/utils/Converter.java +++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/utils/Converter.java @@ -3,14 +3,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; - +import com.fasterxml.jackson.databind.PropertyNamingStrategy; public class Converter { public static JsonNode convertObjectToSnakeCaseJsonNode(Object object) { ObjectMapper mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE ); + mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); return mapper.convertValue(object, JsonNode.class); } } diff --git a/packages/services/hmi-server/src/main/resources/application.properties b/packages/services/hmi-server/src/main/resources/application.properties index d35970beff..07e74af896 100644 --- a/packages/services/hmi-server/src/main/resources/application.properties +++ b/packages/services/hmi-server/src/main/resources/application.properties @@ -1,7 +1,7 @@ ######################################################################################################################## # OIDC Configuration ######################################################################################################################## -%dev.quarkus.oidc.auth-server-url=${keycloak-service-protocol:http}://${keycloak-service-fqdn:localhost}:${keycloak-service-port:8079}/realms/${realm:Terarium} +%dev.quarkus.oidc.auth-server-url=${keycloak-service-protocol:http}://${keycloak-service-fqdn:localhost}${keycloak-service-port::8079}/realms/${realm:Terarium} %prod.quarkus.oidc.auth-server-url=${keycloak-service-protocol}://${keycloak-service-fqdn}${keycloak-service-port}/realms/${realm} quarkus.oidc.client-id=app %dev.quarkus.oidc.credentials.secret=jtbQhs6SlfynqJaygVpwav2kLzAme2b4 diff --git a/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/proxies/DocumentProxyTests.java b/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/proxies/DocumentProxyTests.java index 6d349919e0..f5673232c6 100644 --- a/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/proxies/DocumentProxyTests.java +++ b/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/proxies/DocumentProxyTests.java @@ -52,7 +52,6 @@ public void testItCanGetADocumentById() { Assertions.assertEquals(TARGET_ID, response.getSuccess().getData().get(0).getGddId()); } - @Test public void testItCanSearchForADocByTerm() { final XDDResponse response = documentProxy.getDocuments("", diff --git a/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/services/StructuredLogTests.java b/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/services/StructuredLogTests.java index e0c3160e91..7208c523c4 100644 --- a/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/services/StructuredLogTests.java +++ b/packages/services/hmi-server/src/test/java/software/uncharted/terarium/hmiserver/services/StructuredLogTests.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import jakarta.inject.Inject; +import javax.inject.Inject; @QuarkusTest public class StructuredLogTests {