diff --git a/arlas-commons/pom.xml b/arlas-commons/pom.xml index e89994e66..f4dfa6455 100644 --- a/arlas-commons/pom.xml +++ b/arlas-commons/pom.xml @@ -22,18 +22,6 @@ com.smoketurner dropwizard-swagger ${dropwizard.swagger.version} - - - snakeyaml - org.yaml - - - - - - jakarta.activation - jakarta.activation-api - ${activation.version} @@ -42,6 +30,12 @@ ${hazelcast.version} + + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-base + ${jackson-version} + + com.auth0 java-jwt @@ -52,12 +46,6 @@ org.keycloak keycloak-authz-client ${keycloak.version} - - - com.sun.activation - jakarta.activation - - diff --git a/arlas-commons/src/main/java/io/arlas/commons/config/ArlasAuthConfiguration.java b/arlas-commons/src/main/java/io/arlas/commons/config/ArlasAuthConfiguration.java index ad8b6de8c..b924f261e 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/config/ArlasAuthConfiguration.java +++ b/arlas-commons/src/main/java/io/arlas/commons/config/ArlasAuthConfiguration.java @@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.arlas.commons.exceptions.ArlasConfigurationException; import io.arlas.filter.config.InitConfiguration; +import jakarta.ws.rs.HttpMethod; import org.keycloak.representations.adapters.config.AdapterConfig; -import javax.ws.rs.HttpMethod; import java.util.*; import java.util.stream.Collectors; diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasException.java index db2ec5831..1eb554bc5 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasException.java @@ -20,9 +20,8 @@ package io.arlas.commons.exceptions; import io.arlas.commons.rest.response.Error; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class ArlasException extends Exception { private static final long serialVersionUID = 1L; diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasExceptionMapper.java index 10415fef6..834b95052 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasExceptionMapper.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ArlasExceptionMapper.java @@ -19,12 +19,12 @@ package io.arlas.commons.exceptions; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; import java.util.Arrays; @Provider diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/BadRequestException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/BadRequestException.java index 8f19d2da4..9feaadc10 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/BadRequestException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/BadRequestException.java @@ -19,7 +19,7 @@ package io.arlas.commons.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class BadRequestException extends ArlasException { private static final long serialVersionUID = 1L; diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ConstraintViolationExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ConstraintViolationExceptionMapper.java index 45ff68fb2..45a28f8e8 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ConstraintViolationExceptionMapper.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ConstraintViolationExceptionMapper.java @@ -19,12 +19,12 @@ package io.arlas.commons.exceptions; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import java.util.Arrays; public class ConstraintViolationExceptionMapper implements ExceptionMapper { diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/IllegalArgumentExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/IllegalArgumentExceptionMapper.java index e4002be69..cc6a9cdcd 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/IllegalArgumentExceptionMapper.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/IllegalArgumentExceptionMapper.java @@ -19,11 +19,11 @@ package io.arlas.commons.exceptions; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import java.util.Arrays; public class IllegalArgumentExceptionMapper implements ExceptionMapper { diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/InvalidParameterException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/InvalidParameterException.java index 566bfcf88..7ef0262ef 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/InvalidParameterException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/InvalidParameterException.java @@ -19,7 +19,7 @@ package io.arlas.commons.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class InvalidParameterException extends ArlasException { private static final long serialVersionUID = 1L; diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/JsonProcessingExceptionMapper.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/JsonProcessingExceptionMapper.java index 24c494beb..9b3dfd8cf 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/JsonProcessingExceptionMapper.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/JsonProcessingExceptionMapper.java @@ -20,11 +20,11 @@ package io.arlas.commons.exceptions; import com.fasterxml.jackson.core.JsonProcessingException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import java.util.Arrays; public class JsonProcessingExceptionMapper implements ExceptionMapper { diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotAllowedException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotAllowedException.java index cc9d6c3e6..07003d8e6 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotAllowedException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotAllowedException.java @@ -19,7 +19,7 @@ package io.arlas.commons.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class NotAllowedException extends ArlasException { private static final long serialVersionUID = 1L; diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotFoundException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotFoundException.java index 90a953d46..eda738fa4 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotFoundException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotFoundException.java @@ -19,7 +19,7 @@ package io.arlas.commons.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class NotFoundException extends ArlasException { diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotImplementedException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotImplementedException.java index 098af2ce1..a5a73adce 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotImplementedException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/NotImplementedException.java @@ -19,7 +19,7 @@ package io.arlas.commons.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class NotImplementedException extends ArlasException { private static final long serialVersionUID = 1L; diff --git a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ParseException.java b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ParseException.java index c136650b9..adcd0675d 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/exceptions/ParseException.java +++ b/arlas-commons/src/main/java/io/arlas/commons/exceptions/ParseException.java @@ -19,7 +19,7 @@ package io.arlas.commons.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ParseException extends ArlasException { diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/InsensitiveCaseFilter.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/InsensitiveCaseFilter.java index d50244438..dc6541ef1 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/InsensitiveCaseFilter.java +++ b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/InsensitiveCaseFilter.java @@ -19,15 +19,14 @@ package io.arlas.commons.rest.utils; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyPrintFilter.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyPrintFilter.java index f738c33c0..9c1e73f1e 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyPrintFilter.java +++ b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyPrintFilter.java @@ -19,16 +19,17 @@ package io.arlas.commons.rest.utils; -import com.fasterxml.jackson.jaxrs.cfg.ObjectWriterInjector; +import com.fasterxml.jackson.jakarta.rs.cfg.ObjectWriterInjector; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MultivaluedMap; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MultivaluedMap; import java.io.IOException; import java.util.List; import java.util.Map.Entry; -public class PrettyPrintFilter implements javax.ws.rs.container.ContainerResponseFilter { +public class PrettyPrintFilter implements ContainerResponseFilter { private static final String QUERY_PARAM_PRETTY = "pretty"; private static final String QUERY_PARAM_TRUE = "true"; diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyWriterModifier.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyWriterModifier.java index d9b248c8d..c7cf5dfa1 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyWriterModifier.java +++ b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/PrettyWriterModifier.java @@ -21,10 +21,10 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectWriter; -import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase; -import com.fasterxml.jackson.jaxrs.cfg.ObjectWriterModifier; +import com.fasterxml.jackson.jakarta.rs.cfg.EndpointConfigBase; +import com.fasterxml.jackson.jakarta.rs.cfg.ObjectWriterModifier; +import jakarta.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.MultivaluedMap; import java.io.IOException; public class PrettyWriterModifier extends ObjectWriterModifier { diff --git a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/ResponseFormatter.java b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/ResponseFormatter.java index 94c86aef2..6c75bc1c4 100644 --- a/arlas-commons/src/main/java/io/arlas/commons/rest/utils/ResponseFormatter.java +++ b/arlas-commons/src/main/java/io/arlas/commons/rest/utils/ResponseFormatter.java @@ -21,9 +21,8 @@ import io.arlas.commons.rest.response.Success; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class ResponseFormatter { diff --git a/arlas-commons/src/main/java/io/arlas/filter/core/ArlasClaims.java b/arlas-commons/src/main/java/io/arlas/filter/core/ArlasClaims.java index d63634379..4ab54a870 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/core/ArlasClaims.java +++ b/arlas-commons/src/main/java/io/arlas/filter/core/ArlasClaims.java @@ -20,10 +20,10 @@ package io.arlas.filter.core; import co.elastic.apm.api.Transaction; +import jakarta.ws.rs.core.MultivaluedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.MultivaluedMap; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/arlas-commons/src/main/java/io/arlas/filter/core/IdentityParam.java b/arlas-commons/src/main/java/io/arlas/filter/core/IdentityParam.java index 19ffb0497..fa409afba 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/core/IdentityParam.java +++ b/arlas-commons/src/main/java/io/arlas/filter/core/IdentityParam.java @@ -21,8 +21,8 @@ import io.arlas.commons.config.ArlasAuthConfiguration; import io.arlas.filter.config.TechnicalRoles; +import jakarta.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.HttpHeaders; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/arlas-commons/src/main/java/io/arlas/filter/core/PolicyEnforcer.java b/arlas-commons/src/main/java/io/arlas/filter/core/PolicyEnforcer.java index 5d630e5db..62f19f0da 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/core/PolicyEnforcer.java +++ b/arlas-commons/src/main/java/io/arlas/filter/core/PolicyEnforcer.java @@ -21,10 +21,9 @@ import io.arlas.commons.cache.BaseCacheManager; import io.arlas.commons.config.ArlasAuthConfiguration; +import jakarta.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerRequestFilter; import java.util.ServiceLoader; -import java.util.stream.Collectors; public interface PolicyEnforcer extends ContainerRequestFilter { diff --git a/arlas-commons/src/main/java/io/arlas/filter/impl/AbstractPolicyEnforcer.java b/arlas-commons/src/main/java/io/arlas/filter/impl/AbstractPolicyEnforcer.java index 0d9d7773e..3dceb3e8f 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/impl/AbstractPolicyEnforcer.java +++ b/arlas-commons/src/main/java/io/arlas/filter/impl/AbstractPolicyEnforcer.java @@ -29,18 +29,18 @@ import io.arlas.filter.config.TechnicalRoles; import io.arlas.filter.core.ArlasClaims; import io.arlas.filter.core.PolicyEnforcer; +import jakarta.annotation.Priority; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import javax.annotation.Priority; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.util.*; import java.util.function.Consumer; @@ -48,8 +48,8 @@ import static io.arlas.commons.rest.utils.ServerConstants.*; import static io.arlas.filter.config.TechnicalRoles.VAR_ORG; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; @Provider @Priority(Priorities.AUTHORIZATION) diff --git a/arlas-commons/src/main/java/io/arlas/filter/impl/Auth0PolicyEnforcer.java b/arlas-commons/src/main/java/io/arlas/filter/impl/Auth0PolicyEnforcer.java index 550b172d1..ff3a8aa52 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/impl/Auth0PolicyEnforcer.java +++ b/arlas-commons/src/main/java/io/arlas/filter/impl/Auth0PolicyEnforcer.java @@ -25,12 +25,12 @@ import io.arlas.commons.config.ArlasAuthConfiguration; import io.arlas.commons.utils.StringUtil; import io.arlas.filter.core.PolicyEnforcer; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.Provider; import java.io.FileInputStream; import java.io.InputStream; import java.net.URL; diff --git a/arlas-commons/src/main/java/io/arlas/filter/impl/HTTPPolicyEnforcer.java b/arlas-commons/src/main/java/io/arlas/filter/impl/HTTPPolicyEnforcer.java index a629c670a..fcd7b3c7c 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/impl/HTTPPolicyEnforcer.java +++ b/arlas-commons/src/main/java/io/arlas/filter/impl/HTTPPolicyEnforcer.java @@ -25,19 +25,19 @@ import io.arlas.commons.config.ArlasAuthConfiguration; import io.arlas.commons.exceptions.ArlasException; import io.arlas.filter.core.PolicyEnforcer; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; import java.util.Collections; import java.util.Map; import java.util.Optional; diff --git a/arlas-commons/src/main/java/io/arlas/filter/impl/KeycloakPolicyEnforcer.java b/arlas-commons/src/main/java/io/arlas/filter/impl/KeycloakPolicyEnforcer.java index ef33a721a..87d20917e 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/impl/KeycloakPolicyEnforcer.java +++ b/arlas-commons/src/main/java/io/arlas/filter/impl/KeycloakPolicyEnforcer.java @@ -21,6 +21,9 @@ import io.arlas.commons.config.ArlasAuthConfiguration; import io.arlas.filter.core.PolicyEnforcer; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.Provider; import org.keycloak.TokenVerifier; import org.keycloak.authorization.client.AuthzClient; import org.keycloak.authorization.client.Configuration; @@ -30,9 +33,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.Provider; import java.util.*; @Provider diff --git a/arlas-commons/src/main/java/io/arlas/filter/impl/NoPolicyEnforcer.java b/arlas-commons/src/main/java/io/arlas/filter/impl/NoPolicyEnforcer.java index b0085aff7..512444c89 100644 --- a/arlas-commons/src/main/java/io/arlas/filter/impl/NoPolicyEnforcer.java +++ b/arlas-commons/src/main/java/io/arlas/filter/impl/NoPolicyEnforcer.java @@ -21,11 +21,11 @@ import io.arlas.commons.cache.BaseCacheManager; import io.arlas.commons.config.ArlasAuthConfiguration; import io.arlas.filter.core.PolicyEnforcer; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.ext.Provider; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.ext.Provider; import java.io.IOException; @Provider diff --git a/arlas-commons/src/main/java/module-info.java b/arlas-commons/src/main/java/module-info.java index 8921d01af..7592c27f4 100644 --- a/arlas-commons/src/main/java/module-info.java +++ b/arlas-commons/src/main/java/module-info.java @@ -40,21 +40,21 @@ requires co.elastic.apm.api; requires com.auth0.jwt; requires com.fasterxml.jackson.annotation; + requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; requires com.fasterxml.jackson.dataformat.yaml; - requires com.fasterxml.jackson.core; - requires com.fasterxml.jackson.jaxrs.base; + requires com.fasterxml.jackson.jakarta.rs.base; requires com.hazelcast.core; requires io.dropwizard.core; requires io.dropwizard.jackson; + requires io.swagger.v3.core; + requires io.swagger.v3.oas.models; requires dropwizard.swagger; - requires java.annotation; - requires java.validation; - requires java.ws.rs; + requires jakarta.annotation; + requires jakarta.servlet; + requires jakarta.ws.rs; + requires jakarta.validation; requires keycloak.authz.client; requires keycloak.core; requires org.slf4j; - requires java.servlet; - requires io.swagger.v3.core; - requires io.swagger.v3.oas.models; } \ No newline at end of file diff --git a/arlas-core/src/main/java/io/arlas/server/core/exceptions/CollectionUnavailableException.java b/arlas-core/src/main/java/io/arlas/server/core/exceptions/CollectionUnavailableException.java index 68238f840..91b61f14d 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/exceptions/CollectionUnavailableException.java +++ b/arlas-core/src/main/java/io/arlas/server/core/exceptions/CollectionUnavailableException.java @@ -21,8 +21,7 @@ import io.arlas.commons.exceptions.ArlasException; import io.arlas.server.core.model.CollectionReference; - -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class CollectionUnavailableException extends ArlasException { diff --git a/arlas-core/src/main/java/io/arlas/server/core/exceptions/ColumnUnavailableException.java b/arlas-core/src/main/java/io/arlas/server/core/exceptions/ColumnUnavailableException.java index d15ef30fa..952ca833b 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/exceptions/ColumnUnavailableException.java +++ b/arlas-core/src/main/java/io/arlas/server/core/exceptions/ColumnUnavailableException.java @@ -20,8 +20,8 @@ package io.arlas.server.core.exceptions; import io.arlas.commons.exceptions.ArlasException; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.core.Response; import java.util.Set; /** diff --git a/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/exceptions/ElasticsearchExceptionMapper.java b/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/exceptions/ElasticsearchExceptionMapper.java index ec806be42..ba625759e 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/exceptions/ElasticsearchExceptionMapper.java +++ b/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/exceptions/ElasticsearchExceptionMapper.java @@ -22,12 +22,11 @@ import co.elastic.clients.elasticsearch._types.ElasticsearchException; import io.arlas.commons.exceptions.ArlasException; import io.arlas.commons.exceptions.ArlasExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - public class ElasticsearchExceptionMapper implements ExceptionMapper { Logger logger = LoggerFactory.getLogger(ArlasExceptionMapper.class); diff --git a/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/services/ElasticExploreService.java b/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/services/ElasticExploreService.java index 2e42560ba..a8a7bd81b 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/services/ElasticExploreService.java +++ b/arlas-core/src/main/java/io/arlas/server/core/impl/elastic/services/ElasticExploreService.java @@ -54,7 +54,7 @@ import org.locationtech.spatial4j.io.GeohashUtils; import org.locationtech.spatial4j.shape.Rectangle; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/arlas-core/src/main/java/io/arlas/server/core/model/CollectionReferenceParameters.java b/arlas-core/src/main/java/io/arlas/server/core/model/CollectionReferenceParameters.java index 1ce22231b..d712b7dbf 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/model/CollectionReferenceParameters.java +++ b/arlas-core/src/main/java/io/arlas/server/core/model/CollectionReferenceParameters.java @@ -26,7 +26,7 @@ import io.arlas.server.core.model.enumerations.GeoTypeEnum; import io.arlas.server.core.model.request.Filter; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/arlas-core/src/main/java/io/arlas/server/core/services/ExploreService.java b/arlas-core/src/main/java/io/arlas/server/core/services/ExploreService.java index bda8f6e40..10fb2a137 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/services/ExploreService.java +++ b/arlas-core/src/main/java/io/arlas/server/core/services/ExploreService.java @@ -19,10 +19,10 @@ package io.arlas.server.core.services; import co.elastic.clients.json.JsonData; -import io.arlas.commons.utils.StringUtil; -import io.arlas.server.core.app.ArlasServerConfiguration; import io.arlas.commons.exceptions.ArlasException; import io.arlas.commons.exceptions.BadRequestException; +import io.arlas.commons.utils.StringUtil; +import io.arlas.server.core.app.ArlasServerConfiguration; import io.arlas.server.core.exceptions.CollectionUnavailableException; import io.arlas.server.core.model.CollectionReference; import io.arlas.server.core.model.enumerations.ComputationEnum; @@ -30,6 +30,7 @@ import io.arlas.server.core.model.request.*; import io.arlas.server.core.model.response.*; import io.arlas.server.core.utils.*; +import jakarta.ws.rs.core.UriInfo; import org.apache.commons.lang3.tuple.Pair; import org.geojson.*; import org.locationtech.spatial4j.context.SpatialContext; @@ -38,7 +39,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.UriInfo; import java.util.*; import java.util.function.Function; import java.util.function.Predicate; diff --git a/arlas-core/src/main/java/io/arlas/server/core/utils/ResponseCacheManager.java b/arlas-core/src/main/java/io/arlas/server/core/utils/ResponseCacheManager.java index 84118c6c2..b537750b7 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/utils/ResponseCacheManager.java +++ b/arlas-core/src/main/java/io/arlas/server/core/utils/ResponseCacheManager.java @@ -19,8 +19,8 @@ package io.arlas.server.core.utils; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Response; public class ResponseCacheManager { diff --git a/arlas-core/src/main/java/io/arlas/server/core/utils/UriInfoWrapper.java b/arlas-core/src/main/java/io/arlas/server/core/utils/UriInfoWrapper.java index 0ebad49b5..3ac72feba 100644 --- a/arlas-core/src/main/java/io/arlas/server/core/utils/UriInfoWrapper.java +++ b/arlas-core/src/main/java/io/arlas/server/core/utils/UriInfoWrapper.java @@ -20,8 +20,7 @@ package io.arlas.server.core.utils; import io.arlas.commons.utils.StringUtil; - -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; public class UriInfoWrapper { private UriInfo uriInfo; diff --git a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/AtomHitsMessageBodyWriter.java b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/AtomHitsMessageBodyWriter.java index b9e58dfa9..c3e204bb3 100644 --- a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/AtomHitsMessageBodyWriter.java +++ b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/AtomHitsMessageBodyWriter.java @@ -20,6 +20,7 @@ package io.arlas.server.opensearch.rest.explore; import io.arlas.commons.exceptions.ArlasException; +import io.arlas.commons.utils.StringUtil; import io.arlas.server.core.model.CollectionReference; import io.arlas.server.core.model.Feed; import io.arlas.server.core.model.response.*; @@ -27,17 +28,16 @@ import io.arlas.server.core.ns.GEORSS; import io.arlas.server.core.ns.GML; import io.arlas.server.core.ns.OPENSEARCH; -import io.arlas.server.ogc.common.utils.GeoFormat; import io.arlas.server.core.services.ExploreService; import io.arlas.server.core.utils.MapExplorer; -import io.arlas.commons.utils.StringUtil; +import io.arlas.server.ogc.common.utils.GeoFormat; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/OpenSearchDescriptorService.java b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/OpenSearchDescriptorService.java index 6ed32db26..b0dfcb6dc 100644 --- a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/OpenSearchDescriptorService.java +++ b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/OpenSearchDescriptorService.java @@ -41,11 +41,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.io.IOException; import java.util.*; diff --git a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Image.java b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Image.java index abc0d14eb..9128d7b5e 100644 --- a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Image.java +++ b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Image.java @@ -19,7 +19,7 @@ package io.arlas.server.opensearch.rest.explore.model; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; public class Image { @XmlAttribute(name = "height") diff --git a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/OpenSearchDescription.java b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/OpenSearchDescription.java index 07a4ceab4..eee008ed8 100644 --- a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/OpenSearchDescription.java +++ b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/OpenSearchDescription.java @@ -19,8 +19,9 @@ package io.arlas.server.opensearch.rest.explore.model; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; + import java.util.ArrayList; import java.util.List; diff --git a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Url.java b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Url.java index 8cebc01fa..622520247 100644 --- a/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Url.java +++ b/arlas-opensearch/src/main/java/io/arlas/server/opensearch/rest/explore/model/Url.java @@ -19,7 +19,7 @@ package io.arlas.server.opensearch.rest.explore.model; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; public class Url { diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionRESTServices.java b/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionRESTServices.java index 6af3eff21..485f23caa 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionRESTServices.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionRESTServices.java @@ -21,12 +21,11 @@ import io.arlas.server.core.services.ArlasRESTServices; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; - @Path("/collections") @Tag(name="collections", description="Collections API") public abstract class CollectionRESTServices extends ArlasRESTServices { diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionService.java b/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionService.java index fd92cf2a6..598c9151a 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/collections/CollectionService.java @@ -41,16 +41,16 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream; import java.time.LocalDate; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java index 6789c0d85..f15dac9b7 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java @@ -24,12 +24,10 @@ import io.arlas.server.core.services.ArlasRESTServices; import io.arlas.server.core.services.ExploreService; import io.arlas.server.core.utils.IOUtils; -import io.swagger.v3.oas.annotations.ExternalDocumentation; -import io.swagger.v3.oas.annotations.OpenAPIDefinition; -import io.swagger.v3.oas.annotations.info.Contact; -import io.swagger.v3.oas.annotations.info.Info; -import io.swagger.v3.oas.annotations.info.License; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.FileUtils; import org.geojson.FeatureCollection; import org.geotools.data.collection.ListFeatureCollection; @@ -50,9 +48,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.io.*; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/AggregateRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/AggregateRESTService.java index dbf210310..09ba5cf72 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/AggregateRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/AggregateRESTService.java @@ -42,9 +42,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/GeoAggregateRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/GeoAggregateRESTService.java index b7f6b9fa3..72e6b3d16 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/GeoAggregateRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/aggregate/GeoAggregateRESTService.java @@ -42,14 +42,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.geojson.Feature; import org.geojson.FeatureCollection; import org.geojson.GeoJsonObject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.io.File; import java.io.IOException; import java.util.*; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/compute/ComputeRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/compute/ComputeRESTService.java index 50973f79c..57d7ffaef 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/compute/ComputeRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/compute/ComputeRESTService.java @@ -41,9 +41,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.List; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/count/CountRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/count/CountRESTService.java index edacca960..ec6701be3 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/count/CountRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/count/CountRESTService.java @@ -40,9 +40,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.List; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeCollectionRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeCollectionRESTService.java index 40eaf621f..fc4860223 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeCollectionRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeCollectionRESTService.java @@ -29,14 +29,13 @@ import io.arlas.server.rest.explore.ExploreRESTServices; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.ArraySchema; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.Collections; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeRESTService.java index 56fef6833..29236cf05 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/describe/DescribeRESTService.java @@ -34,9 +34,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.List; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/raw/RawRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/raw/RawRESTService.java index 06ceb2449..e34974a28 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/raw/RawRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/raw/RawRESTService.java @@ -35,9 +35,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.Collections; import java.util.Map; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/GeoSearchRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/GeoSearchRESTService.java index acafbc154..e1ce560e7 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/GeoSearchRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/GeoSearchRESTService.java @@ -42,11 +42,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.FileUtils; import org.geojson.FeatureCollection; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.io.File; import java.io.IOException; import java.util.List; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/SearchRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/SearchRESTService.java index e845ef579..33af8cbe1 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/SearchRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/search/SearchRESTService.java @@ -43,11 +43,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.util.List; import java.util.Optional; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/suggest/SuggestRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/suggest/SuggestRESTService.java index cdf015f5c..59ba0ada9 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/suggest/SuggestRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/suggest/SuggestRESTService.java @@ -29,9 +29,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.util.List; import static io.arlas.commons.rest.utils.ServerConstants.COLUMN_FILTER; diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/plugins/eo/TileRESTService.java b/arlas-rest/src/main/java/io/arlas/server/rest/plugins/eo/TileRESTService.java index 80e8c8312..68ef7fc73 100644 --- a/arlas-rest/src/main/java/io/arlas/server/rest/plugins/eo/TileRESTService.java +++ b/arlas-rest/src/main/java/io/arlas/server/rest/plugins/eo/TileRESTService.java @@ -43,12 +43,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.io.ParseException; import javax.imageio.ImageIO; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.LinkedList; diff --git a/arlas-server/pom.xml b/arlas-server/pom.xml index 13f7c118c..b5190e16e 100644 --- a/arlas-server/pom.xml +++ b/arlas-server/pom.xml @@ -15,18 +15,6 @@ - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - io.arlas arlas-rest @@ -37,12 +25,6 @@ io.arlas arlas-opensearch 24.1.2-SNAPSHOT - - - jakarta.xml.bind-api - jakarta.xml.bind - - diff --git a/arlas-server/src/main/java/io/arlas/server/app/ArlasServer.java b/arlas-server/src/main/java/io/arlas/server/app/ArlasServer.java index 3bb27b1d9..01ed1495c 100644 --- a/arlas-server/src/main/java/io/arlas/server/app/ArlasServer.java +++ b/arlas-server/src/main/java/io/arlas/server/app/ArlasServer.java @@ -79,14 +79,14 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.servers.Server; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.ws.rs.core.HttpHeaders; import org.eclipse.jetty.servlets.CrossOriginFilter; import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration; -import javax.ws.rs.core.HttpHeaders; import java.util.Collections; import java.util.EnumSet; import java.util.concurrent.ScheduledExecutorService; diff --git a/arlas-tests/src/test/java/io/arlas/server/tests/auth/AuthServiceIT.java b/arlas-tests/src/test/java/io/arlas/server/tests/auth/AuthServiceIT.java index 7e0b2ae5d..ce6bc882f 100644 --- a/arlas-tests/src/test/java/io/arlas/server/tests/auth/AuthServiceIT.java +++ b/arlas-tests/src/test/java/io/arlas/server/tests/auth/AuthServiceIT.java @@ -20,10 +20,9 @@ package io.arlas.server.tests.auth; import io.arlas.server.tests.AbstractTestContext; +import jakarta.ws.rs.core.HttpHeaders; import org.junit.Test; -import javax.ws.rs.core.HttpHeaders; - import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; diff --git a/arlas-tests/src/test/java/io/arlas/server/tests/rest/plugins/eo/TileServiceIT.java b/arlas-tests/src/test/java/io/arlas/server/tests/rest/plugins/eo/TileServiceIT.java index 451803b7e..dda4f1bef 100644 --- a/arlas-tests/src/test/java/io/arlas/server/tests/rest/plugins/eo/TileServiceIT.java +++ b/arlas-tests/src/test/java/io/arlas/server/tests/rest/plugins/eo/TileServiceIT.java @@ -19,11 +19,11 @@ package io.arlas.server.tests.rest.plugins.eo; -import com.fasterxml.jackson.databind.ObjectMapper; import io.arlas.commons.exceptions.ArlasException; import io.arlas.server.core.utils.ImageUtil; import io.arlas.server.tests.*; import io.restassured.response.ValidatableResponse; +import jakarta.ws.rs.core.Response; import org.geojson.LngLatAlt; import org.geojson.Polygon; import org.hamcrest.Matchers; @@ -33,7 +33,6 @@ import org.junit.Test; import javax.imageio.ImageIO; -import javax.ws.rs.core.Response; import java.awt.image.BufferedImage; import java.io.IOException; import java.util.ArrayList; diff --git a/conf/maven/pom.xml b/conf/maven/pom.xml index 345da34a6..0f05f6f4d 100644 --- a/conf/maven/pom.xml +++ b/conf/maven/pom.xml @@ -49,6 +49,7 @@ pertest + maven-dependency-plugin @@ -110,6 +111,7 @@ + org.apache.maven.plugins maven-compiler-plugin @@ -119,6 +121,7 @@ 17 + org.apache.maven.plugins maven-javadoc-plugin @@ -132,6 +135,7 @@ + org.apache.maven.plugins maven-source-plugin @@ -237,8 +241,8 @@ - 2.2.9 - 2.41 + 2.2.20 + 3.0.12 2.16.1 4.13.2 diff --git a/conf/swagger/java-config.json b/conf/swagger/java-config.json index c85163952..82a4980ee 100644 --- a/conf/swagger/java-config.json +++ b/conf/swagger/java-config.json @@ -9,10 +9,11 @@ "developerEmail" : "contact@gisaia.com", "developerOrganization" : "Gisaïa", "developerOrganizationUrl": "https://gisaia.com", - "dateLibrary" : "java8", "licenseName": " Apache License Version 2.0", "scmConnection": "scm:git:https://github.com/gisaia/ARLAS-server", "scmDeveloperConnection": "scm:git:https://github.com/gisaia/ARLAS-server", "scmUrl": "https://github.com/gisaia/ARLAS-server", - "library": "jersey2" + "dateLibrary" : "java11", + "library": "jersey3", + "jakarta": true } \ No newline at end of file diff --git a/ogc-common/pom.xml b/ogc-common/pom.xml index 51eb1cd1e..dedaeaeb1 100644 --- a/ogc-common/pom.xml +++ b/ogc-common/pom.xml @@ -33,7 +33,8 @@ org.codehaus.mojo jaxb2-maven-plugin - 2.5.0 + 3.1.0 + xjc @@ -42,6 +43,7 @@ + src/main/resources/global.xjb @@ -55,20 +57,26 @@ -Xannotate - + - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - 1.1.0 + org.jvnet.jaxb + jaxb-basics-annotate + 2.0.9 + + + javax.xml.bind + jaxb-api + 2.3.1 + org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.5.0 generate-sources @@ -83,6 +91,7 @@ + org.apache.maven.plugins maven-compiler-plugin diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/INSPIRE/INSPIREExceptionCode.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/INSPIRE/INSPIREExceptionCode.java index 45a87b574..7e142534d 100644 --- a/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/INSPIRE/INSPIREExceptionCode.java +++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/INSPIRE/INSPIREExceptionCode.java @@ -20,8 +20,7 @@ package io.arlas.server.ogc.common.exceptions.INSPIRE; import io.arlas.server.ogc.common.exceptions.OGC.OGCExceptionCode; - -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; public class INSPIREExceptionCode extends OGCExceptionCode { public static final INSPIREExceptionCode MISSING_INSPIRE_METADATA = new INSPIREExceptionCode("InspireMissingMetadata", HttpServletResponse.SC_BAD_REQUEST); diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCException.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCException.java index aa6413b62..66bb8458d 100644 --- a/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCException.java +++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCException.java @@ -21,12 +21,12 @@ import io.arlas.commons.exceptions.ArlasException; -import io.arlas.server.ogc.common.model.response.OGCError; import io.arlas.server.ogc.common.model.Service; +import io.arlas.server.ogc.common.model.response.OGCError; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.commons.collections4.CollectionUtils; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCExceptionCode.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCExceptionCode.java index 10a825aee..adc5b498d 100644 --- a/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCExceptionCode.java +++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/exceptions/OGC/OGCExceptionCode.java @@ -19,7 +19,7 @@ package io.arlas.server.ogc.common.exceptions.OGC; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; public class OGCExceptionCode { private final String value; diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/InsensitiveCaseFilter.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/InsensitiveCaseFilter.java index 0717d82e5..73be31a99 100644 --- a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/InsensitiveCaseFilter.java +++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/InsensitiveCaseFilter.java @@ -19,15 +19,15 @@ package io.arlas.server.wfs.requestfilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/ogc-common/src/main/resources/csw/atom/common.xsd b/ogc-common/src/main/resources/csw/atom/common.xsd index b8b37db55..077a3141d 100644 --- a/ogc-common/src/main/resources/csw/atom/common.xsd +++ b/ogc-common/src/main/resources/csw/atom/common.xsd @@ -17,7 +17,14 @@ the Licence. Date: 12-03-2014 --> - + - + GML Profile schema for gml:Point,gml:LineString,gml:Polygon,gml:Envelope, gml:CirclebyCenterpoint written by Joshua Lieberman. for use by the GeoRSS v. 1.1 application schema diff --git a/ogc-common/src/main/resources/csw/atom/network.xsd b/ogc-common/src/main/resources/csw/atom/network.xsd index 964ddbea3..d417b3c7d 100644 --- a/ogc-common/src/main/resources/csw/atom/network.xsd +++ b/ogc-common/src/main/resources/csw/atom/network.xsd @@ -16,7 +16,14 @@ the Licence. Date: 12-03-2014 --> - + diff --git a/ogc-common/src/main/resources/csw/atom/opensearch.xsd b/ogc-common/src/main/resources/csw/atom/opensearch.xsd index bd79714a9..0567fa920 100644 --- a/ogc-common/src/main/resources/csw/atom/opensearch.xsd +++ b/ogc-common/src/main/resources/csw/atom/opensearch.xsd @@ -26,7 +26,7 @@ Date: 12-03-2014 targetNamespace="http://a9.com/-/spec/opensearch/1.1/" elementFormDefault="qualified" - xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/ogc-common/src/main/resources/global.xjb b/ogc-common/src/main/resources/global.xjb index 73bd9a2a7..cb037e1f5 100644 --- a/ogc-common/src/main/resources/global.xjb +++ b/ogc-common/src/main/resources/global.xjb @@ -1,10 +1,10 @@ - + + @@ -41,10 +41,10 @@ - @javax.xml.bind.annotation.XmlSchemaType(name="double") + @jakarta.xml.bind.annotation.XmlSchemaType(name="double") - @javax.xml.bind.annotation.XmlSchemaType(name="double") + @jakarta.xml.bind.annotation.XmlSchemaType(name="double") diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/CSWRESTService.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/CSWRESTService.java index d1b812514..0ab0e9f75 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/CSWRESTService.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/CSWRESTService.java @@ -53,17 +53,17 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.xml.bind.JAXBElement; import net.opengis.cat.csw._3.AbstractRecordType; import net.opengis.cat.csw._3.CapabilitiesType; import net.opengis.cat.csw._3.GetRecordsResponseType; import org.apache.commons.collections4.CollectionUtils; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBElement; import javax.xml.datatype.DatatypeConfigurationException; import java.io.IOException; import java.util.ArrayList; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getcapabilities/GetCapabilitiesHandler.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getcapabilities/GetCapabilitiesHandler.java index 76241cf9c..570aca913 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getcapabilities/GetCapabilitiesHandler.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getcapabilities/GetCapabilitiesHandler.java @@ -21,28 +21,28 @@ import eu.europa.ec.inspire.schemas.common._1.*; import eu.europa.ec.inspire.schemas.inspire_dls._1.ExtendedCapabilitiesType; -import io.arlas.server.core.app.OGCConfiguration; import io.arlas.commons.exceptions.ArlasException; +import io.arlas.commons.utils.StringUtil; +import io.arlas.server.core.app.OGCConfiguration; +import io.arlas.server.core.model.CollectionReference; +import io.arlas.server.core.model.InspireConformity; +import io.arlas.server.core.ns.GML; import io.arlas.server.ogc.common.exceptions.INSPIRE.INSPIREException; import io.arlas.server.ogc.common.exceptions.INSPIRE.INSPIREExceptionCode; import io.arlas.server.ogc.common.inspire.common.constants.InspireConstants; import io.arlas.server.ogc.common.inspire.common.enums.AdditionalQueryables; import io.arlas.server.ogc.common.inspire.common.enums.SupportedISOQueryables; import io.arlas.server.ogc.common.inspire.common.utils.InspireCheckParam; -import io.arlas.server.core.model.CollectionReference; -import io.arlas.server.core.model.InspireConformity; -import io.arlas.server.core.ns.GML; import io.arlas.server.ogc.common.model.Service; import io.arlas.server.ogc.csw.CSWHandler; import io.arlas.server.ogc.csw.utils.CSWConstant; import io.arlas.server.ogc.csw.utils.CSWParamsParser; import io.arlas.server.ogc.csw.utils.CSWRequestType; -import io.arlas.commons.utils.StringUtil; +import jakarta.xml.bind.JAXBElement; import net.opengis.cat.csw._3.CapabilitiesType; import net.opengis.fes._2.*; import net.opengis.ows._2.*; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecordbyid/GetRecordByIdResponse.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecordbyid/GetRecordByIdResponse.java index fb764c7a8..5ee9cc451 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecordbyid/GetRecordByIdResponse.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecordbyid/GetRecordByIdResponse.java @@ -20,14 +20,15 @@ package io.arlas.server.ogc.csw.operation.getrecordbyid; -import net.opengis.cat.csw._3.AbstractRecordType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import net.opengis.cat.csw._3.BriefRecordType; import net.opengis.cat.csw._3.RecordType; import net.opengis.cat.csw._3.SummaryRecordType; import org.isotc211._2005.gmd.MDMetadataType; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecords/GetRecordsHandler.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecords/GetRecordsHandler.java index cd62a94c2..c91e17c37 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecords/GetRecordsHandler.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/getrecords/GetRecordsHandler.java @@ -19,17 +19,17 @@ package io.arlas.server.ogc.csw.operation.getrecords; -import io.arlas.server.ogc.common.exceptions.OGC.OGCException; import io.arlas.server.core.model.CollectionReference; +import io.arlas.server.ogc.common.exceptions.OGC.OGCException; import io.arlas.server.ogc.csw.CSWHandler; import io.arlas.server.ogc.csw.utils.CSWConstant; import io.arlas.server.ogc.csw.utils.ElementSetName; import io.arlas.server.ogc.csw.utils.MDMetadataBuilder; import io.arlas.server.ogc.csw.utils.RecordBuilder; +import jakarta.xml.bind.JAXBElement; import net.opengis.cat.csw._3.*; import org.isotc211._2005.gmd.MDMetadataType; -import javax.xml.bind.JAXBElement; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/opensearch/OpenSearchHandler.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/opensearch/OpenSearchHandler.java index 558f627d6..627e64a77 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/opensearch/OpenSearchHandler.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/operation/opensearch/OpenSearchHandler.java @@ -24,8 +24,8 @@ import com.a9.opensearch.OpenSearchDescription; import com.a9.opensearch.Url; import io.arlas.server.ogc.csw.CSWHandler; +import jakarta.ws.rs.core.MediaType; -import javax.ws.rs.core.MediaType; import javax.xml.namespace.QName; public class OpenSearchHandler { diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/AtomBuilder.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/AtomBuilder.java index d2657f726..49c29722c 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/AtomBuilder.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/AtomBuilder.java @@ -20,16 +20,14 @@ package io.arlas.server.ogc.csw.utils; +import jakarta.ws.rs.WebApplicationException; import net.opengis.cat.csw._3.AbstractRecordType; import net.opengis.cat.csw._3.BriefRecordType; import net.opengis.cat.csw._3.RecordType; import net.opengis.cat.csw._3.SummaryRecordType; import org.purl.dc.elements._1.SimpleLiteral; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.w3._2005.atom.*; -import javax.ws.rs.WebApplicationException; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/RecordBuilder.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/RecordBuilder.java index f8de0ed94..c9f351d74 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/RecordBuilder.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/utils/RecordBuilder.java @@ -19,11 +19,12 @@ package io.arlas.server.ogc.csw.utils; +import io.arlas.commons.utils.StringUtil; import io.arlas.server.core.model.CollectionReference; import io.arlas.server.core.model.DublinCoreElementName; import io.arlas.server.core.model.Inspire; import io.arlas.server.ogc.common.utils.OGCConstant; -import io.arlas.commons.utils.StringUtil; +import jakarta.xml.bind.JAXBElement; import net.opengis.cat.csw._3.AbstractRecordType; import net.opengis.cat.csw._3.BriefRecordType; import net.opengis.cat.csw._3.RecordType; @@ -31,7 +32,6 @@ import net.opengis.ows._2.WGS84BoundingBoxType; import org.purl.dc.elements._1.SimpleLiteral; -import javax.xml.bind.JAXBElement; import java.util.Arrays; public class RecordBuilder { diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/AtomGetRecordsMessageBodyWriter.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/AtomGetRecordsMessageBodyWriter.java index 13fa266cb..d09843940 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/AtomGetRecordsMessageBodyWriter.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/AtomGetRecordsMessageBodyWriter.java @@ -24,21 +24,21 @@ import io.arlas.server.core.ns.ATOM; import io.arlas.server.ogc.csw.CSWRESTService; import io.arlas.server.ogc.csw.utils.AtomBuilder; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import net.opengis.cat.csw._3.GetRecordsResponseType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3._2005.atom.*; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/XmlGetRecordsMessageBodyWriter.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/XmlGetRecordsMessageBodyWriter.java index 01c50d140..c9e938786 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/XmlGetRecordsMessageBodyWriter.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/getrecords/XmlGetRecordsMessageBodyWriter.java @@ -20,18 +20,18 @@ package io.arlas.server.ogc.csw.writer.getrecords; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; +import jakarta.xml.bind.JAXB; import net.opengis.cat.csw._3.GetRecordsResponseType; import net.opengis.cat.csw._3.ObjectFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXB; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/AtomRecordMessageBodyWriter.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/AtomRecordMessageBodyWriter.java index 56ff3d5cb..c60a1fd7b 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/AtomRecordMessageBodyWriter.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/AtomRecordMessageBodyWriter.java @@ -20,16 +20,16 @@ package io.arlas.server.ogc.csw.writer.record; import io.arlas.server.ogc.csw.utils.AtomBuilder; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.xml.bind.JAXB; import net.opengis.cat.csw._3.AbstractRecordType; import org.w3._2005.atom.EntryType; import org.w3._2005.atom.FeedType; import org.w3._2005.atom.ObjectFactory; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.xml.bind.JAXB; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlMDMetadataMessageBodyWriter.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlMDMetadataMessageBodyWriter.java index 5b068f220..96213a375 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlMDMetadataMessageBodyWriter.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlMDMetadataMessageBodyWriter.java @@ -20,15 +20,15 @@ package io.arlas.server.ogc.csw.writer.record; import io.arlas.server.ogc.csw.operation.getrecordbyid.GetRecordByIdResponse; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; +import jakarta.xml.bind.JAXB; +import jakarta.xml.bind.JAXBElement; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXB; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.io.OutputStream; import java.lang.annotation.Annotation; diff --git a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlRecordMessageBodyBuilder.java b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlRecordMessageBodyBuilder.java index 1578eebc5..6a96f069e 100644 --- a/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlRecordMessageBodyBuilder.java +++ b/ogc-csw/src/main/java/io/arlas/server/ogc/csw/writer/record/XmlRecordMessageBodyBuilder.java @@ -19,14 +19,15 @@ package io.arlas.server.ogc.csw.writer.record; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; +import jakarta.xml.bind.JAXB; import net.opengis.cat.csw._3.*; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXB; + import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; diff --git a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/WFSRESTService.java b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/WFSRESTService.java index 2afa63984..e3e920c4e 100644 --- a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/WFSRESTService.java +++ b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/WFSRESTService.java @@ -48,15 +48,15 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.xml.bind.JAXBElement; import net.opengis.wfs._2.DescribeStoredQueriesResponseType; import net.opengis.wfs._2.ListStoredQueriesResponseType; import net.opengis.wfs._2.ValueCollectionType; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.io.IOException; import java.util.List; diff --git a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/describefeaturetype/DescribeFeatureTypeHandler.java b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/describefeaturetype/DescribeFeatureTypeHandler.java index 041d88e68..285011d17 100644 --- a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/describefeaturetype/DescribeFeatureTypeHandler.java +++ b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/describefeaturetype/DescribeFeatureTypeHandler.java @@ -22,12 +22,12 @@ import io.arlas.server.core.exceptions.CollectionUnavailableException; import io.arlas.server.core.model.CollectionReference; import io.arlas.server.core.model.response.CollectionReferenceDescription; +import io.arlas.server.core.utils.ColumnFilterUtil; +import io.arlas.server.ogc.common.utils.XmlUtils; import io.arlas.server.ogc.wfs.WFSHandler; import io.arlas.server.ogc.wfs.utils.WFSConstant; -import io.arlas.server.ogc.common.utils.XmlUtils; -import io.arlas.server.core.utils.ColumnFilterUtil; +import jakarta.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.StreamingOutput; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getcapabilities/GetCapabilitiesHandler.java b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getcapabilities/GetCapabilitiesHandler.java index 107fcbb59..d2d4a205a 100644 --- a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getcapabilities/GetCapabilitiesHandler.java +++ b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getcapabilities/GetCapabilitiesHandler.java @@ -22,32 +22,31 @@ import eu.europa.ec.inspire.schemas.common._1.*; import eu.europa.ec.inspire.schemas.inspire_dls._1.ExtendedCapabilitiesType; +import io.arlas.commons.exceptions.ArlasException; import io.arlas.commons.utils.StringUtil; import io.arlas.server.core.app.InspireConfiguration; import io.arlas.server.core.app.OGCConfiguration; import io.arlas.server.core.app.WFSConfiguration; -import io.arlas.commons.exceptions.ArlasException; -import io.arlas.server.ogc.common.exceptions.OGC.OGCException; -import io.arlas.server.ogc.common.inspire.common.utils.InspireCheckParam; import io.arlas.server.core.model.CollectionReference; import io.arlas.server.core.model.DublinCoreElementName; import io.arlas.server.core.model.InspireConformity; import io.arlas.server.core.model.Keyword; -import io.arlas.server.ogc.common.inspire.common.constants.InspireConstants; -import io.arlas.server.core.model.enumerations.InspireSupportedLanguages; import io.arlas.server.core.model.enumerations.AccessConstraintEnum; +import io.arlas.server.core.model.enumerations.InspireSupportedLanguages; +import io.arlas.server.ogc.common.exceptions.OGC.OGCException; +import io.arlas.server.ogc.common.inspire.common.constants.InspireConstants; +import io.arlas.server.ogc.common.inspire.common.utils.InspireCheckParam; import io.arlas.server.ogc.common.model.Service; import io.arlas.server.ogc.wfs.WFSHandler; import io.arlas.server.ogc.wfs.utils.ExtendedWFSCapabilitiesType; import io.arlas.server.ogc.wfs.utils.WFSConstant; import io.arlas.server.ogc.wfs.utils.WFSRequestType; - +import jakarta.xml.bind.JAXBElement; import net.opengis.fes._2.*; import net.opengis.ows._1.*; import net.opengis.wfs._2.*; import org.w3._1999.xlink.TypeType; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Arrays; diff --git a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getfeature/GetFeatureHandler.java b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getfeature/GetFeatureHandler.java index af6c7d4b2..26f7d4a65 100644 --- a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getfeature/GetFeatureHandler.java +++ b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/getfeature/GetFeatureHandler.java @@ -19,20 +19,20 @@ package io.arlas.server.ogc.wfs.operation.getfeature; -import io.arlas.server.core.app.OGCConfiguration; import io.arlas.commons.exceptions.ArlasException; +import io.arlas.server.core.app.OGCConfiguration; import io.arlas.server.core.impl.elastic.utils.GeoTypeMapper; import io.arlas.server.core.managers.CollectionReferenceManager; import io.arlas.server.core.model.response.CollectionReferenceDescription; +import io.arlas.server.core.utils.MapExplorer; import io.arlas.server.ogc.common.utils.GeoFormat; import io.arlas.server.ogc.common.utils.XmlUtils; import io.arlas.server.ogc.wfs.WFSHandler; import io.arlas.server.ogc.wfs.utils.WFSConstant; -import io.arlas.server.core.utils.MapExplorer; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.StreamingOutput; import org.geojson.GeoJsonObject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.StreamingOutput; import javax.xml.namespace.QName; import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLOutputFactory; diff --git a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/storedquery/ListStoredQueriesHandler.java b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/storedquery/ListStoredQueriesHandler.java index 32f49b78d..df260be04 100644 --- a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/storedquery/ListStoredQueriesHandler.java +++ b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/operation/storedquery/ListStoredQueriesHandler.java @@ -20,10 +20,10 @@ package io.arlas.server.ogc.wfs.operation.storedquery; import io.arlas.server.ogc.wfs.WFSHandler; +import jakarta.xml.bind.JAXBElement; import net.opengis.wfs._2.ListStoredQueriesResponseType; import net.opengis.wfs._2.StoredQueryListItemType; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.util.List; diff --git a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/utils/ExtendedWFSCapabilitiesType.java b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/utils/ExtendedWFSCapabilitiesType.java index 1e1a2614b..0e9af0e62 100644 --- a/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/utils/ExtendedWFSCapabilitiesType.java +++ b/ogc-wfs/src/main/java/io/arlas/server/ogc/wfs/utils/ExtendedWFSCapabilitiesType.java @@ -19,10 +19,13 @@ package io.arlas.server.ogc.wfs.utils; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementDecl; import net.opengis.wfs._2.WFSCapabilitiesType; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.*; import javax.xml.namespace.QName; // This class is added in order to add the xsi:schemaLocation namespace in WFS GetCapabilities Response diff --git a/openapi/openapi.json b/openapi/openapi.json index 7b216ee8e..49ccd2f78 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -20,8 +20,7 @@ }, "servers" : [ { "url" : "/arlas", - "description" : "default server", - "variables" : { } + "description" : "default server" } ], "tags" : [ { "name" : "collections", @@ -3694,6 +3693,14 @@ } }, "CollectionReferenceUpdate" : { + "type" : "object", + "properties" : { + "organisations" : { + "$ref" : "#/components/schemas/CollectionReferenceUpdateOrg" + } + } + }, + "CollectionReferenceUpdateOrg" : { "type" : "object", "properties" : { "public" : { diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index 2e0ed9eae..b78002f70 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -16,7 +16,6 @@ externalDocs: servers: - url: /arlas description: default server - variables: {} tags: - name: collections description: Collections API @@ -3663,6 +3662,11 @@ components: name: type: string CollectionReferenceUpdate: + type: object + properties: + organisations: + $ref: '#/components/schemas/CollectionReferenceUpdateOrg' + CollectionReferenceUpdateOrg: type: object properties: public: diff --git a/pom.xml b/pom.xml index 4952c761f..476aecf95 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ - 2.19.0 + 2.23.0 UTF-8 true 2.22.2 @@ -53,14 +53,13 @@ 5.3.2 - 3.0.6 + 4.0.6 2.16.1 - 1.3.14 - 3.0.0-1 - 2.3.8 - 2.41 - 2.1.2 + 4.0.5-1 + 4.0.4 + + 3.0.12 5.3.6 @@ -79,7 +78,7 @@ 3.19.2 1.44.0 - 23.0.1 + 24.0.0 1.29 1.7.3 diff --git a/release.sh b/release.sh index 98a5a6493..0c91338d9 100755 --- a/release.sh +++ b/release.sh @@ -204,7 +204,7 @@ else --mount dst=/input/api.json,src="$PWD/target/tmp/openapi.json",type=bind,ro \ --mount dst=/input/config.json,src="$PWD/conf/swagger/java-config.json",type=bind,ro \ --mount dst=/output,src="$PWD/target/tmp/java-api",type=bind \ - gisaia/swagger-codegen-3.0.42 \ + gisaia/swagger-codegen-3.0.53 \ -l java --type-mappings GeoJsonObject=Object mkdir -p target/tmp/typescript-fetch @@ -213,7 +213,7 @@ else -e USER_ID="$(id -u)" \ --mount dst=/input/api.json,src="$PWD/target/tmp/openapi.json",type=bind,ro \ --mount dst=/output,src="$PWD/target/tmp/typescript-fetch",type=bind \ - gisaia/swagger-codegen-3.0.42 \ + gisaia/swagger-codegen-3.0.53 \ -l typescript-fetch --additional-properties modelPropertyNaming=snake_case echo "=> Build Typescript API "${FULL_API_VERSION} diff --git a/stac-api/src/main/java/io/arlas/server/stac/api/StacCollectionsRESTService.java b/stac-api/src/main/java/io/arlas/server/stac/api/StacCollectionsRESTService.java index c38d37413..c206fff6e 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/api/StacCollectionsRESTService.java +++ b/stac-api/src/main/java/io/arlas/server/stac/api/StacCollectionsRESTService.java @@ -40,12 +40,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/stac-api/src/main/java/io/arlas/server/stac/api/StacConformanceRESTService.java b/stac-api/src/main/java/io/arlas/server/stac/api/StacConformanceRESTService.java index d1b6864fa..5b1f7c1c7 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/api/StacConformanceRESTService.java +++ b/stac-api/src/main/java/io/arlas/server/stac/api/StacConformanceRESTService.java @@ -20,8 +20,8 @@ package io.arlas.server.stac.api; import com.codahale.metrics.annotation.Timed; -import io.arlas.server.core.app.STACConfiguration; import io.arlas.commons.rest.response.Error; +import io.arlas.server.core.app.STACConfiguration; import io.arlas.server.core.services.CollectionReferenceService; import io.arlas.server.core.services.ExploreService; import io.arlas.server.stac.model.ConformanceClasses; @@ -31,12 +31,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; - -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; +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; public class StacConformanceRESTService extends StacRESTService { diff --git a/stac-api/src/main/java/io/arlas/server/stac/api/StacCoreRESTService.java b/stac-api/src/main/java/io/arlas/server/stac/api/StacCoreRESTService.java index 3abdb0f71..94fe8aa8f 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/api/StacCoreRESTService.java +++ b/stac-api/src/main/java/io/arlas/server/stac/api/StacCoreRESTService.java @@ -34,15 +34,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/stac-api/src/main/java/io/arlas/server/stac/api/StacRESTService.java b/stac-api/src/main/java/io/arlas/server/stac/api/StacRESTService.java index d79a4d5c7..794eaeb08 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/api/StacRESTService.java +++ b/stac-api/src/main/java/io/arlas/server/stac/api/StacRESTService.java @@ -43,6 +43,11 @@ import io.dropwizard.jersey.params.IntParam; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.geojson.Feature; import org.geojson.FeatureCollection; import org.geojson.GeoJsonObject; @@ -51,11 +56,6 @@ import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.geojson.GeoJsonReader; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; import java.time.Instant; import java.time.OffsetDateTime; import java.time.ZoneOffset; @@ -66,7 +66,7 @@ import java.util.stream.Stream; import static io.arlas.server.core.utils.TimestampTypeMapper.formatDate; -import static javax.ws.rs.core.UriBuilder.fromUri; +import static jakarta.ws.rs.core.UriBuilder.fromUri; @Path("/stac") @Tag(name="stac", description="STAC API") diff --git a/stac-api/src/main/java/io/arlas/server/stac/api/StacSearchRESTService.java b/stac-api/src/main/java/io/arlas/server/stac/api/StacSearchRESTService.java index 47e8fa3fb..7b1471c84 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/api/StacSearchRESTService.java +++ b/stac-api/src/main/java/io/arlas/server/stac/api/StacSearchRESTService.java @@ -43,13 +43,13 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.validation.Valid; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; -import javax.validation.Valid; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/Catalog.java b/stac-api/src/main/java/io/arlas/server/stac/model/Catalog.java index 6f9f7d894..05f338c3a 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/Catalog.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/Catalog.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/Collection.java b/stac-api/src/main/java/io/arlas/server/stac/model/Collection.java index a04b53cea..8e44e4894 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/Collection.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/Collection.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.*; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/CollectionList.java b/stac-api/src/main/java/io/arlas/server/stac/model/CollectionList.java index 438fae0f7..4e9edf810 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/CollectionList.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/CollectionList.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/ConformanceClasses.java b/stac-api/src/main/java/io/arlas/server/stac/model/ConformanceClasses.java index 4a7e5f4a8..676eda7e2 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/ConformanceClasses.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/ConformanceClasses.java @@ -21,14 +21,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; - public class ConformanceClasses { private @Valid List conformsTo = new ArrayList<>(); diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/Extent.java b/stac-api/src/main/java/io/arlas/server/stac/model/Extent.java index cba5218c8..f188ff61d 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/Extent.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/Extent.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.Objects; public class Extent { diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/ExtentSpatial.java b/stac-api/src/main/java/io/arlas/server/stac/model/ExtentSpatial.java index 058247d54..dd914a69d 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/ExtentSpatial.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/ExtentSpatial.java @@ -23,10 +23,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/ExtentTemporal.java b/stac-api/src/main/java/io/arlas/server/stac/model/ExtentTemporal.java index 2661cf1f2..079df39d8 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/ExtentTemporal.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/ExtentTemporal.java @@ -23,10 +23,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/Item.java b/stac-api/src/main/java/io/arlas/server/stac/model/Item.java index 3331a8561..23db263f3 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/Item.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/Item.java @@ -24,8 +24,8 @@ import org.geojson.Feature; import org.geojson.GeoJsonObject; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/LandingPage.java b/stac-api/src/main/java/io/arlas/server/stac/model/LandingPage.java index 70045bf67..af9bee480 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/LandingPage.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/LandingPage.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/Provider.java b/stac-api/src/main/java/io/arlas/server/stac/model/Provider.java index f8985f340..2fd80ef47 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/Provider.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/Provider.java @@ -23,9 +23,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/SearchBody.java b/stac-api/src/main/java/io/arlas/server/stac/model/SearchBody.java index 0a89a4181..7010351b7 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/SearchBody.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/SearchBody.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import org.geojson.GeoJsonObject; -import javax.validation.Valid; import java.util.List; import java.util.Objects; diff --git a/stac-api/src/main/java/io/arlas/server/stac/model/StacFeatureCollection.java b/stac-api/src/main/java/io/arlas/server/stac/model/StacFeatureCollection.java index 32cd7beee..0fe0e8859 100644 --- a/stac-api/src/main/java/io/arlas/server/stac/model/StacFeatureCollection.java +++ b/stac-api/src/main/java/io/arlas/server/stac/model/StacFeatureCollection.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Map;