diff --git a/autodoc/src/main/java/com/bakdata/conquery/Constants.java b/autodoc/src/main/java/com/bakdata/conquery/Constants.java index 005ad4a0b4..273b12682c 100644 --- a/autodoc/src/main/java/com/bakdata/conquery/Constants.java +++ b/autodoc/src/main/java/com/bakdata/conquery/Constants.java @@ -7,15 +7,6 @@ import java.util.Locale; import java.util.Set; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.FilterTemplate; import com.bakdata.conquery.apiv1.IdLabel; import com.bakdata.conquery.apiv1.KeyValue; @@ -86,6 +77,14 @@ import io.dropwizard.jersey.PATCH; import io.dropwizard.util.DataSize; import io.dropwizard.util.Duration; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; public class Constants { public static final Group[] GROUPS = { diff --git a/autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java b/autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java index daeaccefff..9e7db57843 100644 --- a/autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java +++ b/autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.introspection.Introspection; import com.bakdata.conquery.io.cps.CPSType; diff --git a/backend/src/main/java/com/bakdata/conquery/Conquery.java b/backend/src/main/java/com/bakdata/conquery/Conquery.java index d41e183163..f07d862b01 100644 --- a/backend/src/main/java/com/bakdata/conquery/Conquery.java +++ b/backend/src/main/java/com/bakdata/conquery/Conquery.java @@ -1,7 +1,5 @@ package com.bakdata.conquery; -import javax.validation.Validator; - import ch.qos.logback.classic.Level; import com.bakdata.conquery.commands.DistributedStandaloneCommand; import com.bakdata.conquery.commands.ManagerNode; @@ -17,12 +15,13 @@ import com.bakdata.conquery.mode.local.LocalManagerProvider; import com.bakdata.conquery.models.config.ConqueryConfig; import com.fasterxml.jackson.databind.ObjectMapper; -import io.dropwizard.Application; -import io.dropwizard.ConfiguredBundle; import io.dropwizard.configuration.JsonConfigurationFactory; import io.dropwizard.configuration.SubstitutingSourceProvider; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.Application; +import io.dropwizard.core.ConfiguredBundle; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java b/backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java index 03cda498ba..0d7b3b25a8 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java @@ -2,8 +2,8 @@ import java.net.URI; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.io.cps.CPSType; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java b/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java index 39fe58b4ba..2e09064e52 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java @@ -1,7 +1,7 @@ package com.bakdata.conquery.apiv1; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.models.identifiable.ids.Id; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java b/backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java index 18dc7b923d..0152b42244 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.AuthorizationHelper; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java index 8ab5c1629a..163c5c9bc5 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java @@ -22,12 +22,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.execution.OverviewExecutionStatus; @@ -89,6 +83,11 @@ import com.bakdata.conquery.util.io.IdColumnUtil; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/RequestAwareUriBuilder.java b/backend/src/main/java/com/bakdata/conquery/apiv1/RequestAwareUriBuilder.java index f206d3b2a8..825d289614 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/RequestAwareUriBuilder.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/RequestAwareUriBuilder.java @@ -2,9 +2,8 @@ import static com.bakdata.conquery.resources.ResourceConstants.API; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.UriBuilder; - +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.UriBuilder; import lombok.experimental.UtilityClass; @UtilityClass diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/RequestHelper.java b/backend/src/main/java/com/bakdata/conquery/apiv1/RequestHelper.java index da93e28bd6..f004570c4a 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/RequestHelper.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/RequestHelper.java @@ -2,10 +2,9 @@ import java.net.URI; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedMap; - +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedMap; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordCredential.java b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordCredential.java index 1d44661943..42ec03cf02 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordCredential.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordCredential.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.apiv1.auth; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.auth.basic.LocalAuthenticationRealm; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordHashCredential.java b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordHashCredential.java index 04d4bc009f..38a44d5a00 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordHashCredential.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordHashCredential.java @@ -1,8 +1,7 @@ package com.bakdata.conquery.apiv1.auth; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; +import jakarta.validation.constraints.NotEmpty; @CPSType(base = CredentialType.class, id = "PASSWORD_HASH") public record PasswordHashCredential(@NotEmpty String hash) implements CredentialType { diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoRole.java b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoRole.java index cdd8a15a77..e0536c99b2 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoRole.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoRole.java @@ -4,14 +4,13 @@ import java.util.Objects; import java.util.Set; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.Role; import com.bakdata.conquery.models.auth.permissions.WildcardPermission; import com.bakdata.conquery.models.identifiable.ids.specific.RoleId; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import lombok.NonNull; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java index dd3fcba698..3202c12517 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java @@ -3,10 +3,6 @@ import java.util.Collections; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.UserManageable; import com.bakdata.conquery.models.auth.basic.LocalAuthenticationRealm; @@ -16,6 +12,9 @@ import com.bakdata.conquery.models.identifiable.ids.specific.RoleId; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import lombok.NonNull; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/UsernamePasswordToken.java b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/UsernamePasswordToken.java index ba43c430f8..cb8f3054d3 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/UsernamePasswordToken.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/UsernamePasswordToken.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.apiv1.auth; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.models.auth.basic.LocalAuthenticationRealm; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; /** diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/FormConfigAPI.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/FormConfigAPI.java index 16257945f4..dc105a6286 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/FormConfigAPI.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/FormConfigAPI.java @@ -3,8 +3,8 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.datasets.Dataset; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java index 2f58701d2e..b7528e56ef 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java @@ -4,9 +4,6 @@ import java.util.List; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.ArrayConceptQuery; import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.io.cps.CPSType; @@ -18,6 +15,8 @@ import com.bakdata.conquery.models.query.QueryResolveContext; import com.bakdata.conquery.models.query.Visitable; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java index a7223e4e69..c382856d0b 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java @@ -4,8 +4,6 @@ import java.util.function.Consumer; import javax.annotation.CheckForNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.query.ArrayConceptQuery; import com.bakdata.conquery.apiv1.query.Query; @@ -19,6 +17,8 @@ import com.bakdata.conquery.models.query.QueryResolveContext; import com.bakdata.conquery.models.query.Visitable; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java index 63f37f96b8..1cb41c675e 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java @@ -8,10 +8,10 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.ValidationException; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.ValidationException; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import c10n.C10N; import com.bakdata.conquery.ConqueryConstants; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/FullExportForm.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/FullExportForm.java index f457c1a04f..e426ad896e 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/FullExportForm.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/FullExportForm.java @@ -8,8 +8,8 @@ import java.util.function.Consumer; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import c10n.C10N; import com.bakdata.conquery.ConqueryConstants; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java index 07c5007341..fcf155796f 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java @@ -2,9 +2,6 @@ import java.util.function.Consumer; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.forms.IndexPlacement; import com.bakdata.conquery.apiv1.query.ArrayConceptQuery; import com.bakdata.conquery.apiv1.query.concept.specific.temporal.TemporalSamplerFactory; @@ -17,6 +14,8 @@ import com.bakdata.conquery.models.query.QueryResolveContext; import com.bakdata.conquery.models.query.Visitable; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendFilterConfiguration.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendFilterConfiguration.java index eca2fd1345..28b8b70d4a 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendFilterConfiguration.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendFilterConfiguration.java @@ -5,9 +5,9 @@ import java.util.Map; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.FilterTemplate; import com.bakdata.conquery.models.identifiable.ids.specific.FilterId; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendList.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendList.java index 824c0ef696..5ffa6d418e 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendList.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendList.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.EntityTag; import com.bakdata.conquery.models.identifiable.ids.specific.ConceptElementId; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendNode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendNode.java index 6eeace5595..c52f572e94 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendNode.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendNode.java @@ -3,8 +3,8 @@ import java.time.LocalDate; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.KeyValue; import com.bakdata.conquery.models.common.Range; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendRoot.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendRoot.java index a1a883f386..e32135ae45 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendRoot.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendRoot.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.bakdata.conquery.models.identifiable.ids.Id; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendTable.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendTable.java index d68285401f..3db175c7c2 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendTable.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendTable.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.identifiable.ids.specific.ConnectorId; import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/ArrayConceptQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/ArrayConceptQuery.java index a55793d4cc..cf9344539b 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/ArrayConceptQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/ArrayConceptQuery.java @@ -6,10 +6,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.View; @@ -22,6 +18,9 @@ import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java index ff9ad66218..61806adfb4 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java @@ -6,8 +6,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.io.cps.CPSBase; @@ -23,6 +21,7 @@ import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/ConceptQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/ConceptQuery.java index da4d655d29..3ddece071f 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/ConceptQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/ConceptQuery.java @@ -5,9 +5,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.View; @@ -22,6 +19,8 @@ import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.Preconditions; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java index 4c413a3678..ec3918246d 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java @@ -6,8 +6,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.io.cps.CPSType; @@ -32,6 +30,7 @@ import com.bakdata.conquery.models.types.ResultType; import com.bakdata.conquery.models.types.SemanticType; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java index bd5116638f..c756e9cccc 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java @@ -15,10 +15,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; @@ -55,6 +51,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java index b165cfbd59..f426a8c8e8 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java @@ -6,8 +6,6 @@ import java.util.Objects; import javax.annotation.CheckForNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; @@ -22,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java index 0601b943ca..ea17fa4e2f 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import javax.annotation.Nonnull; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; import com.bakdata.conquery.io.cps.CPSBase; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQAnd.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQAnd.java index 61435a364a..f598846635 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQAnd.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQAnd.java @@ -8,9 +8,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; - import c10n.C10N; import com.bakdata.conquery.apiv1.forms.export_form.ExportForm; import com.bakdata.conquery.apiv1.query.CQElement; @@ -34,6 +31,8 @@ import com.bakdata.conquery.util.QueryUtils; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.Preconditions; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQConcept.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQConcept.java index e2f988f019..b8aa02dcca 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQConcept.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQConcept.java @@ -7,10 +7,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.forms.export_form.ExportForm; import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; @@ -48,6 +44,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQDateRestriction.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQDateRestriction.java index a58e6cbbfd..6f78e0be8f 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQDateRestriction.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQDateRestriction.java @@ -6,9 +6,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.CDateSet; @@ -24,6 +21,8 @@ import com.bakdata.conquery.models.query.queryplan.QPNode; import com.bakdata.conquery.models.query.queryplan.specific.DateRestrictingNode; import com.bakdata.conquery.models.query.resultinfo.ResultInfo; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQNegation.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQNegation.java index 1957f5c29f..57fbef50f4 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQNegation.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQNegation.java @@ -4,9 +4,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.View; @@ -21,6 +18,8 @@ import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.Preconditions; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQOr.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQOr.java index 2cc35565bf..e93562016d 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQOr.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQOr.java @@ -8,9 +8,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; - import c10n.C10N; import com.bakdata.conquery.apiv1.forms.export_form.ExportForm; import com.bakdata.conquery.apiv1.query.CQElement; @@ -34,6 +31,8 @@ import com.bakdata.conquery.util.QueryUtils; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.Preconditions; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQReusedQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQReusedQuery.java index e6f9116f21..199e8d5088 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQReusedQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQReusedQuery.java @@ -5,7 +5,6 @@ import java.util.function.Consumer; import javax.annotation.Nullable; -import javax.validation.Valid; import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.apiv1.query.EditorQuery; @@ -26,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.Valid; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/ResultInfoDecorator.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/ResultInfoDecorator.java index dc0fa1c0f8..3f7b5454cd 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/ResultInfoDecorator.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/ResultInfoDecorator.java @@ -4,8 +4,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId; @@ -19,6 +17,7 @@ import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/external/CQExternal.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/external/CQExternal.java index 96cda4b7a1..23f6a774f1 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/external/CQExternal.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/external/CQExternal.java @@ -14,9 +14,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.View; @@ -42,6 +39,8 @@ import com.fasterxml.jackson.annotation.JsonView; import com.google.common.collect.Streams; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Data; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/temporal/CQSampled.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/temporal/CQSampled.java index 9045dee23a..febf2766db 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/temporal/CQSampled.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/temporal/CQSampled.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.apiv1.query.concept.specific.temporal; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.CQElement; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/ConqueryCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/ConqueryCommand.java index 7176b61a43..8e86590476 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/ConqueryCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/ConqueryCommand.java @@ -1,9 +1,9 @@ package com.bakdata.conquery.commands; import com.bakdata.conquery.models.config.ConqueryConfig; -import io.dropwizard.cli.ConfiguredCommand; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.cli.ConfiguredCommand; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import net.sourceforge.argparse4j.inf.Namespace; import org.eclipse.jetty.util.component.ContainerLifeCycle; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/DistributedStandaloneCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/DistributedStandaloneCommand.java index 2342a6eadf..60064ff0fa 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/DistributedStandaloneCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/DistributedStandaloneCommand.java @@ -17,15 +17,16 @@ import com.bakdata.conquery.models.config.XodusStoreFactory; import com.bakdata.conquery.util.io.ConqueryMDC; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.cli.ServerCommand; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.sourceforge.argparse4j.inf.Namespace; @Slf4j @Getter -public class DistributedStandaloneCommand extends io.dropwizard.cli.ServerCommand implements StandaloneCommand { +public class DistributedStandaloneCommand extends ServerCommand implements StandaloneCommand { private final Conquery conquery; private ClusterManager manager; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java b/backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java index b23eab19ed..3ef6657ca7 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java @@ -9,7 +9,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.io.cps.CPSTypeIdResolver; import com.bakdata.conquery.io.jackson.MutableInjectableValues; @@ -38,7 +38,7 @@ import com.google.common.base.Throwables; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.lifecycle.Managed; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.NonNull; import lombok.SneakyThrows; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/MigrateCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/MigrateCommand.java index 5a5484184d..abc5290565 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/MigrateCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/MigrateCommand.java @@ -103,7 +103,7 @@ public void configure(Subparser subparser) { } @Override - protected void run(io.dropwizard.setup.Environment environment, Namespace namespace, ConqueryConfig configuration) throws Exception { + protected void run(io.dropwizard.core.setup.Environment environment, Namespace namespace, ConqueryConfig configuration) throws Exception { final File inStoreDirectory = namespace.get("in"); final File outStoreDirectory = namespace.get("out"); diff --git a/backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java index d61543db3c..ea5f91cd78 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java @@ -16,9 +16,6 @@ import java.util.function.Predicate; import java.util.zip.GZIPInputStream; -import javax.validation.ValidationException; -import javax.validation.Validator; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -34,7 +31,9 @@ import com.bakdata.conquery.util.io.ProgressBar; import com.fasterxml.jackson.databind.ObjectMapper; import com.jakewharton.byteunits.BinaryByteUnit; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; +import jakarta.validation.ValidationException; +import jakarta.validation.Validator; import lombok.SneakyThrows; import lombok.experimental.FieldNameConstants; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/RecodeStoreCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/RecodeStoreCommand.java index a129201bfd..816aa8819b 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/RecodeStoreCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/RecodeStoreCommand.java @@ -4,12 +4,9 @@ import java.util.Arrays; import java.util.List; -import com.bakdata.conquery.models.config.ConqueryConfig; -import io.dropwizard.cli.Command; -import io.dropwizard.cli.ConfiguredCommand; -import io.dropwizard.setup.Bootstrap; +import io.dropwizard.core.cli.Command; +import io.dropwizard.core.setup.Bootstrap; import io.dropwizard.util.DataSize; -import io.dropwizard.util.Size; import jetbrains.exodus.env.Cursor; import jetbrains.exodus.env.EnvironmentConfig; import jetbrains.exodus.env.Environments; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/ShardNode.java b/backend/src/main/java/com/bakdata/conquery/commands/ShardNode.java index 0507eb8536..9940d5aee2 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/ShardNode.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/ShardNode.java @@ -8,8 +8,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.jackson.MutableInjectableValues; import com.bakdata.conquery.io.jackson.View; @@ -38,8 +36,9 @@ import com.fasterxml.jackson.databind.DeserializationConfig; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationConfig; +import io.dropwizard.core.setup.Environment; import io.dropwizard.lifecycle.Managed; -import io.dropwizard.setup.Environment; +import jakarta.validation.Validator; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/commands/StandaloneCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/StandaloneCommand.java index 5f4b601552..abf7ec7fe3 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/StandaloneCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/StandaloneCommand.java @@ -5,8 +5,8 @@ import com.bakdata.conquery.Conquery; import com.bakdata.conquery.mode.Manager; import com.bakdata.conquery.models.config.ConqueryConfig; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import net.sourceforge.argparse4j.inf.Namespace; public interface StandaloneCommand { diff --git a/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalFormBackendApi.java b/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalFormBackendApi.java index 23fee29160..39d3305067 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalFormBackendApi.java +++ b/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalFormBackendApi.java @@ -7,13 +7,13 @@ import java.util.UUID; import java.util.function.Function; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.forms.ExternalForm; import com.bakdata.conquery.models.auth.entities.User; diff --git a/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalTaskState.java b/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalTaskState.java index b4c56d189a..fc8deaba1b 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalTaskState.java +++ b/backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalTaskState.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.UUID; -import javax.validation.Valid; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.models.error.SimpleErrorInfo; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java index 3434ee5bc8..ca887fb101 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/ConquerySerializersModule.java @@ -16,10 +16,10 @@ import com.bakdata.conquery.io.jackson.serializer.LocaleDeserializer; import com.bakdata.conquery.io.jackson.serializer.LocaleSerializer; import com.bakdata.conquery.models.identifiable.ids.Id; +import com.fasterxml.jackson.core.json.PackageVersion; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.ValueInstantiator; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.joda.PackageVersion; import com.google.common.collect.BiMap; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.HashBiMap; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/IdRefPathParamConverterProvider.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/IdRefPathParamConverterProvider.java index 8f4b0af056..c1d942f3ee 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jackson/IdRefPathParamConverterProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/IdRefPathParamConverterProvider.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.inject.Inject; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.inject.Inject; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.identifiable.CentralRegistry; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/MetaIdRefParamConverter.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/MetaIdRefParamConverter.java index 6715ec61bd..eb6e7a7c95 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jackson/MetaIdRefParamConverter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/MetaIdRefParamConverter.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.io.jackson; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; import com.bakdata.conquery.models.identifiable.CentralRegistry; import com.bakdata.conquery.models.identifiable.Identifiable; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/NamespacedIdRefParamConverter.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/NamespacedIdRefParamConverter.java index 3f816bf52f..2d07631c49 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jackson/NamespacedIdRefParamConverter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/NamespacedIdRefParamConverter.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.io.jackson; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; import com.bakdata.conquery.models.identifiable.Identifiable; import com.bakdata.conquery.models.identifiable.ids.Id; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/PathParamInjector.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/PathParamInjector.java index ded8a2b635..fdc6c5f4d9 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jackson/PathParamInjector.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/PathParamInjector.java @@ -2,22 +2,19 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.MultivaluedMap; - import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.bakdata.conquery.models.worker.DatasetRegistry; -import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.resources.ResourceConstants; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectReader; -import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase; -import com.fasterxml.jackson.jaxrs.cfg.ObjectReaderInjector; -import com.fasterxml.jackson.jaxrs.cfg.ObjectReaderModifier; -import lombok.NonNull; +import com.fasterxml.jackson.jakarta.rs.cfg.EndpointConfigBase; +import com.fasterxml.jackson.jakarta.rs.cfg.ObjectReaderInjector; +import com.fasterxml.jackson.jakarta.rs.cfg.ObjectReaderModifier; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; import lombok.RequiredArgsConstructor; public class PathParamInjector implements ContainerRequestFilter { diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/MediaTypeDeserializer.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/MediaTypeDeserializer.java index 352882b4c4..46f5b338cc 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/MediaTypeDeserializer.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/MediaTypeDeserializer.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.io.IOException; public class MediaTypeDeserializer extends JsonDeserializer { diff --git a/backend/src/main/java/com/bakdata/conquery/io/jersey/IdParamConverter.java b/backend/src/main/java/com/bakdata/conquery/io/jersey/IdParamConverter.java index cfc638a231..d3f3e80611 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jersey/IdParamConverter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jersey/IdParamConverter.java @@ -3,8 +3,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jersey/LocaleFilter.java b/backend/src/main/java/com/bakdata/conquery/io/jersey/LocaleFilter.java index 1346945138..b78b96a88c 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jersey/LocaleFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jersey/LocaleFilter.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; import com.bakdata.conquery.models.i18n.I18n; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jersey/MessagePackProvider.java b/backend/src/main/java/com/bakdata/conquery/io/jersey/MessagePackProvider.java index abea3c15ad..548cdb0982 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jersey/MessagePackProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jersey/MessagePackProvider.java @@ -6,14 +6,14 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -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.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +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.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import com.bakdata.conquery.io.jackson.Jackson; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jersey/RESTServer.java b/backend/src/main/java/com/bakdata/conquery/io/jersey/RESTServer.java index 2531a57e46..9a042aeb5f 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jersey/RESTServer.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jersey/RESTServer.java @@ -12,10 +12,10 @@ import com.bakdata.conquery.models.auth.web.AuthorizationExceptionMapper; import com.bakdata.conquery.models.config.ConqueryConfig; import io.dropwizard.auth.AuthValueFactoryProvider; +import io.dropwizard.core.server.DefaultServerFactory; import io.dropwizard.jersey.errors.EarlyEofExceptionMapper; import io.dropwizard.jersey.errors.LoggingExceptionMapper; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.views.ViewRenderExceptionMapper; +import io.dropwizard.views.common.ViewRenderExceptionMapper; import lombok.experimental.UtilityClass; import org.glassfish.jersey.server.ResourceConfig; diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSPreflightRequestFilter.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSPreflightRequestFilter.java index 7d77455536..fccd44a409 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSPreflightRequestFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSPreflightRequestFilter.java @@ -2,13 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Response; - import com.google.common.net.HttpHeaders; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Response; import org.eclipse.jetty.http.HttpMethod; @PreMatching diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSResponseFilter.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSResponseFilter.java index b4215535fe..fdcb052738 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSResponseFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/CORSResponseFilter.java @@ -1,8 +1,8 @@ package com.bakdata.conquery.io.jetty; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; public class CORSResponseFilter implements ContainerResponseFilter { diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/CachingFilter.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/CachingFilter.java index ff8e1b0695..fa157ff9f1 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/CachingFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/CachingFilter.java @@ -1,11 +1,10 @@ package com.bakdata.conquery.io.jetty; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; - import com.google.common.net.HttpHeaders; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; public class CachingFilter implements ContainerResponseFilter { diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryErrorExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryErrorExceptionMapper.java index 22d52925f9..50625b48d1 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryErrorExceptionMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryErrorExceptionMapper.java @@ -1,10 +1,9 @@ package com.bakdata.conquery.io.jetty; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - import com.bakdata.conquery.models.error.ConqueryError; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; public class ConqueryErrorExceptionMapper implements ExceptionMapper { @Override diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryJsonExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryJsonExceptionMapper.java index 644e7d049e..920c507e0a 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryJsonExceptionMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/ConqueryJsonExceptionMapper.java @@ -1,16 +1,15 @@ package com.bakdata.conquery.io.jetty; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.exc.InvalidDefinitionException; - import io.dropwizard.jersey.errors.ErrorMessage; import io.dropwizard.jersey.errors.LoggingExceptionMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import lombok.extern.slf4j.Slf4j; @Provider diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/JsonValidationExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/JsonValidationExceptionMapper.java index 4662974ef1..c35925e5ed 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/JsonValidationExceptionMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/JsonValidationExceptionMapper.java @@ -1,12 +1,12 @@ package com.bakdata.conquery.io.jetty; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.glassfish.jersey.server.ContainerRequest; @@ -21,7 +21,7 @@ @RequiredArgsConstructor(onConstructor_ = @Inject) public class JsonValidationExceptionMapper implements ExceptionMapper { - private final javax.inject.Provider requestContext; + private final jakarta.inject.Provider requestContext; @Override public Response toResponse(ConstraintViolationException exception) { diff --git a/backend/src/main/java/com/bakdata/conquery/io/jetty/NoSuchElementExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/io/jetty/NoSuchElementExceptionMapper.java index f751f9f31f..367607c020 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/jetty/NoSuchElementExceptionMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/io/jetty/NoSuchElementExceptionMapper.java @@ -2,9 +2,9 @@ import java.util.NoSuchElementException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/io/mina/BinaryJacksonCoder.java b/backend/src/main/java/com/bakdata/conquery/io/mina/BinaryJacksonCoder.java index 130d05f1ee..2bfdb36dce 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/mina/BinaryJacksonCoder.java +++ b/backend/src/main/java/com/bakdata/conquery/io/mina/BinaryJacksonCoder.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.io.mina; -import javax.validation.Validator; - import com.bakdata.conquery.models.exceptions.ValidatorHelper; import com.bakdata.conquery.models.messages.network.NetworkMessage; import com.bakdata.conquery.models.worker.IdResolveContext; @@ -10,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; +import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/main/java/com/bakdata/conquery/io/mina/ChunkWriter.java b/backend/src/main/java/com/bakdata/conquery/io/mina/ChunkWriter.java index 26e994479d..c5d98253cc 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/mina/ChunkWriter.java +++ b/backend/src/main/java/com/bakdata/conquery/io/mina/ChunkWriter.java @@ -6,7 +6,7 @@ import com.bakdata.conquery.util.SoftPool; import com.google.common.primitives.Ints; -import io.dropwizard.util.Size; +import io.dropwizard.util.DataSize; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -26,7 +26,7 @@ public class ChunkWriter extends ProtocolEncoderAdapter { @Getter @Setter - private int bufferSize = Ints.checkedCast(Size.megabytes(2).toBytes()); + private int bufferSize = Ints.checkedCast(DataSize.megabytes(2).toBytes()); private final SoftPool bufferPool = new SoftPool<>(() -> IoBuffer.allocate(bufferSize)); @SuppressWarnings("rawtypes") private final CQCoder coder; diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/ExternalResult.java b/backend/src/main/java/com/bakdata/conquery/io/result/ExternalResult.java index e97a9b8e78..f52f1f6b28 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/ExternalResult.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/ExternalResult.java @@ -3,8 +3,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.models.execution.ManagedExecution; diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/ResultRender/ResultRendererProvider.java b/backend/src/main/java/com/bakdata/conquery/io/result/ResultRender/ResultRendererProvider.java index fe44f33278..eb26f82c9a 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/ResultRender/ResultRendererProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/ResultRender/ResultRendererProvider.java @@ -4,14 +4,13 @@ import java.net.URISyntaxException; import java.util.Collection; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.models.execution.ManagedExecution; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jersey.DropwizardResourceConfig; +import jakarta.ws.rs.core.UriBuilder; @CPSBase @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "type") diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java b/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java index c37ce87e00..e49a9554ba 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java @@ -6,11 +6,6 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.datasets.Dataset; @@ -18,6 +13,10 @@ import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.util.io.FileUtil; import com.google.common.base.Strings; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java index 944333e4b9..41fc2360a0 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java @@ -12,11 +12,6 @@ import java.util.OptionalLong; import java.util.function.Function; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; - import com.bakdata.conquery.io.result.ResultUtil; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.config.ArrowConfig; @@ -32,6 +27,10 @@ import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.util.io.ConqueryMDC; import com.bakdata.conquery.util.io.IdColumnUtil; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.arrow.vector.VectorSchemaRoot; diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java index 8a7f4fc024..928e07aa54 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/csv/ResultCsvProcessor.java @@ -9,12 +9,6 @@ import java.util.Locale; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; - import com.bakdata.conquery.io.result.ResultUtil; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -29,6 +23,11 @@ import com.bakdata.conquery.resources.ResourceConstants; import com.bakdata.conquery.util.io.ConqueryMDC; import com.bakdata.conquery.util.io.IdColumnUtil; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.jetty.io.EofException; diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java index 29f6baaa00..cf726f4a12 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java @@ -5,11 +5,6 @@ import java.util.Locale; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; - import com.bakdata.conquery.io.result.ResultUtil; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -25,6 +20,10 @@ import com.bakdata.conquery.resources.ResourceConstants; import com.bakdata.conquery.util.io.ConqueryMDC; import com.bakdata.conquery.util.io.IdColumnUtil; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/external/ExternalResultProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/external/ExternalResultProcessor.java index 7fac0a1085..50eceee008 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/external/ExternalResultProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/external/ExternalResultProcessor.java @@ -1,8 +1,8 @@ package com.bakdata.conquery.io.result.external; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.io.result.ExternalResult; import com.bakdata.conquery.io.result.ResultUtil; diff --git a/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java b/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java index 389746e35a..185aa1157a 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/io/result/parquet/ResultParquetProcessor.java @@ -5,11 +5,6 @@ import java.util.Locale; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; - import com.bakdata.conquery.io.result.ResultUtil; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -25,6 +20,10 @@ import com.bakdata.conquery.resources.api.ResultParquetResource; import com.bakdata.conquery.util.io.ConqueryMDC; import com.bakdata.conquery.util.io.IdColumnUtil; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/NamespaceStorage.java b/backend/src/main/java/com/bakdata/conquery/io/storage/NamespaceStorage.java index 96b9458d86..899d591b46 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/storage/NamespaceStorage.java +++ b/backend/src/main/java/com/bakdata/conquery/io/storage/NamespaceStorage.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.OptionalInt; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.io.storage.xodus.stores.CachedStore; import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore; diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/NamespacedStorage.java b/backend/src/main/java/com/bakdata/conquery/io/storage/NamespacedStorage.java index 9238658a28..3767ce4566 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/storage/NamespacedStorage.java +++ b/backend/src/main/java/com/bakdata/conquery/io/storage/NamespacedStorage.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore; import com.bakdata.conquery.models.config.StoreFactory; diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/WorkerStorage.java b/backend/src/main/java/com/bakdata/conquery/io/storage/WorkerStorage.java index 6b301d9415..10927513b2 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/storage/WorkerStorage.java +++ b/backend/src/main/java/com/bakdata/conquery/io/storage/WorkerStorage.java @@ -2,8 +2,6 @@ import java.util.Collection; -import javax.validation.Validator; - import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore; import com.bakdata.conquery.models.config.StoreFactory; import com.bakdata.conquery.models.datasets.concepts.Concept; @@ -15,6 +13,7 @@ import com.bakdata.conquery.models.worker.WorkerInformation; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import jakarta.validation.Validator; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java index 8914f03d6f..96e2ca06f2 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java +++ b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java @@ -19,9 +19,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.validation.Validator; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.mina.ChunkingOutputStream; import com.bakdata.conquery.io.storage.Store; import com.bakdata.conquery.io.storage.xodus.stores.SerializingStore.IterationStatistic; @@ -31,6 +28,8 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; import com.google.common.primitives.Ints; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotEmpty; import jetbrains.exodus.env.Environment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java index d0f9bafb12..86f23be3ee 100644 --- a/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java +++ b/backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java @@ -27,8 +27,6 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.jackson.JacksonUtil; import com.bakdata.conquery.io.storage.Store; @@ -44,6 +42,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import jakarta.validation.Validator; import jetbrains.exodus.ArrayByteIterable; import jetbrains.exodus.ByteIterable; import lombok.Data; diff --git a/backend/src/main/java/com/bakdata/conquery/metrics/ActiveUsersFilter.java b/backend/src/main/java/com/bakdata/conquery/metrics/ActiveUsersFilter.java index d6b85d91e3..9b84d6619d 100644 --- a/backend/src/main/java/com/bakdata/conquery/metrics/ActiveUsersFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/metrics/ActiveUsersFilter.java @@ -6,13 +6,6 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.AuthorizationHelper; import com.bakdata.conquery.models.auth.entities.Group; @@ -23,7 +16,12 @@ import com.codahale.metrics.SharedMetricRegistries; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -import lombok.RequiredArgsConstructor; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; import lombok.extern.slf4j.Slf4j; /** diff --git a/backend/src/main/java/com/bakdata/conquery/mode/DelegateManager.java b/backend/src/main/java/com/bakdata/conquery/mode/DelegateManager.java index b4bf4ef7cd..f4a402adce 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/DelegateManager.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/DelegateManager.java @@ -10,8 +10,8 @@ import com.bakdata.conquery.models.worker.DatasetRegistry; import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.models.worker.ShardNodeInformation; +import io.dropwizard.core.setup.Environment; import io.dropwizard.servlets.tasks.Task; -import io.dropwizard.setup.Environment; import lombok.Value; /** diff --git a/backend/src/main/java/com/bakdata/conquery/mode/InternalObjectMapperCreator.java b/backend/src/main/java/com/bakdata/conquery/mode/InternalObjectMapperCreator.java index 3706f728a0..64d255dad8 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/InternalObjectMapperCreator.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/InternalObjectMapperCreator.java @@ -1,7 +1,7 @@ package com.bakdata.conquery.mode; import javax.annotation.Nullable; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.jackson.MutableInjectableValues; diff --git a/backend/src/main/java/com/bakdata/conquery/mode/Manager.java b/backend/src/main/java/com/bakdata/conquery/mode/Manager.java index d2cc6fee79..bef1a3c444 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/Manager.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/Manager.java @@ -12,7 +12,7 @@ import com.bakdata.conquery.models.worker.ShardNodeInformation; import io.dropwizard.lifecycle.Managed; import io.dropwizard.servlets.tasks.Task; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; /** * A manager provides the implementations that differ by running mode. diff --git a/backend/src/main/java/com/bakdata/conquery/mode/ManagerProvider.java b/backend/src/main/java/com/bakdata/conquery/mode/ManagerProvider.java index 5d12c4885f..20d4ff0c6e 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/ManagerProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/ManagerProvider.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.mode; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -10,7 +10,7 @@ import com.bakdata.conquery.models.worker.DistributedNamespace; import com.bakdata.conquery.models.worker.LocalNamespace; import com.bakdata.conquery.models.worker.Namespace; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; /** * Provider for {@link Manager}. diff --git a/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterConnectionManager.java b/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterConnectionManager.java index b9101d6b62..9a2340c5db 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterConnectionManager.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterConnectionManager.java @@ -3,8 +3,6 @@ import java.io.IOException; import java.net.InetSocketAddress; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.View; import com.bakdata.conquery.io.mina.BinaryJacksonCoder; import com.bakdata.conquery.io.mina.CQProtocolCodecFilter; @@ -25,6 +23,7 @@ import com.bakdata.conquery.models.worker.DistributedNamespace; import com.bakdata.conquery.util.io.ConqueryMDC; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterManagerProvider.java b/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterManagerProvider.java index ec25ecab4d..81dca7d407 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterManagerProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/cluster/ClusterManagerProvider.java @@ -17,8 +17,8 @@ import com.bakdata.conquery.models.worker.DistributedNamespace; import com.bakdata.conquery.models.worker.ShardNodeInformation; import com.bakdata.conquery.tasks.ReportConsistencyTask; +import io.dropwizard.core.setup.Environment; import io.dropwizard.servlets.tasks.Task; -import io.dropwizard.setup.Environment; public class ClusterManagerProvider implements ManagerProvider { diff --git a/backend/src/main/java/com/bakdata/conquery/mode/local/LocalManagerProvider.java b/backend/src/main/java/com/bakdata/conquery/mode/local/LocalManagerProvider.java index 34d11615e0..91588c3bf5 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/local/LocalManagerProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/local/LocalManagerProvider.java @@ -21,7 +21,7 @@ import com.bakdata.conquery.sql.conversion.dialect.SqlDialect; import com.bakdata.conquery.sql.execution.ResultSetProcessorFactory; import com.bakdata.conquery.sql.execution.SqlExecutionService; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import org.jooq.DSLContext; public class LocalManagerProvider implements ManagerProvider { diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/AuthorizationController.java b/backend/src/main/java/com/bakdata/conquery/models/auth/AuthorizationController.java index 2f2615f462..dd53623107 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/AuthorizationController.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/AuthorizationController.java @@ -23,9 +23,9 @@ import com.bakdata.conquery.models.identifiable.ids.specific.UserId; import com.bakdata.conquery.resources.admin.AdminServlet; import com.bakdata.conquery.resources.unprotected.AuthServlet; +import io.dropwizard.core.setup.Environment; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.lifecycle.Managed; -import io.dropwizard.setup.Environment; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/ConqueryAuthenticationRealm.java b/backend/src/main/java/com/bakdata/conquery/models/auth/ConqueryAuthenticationRealm.java index c8afae54dd..595d61ecdd 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/ConqueryAuthenticationRealm.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/ConqueryAuthenticationRealm.java @@ -1,21 +1,14 @@ package com.bakdata.conquery.models.auth; -import javax.annotation.Nullable; -import javax.ws.rs.container.ContainerRequestContext; - import com.bakdata.conquery.Conquery; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.User; -import com.bakdata.conquery.models.auth.web.DefaultAuthFilter; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; -import lombok.RequiredArgsConstructor; import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.realm.AuthenticatingRealm; import org.apache.shiro.realm.Realm; -import org.apache.shiro.util.Destroyable; /** * Interface that needs to be implemented for authenticating realms in diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/basic/JWTokenHandler.java b/backend/src/main/java/com/bakdata/conquery/models/auth/basic/JWTokenHandler.java index 1e156b883d..20b64a1f9f 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/basic/JWTokenHandler.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/basic/JWTokenHandler.java @@ -5,8 +5,8 @@ import java.util.Random; import javax.annotation.Nullable; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/basic/LocalAuthenticationRealm.java b/backend/src/main/java/com/bakdata/conquery/models/auth/basic/LocalAuthenticationRealm.java index 26ad9445c8..b2afa47540 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/basic/LocalAuthenticationRealm.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/basic/LocalAuthenticationRealm.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.concurrent.Executors; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.Conquery; import com.bakdata.conquery.apiv1.auth.CredentialType; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/develop/DevAuthConfig.java b/backend/src/main/java/com/bakdata/conquery/models/auth/develop/DevAuthConfig.java index 75c1c7bfe6..974d36d449 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/develop/DevAuthConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/develop/DevAuthConfig.java @@ -6,7 +6,7 @@ import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.config.auth.AuthenticationRealmFactory; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; /** * Default configuration for the auth system. Sets up all other default components. diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/develop/UserIdTokenExtractor.java b/backend/src/main/java/com/bakdata/conquery/models/auth/develop/UserIdTokenExtractor.java index 476353d597..a21332e1ae 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/develop/UserIdTokenExtractor.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/develop/UserIdTokenExtractor.java @@ -3,14 +3,13 @@ import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.auth.web.DefaultAuthFilter; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationToken; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; - @Slf4j @RequiredArgsConstructor public class UserIdTokenExtractor implements DefaultAuthFilter.TokenExtractor { diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/entities/PermissionOwner.java b/backend/src/main/java/com/bakdata/conquery/models/auth/entities/PermissionOwner.java index be6f9ee1fa..279e693356 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/entities/PermissionOwner.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/entities/PermissionOwner.java @@ -5,9 +5,6 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.permissions.ConqueryPermission; import com.bakdata.conquery.models.identifiable.IdentifiableImpl; @@ -16,6 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.OptBoolean; import com.google.common.collect.ImmutableSet; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentials.java b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentials.java index 2f04dd7be9..ff545a6e40 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentials.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentials.java @@ -1,7 +1,6 @@ package com.bakdata.conquery.models.auth.oidc.keycloak; -import javax.ws.rs.core.Form; - +import jakarta.ws.rs.core.Form; import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap; /** diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentialsGrantRequestFilter.java b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentialsGrantRequestFilter.java index 5092dfe572..76a890c4ad 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentialsGrantRequestFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/ClientCredentialsGrantRequestFilter.java @@ -5,15 +5,14 @@ import java.time.Instant; import java.time.temporal.ChronoUnit; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import lombok.extern.slf4j.Slf4j; /** diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakApi.java b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakApi.java index 6ea9d5189c..f3870dca54 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakApi.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakApi.java @@ -3,9 +3,9 @@ import java.net.URI; import java.util.Set; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; import com.bakdata.conquery.models.config.auth.IntrospectionDelegatingRealmFactory; import com.bakdata.conquery.util.ResourceUtil; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakGroup.java b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakGroup.java index 467c732808..9f0a2ddd61 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakGroup.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/keycloak/KeycloakGroup.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/passwordflow/IdpDelegatingAccessTokenCreator.java b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/passwordflow/IdpDelegatingAccessTokenCreator.java index d7242755b6..4ef79ab5d8 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/passwordflow/IdpDelegatingAccessTokenCreator.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/oidc/passwordflow/IdpDelegatingAccessTokenCreator.java @@ -2,7 +2,7 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.models.auth.basic.AccessTokenCreator; import com.bakdata.conquery.models.config.auth.IntrospectionDelegatingRealmFactory; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthCookieFilter.java b/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthCookieFilter.java index 7ea128d265..387cf4401a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthCookieFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthCookieFilter.java @@ -1,25 +1,21 @@ package com.bakdata.conquery.models.auth.web; import java.io.IOException; -import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.UriBuilder; - -import io.dropwizard.util.Strings; +import com.google.common.base.Strings; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.util.StringUtil; import org.eclipse.jetty.http.HttpHeader; /** diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthenticationExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthenticationExceptionMapper.java index f20c201613..84e22e5a8d 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthenticationExceptionMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthenticationExceptionMapper.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.models.auth.web; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authc.AuthenticationException; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthorizationExceptionMapper.java b/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthorizationExceptionMapper.java index ed6961eb69..4162a49ca2 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthorizationExceptionMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/web/AuthorizationExceptionMapper.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.models.auth.web; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.AuthorizationException; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/web/DefaultAuthFilter.java b/backend/src/main/java/com/bakdata/conquery/models/auth/web/DefaultAuthFilter.java index 171823776c..0612fe2bc8 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/web/DefaultAuthFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/web/DefaultAuthFilter.java @@ -4,13 +4,6 @@ import java.util.HashSet; import java.util.Set; -import javax.annotation.Priority; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.SecurityContext; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.AuthorizationController; import com.bakdata.conquery.models.auth.ConqueryAuthenticationRealm; @@ -19,6 +12,12 @@ import com.google.common.base.Function; import io.dropwizard.auth.AuthFilter; import io.dropwizard.auth.DefaultUnauthorizedHandler; +import jakarta.annotation.Priority; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.SecurityContext; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/web/RedirectingAuthFilter.java b/backend/src/main/java/com/bakdata/conquery/models/auth/web/RedirectingAuthFilter.java index 1922623de8..5085d5f242 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/web/RedirectingAuthFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/web/RedirectingAuthFilter.java @@ -6,19 +6,18 @@ import java.util.List; import java.util.function.Function; -import javax.annotation.Priority; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.Priorities; -import javax.ws.rs.RedirectionException; -import javax.ws.rs.ServiceUnavailableException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.resources.admin.ui.model.UIView; import io.dropwizard.auth.AuthFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RedirectionException; +import jakarta.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Response; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ArrowConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ArrowConfig.java index 59b695aa3c..6e4ffed3b4 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ArrowConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ArrowConfig.java @@ -1,7 +1,6 @@ package com.bakdata.conquery.models.config; -import javax.validation.constraints.Min; - +import jakarta.validation.constraints.Min; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java index 777cc00cb4..8fc2f6749a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java @@ -6,10 +6,6 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; @@ -19,6 +15,9 @@ import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.resources.api.ResultArrowResource; import io.dropwizard.jersey.DropwizardResourceConfig; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.UriBuilder; import lombok.Data; import org.glassfish.jersey.internal.inject.AbstractBinder; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/CSVConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/CSVConfig.java index f47cc6bd0e..3337b67089 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/CSVConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/CSVConfig.java @@ -1,20 +1,22 @@ package com.bakdata.conquery.models.config; -import java.io.File; -import java.io.IOException; import java.io.OutputStream; import java.io.Writer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import javax.validation.constraints.NotNull; - import com.univocity.parsers.csv.CsvFormat; import com.univocity.parsers.csv.CsvParser; import com.univocity.parsers.csv.CsvParserSettings; import com.univocity.parsers.csv.CsvWriter; import com.univocity.parsers.csv.CsvWriterSettings; -import lombok.*; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.NonNull; +import lombok.Setter; +import lombok.With; import org.hibernate.validator.constraints.Length; /** diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ClusterConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ClusterConfig.java index 9fe3ad7a6b..b04edbf68f 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ClusterConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ClusterConfig.java @@ -2,12 +2,11 @@ import java.net.InetAddress; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.validation.PortRange; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java index b923c7bad4..80a98a320b 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ColumnConfig.java @@ -4,13 +4,12 @@ import java.util.Locale; import java.util.Map; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.jackson.View; import com.bakdata.conquery.models.identifiable.mapping.EntityIdMap; import com.bakdata.conquery.resources.admin.rest.AdminDatasetProcessor; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.Strings; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ConqueryConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ConqueryConfig.java index d04ad65584..9e148bd223 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ConqueryConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ConqueryConfig.java @@ -8,9 +8,6 @@ import java.util.Set; import java.util.stream.Stream; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.jackson.Injectable; import com.bakdata.conquery.io.jackson.MutableInjectableValues; @@ -31,9 +28,11 @@ import com.google.common.collect.MoreCollectors; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import io.dropwizard.Configuration; import io.dropwizard.client.JerseyClientConfiguration; +import io.dropwizard.core.Configuration; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/CsvResultProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/CsvResultProvider.java index aa6172544d..09bd6f1d6b 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/CsvResultProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/CsvResultProvider.java @@ -6,8 +6,6 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; @@ -17,6 +15,7 @@ import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.resources.api.ResultCsvResource; import io.dropwizard.jersey.DropwizardResourceConfig; +import jakarta.ws.rs.core.UriBuilder; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ExcelConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ExcelConfig.java index 01d4b4aa5a..0aa040d8c3 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ExcelConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ExcelConfig.java @@ -16,9 +16,9 @@ import org.apache.poi.xssf.usermodel.XSSFFont; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.Collections; import java.util.Map; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ExcelResultProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/ExcelResultProvider.java index 3d15f845e6..68fcbc2efa 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ExcelResultProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ExcelResultProvider.java @@ -7,10 +7,10 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriBuilder; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ExternalResultProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/ExternalResultProvider.java index 2e85348ffa..ffef2f45ec 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ExternalResultProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ExternalResultProvider.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.Collections; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/FormBackendConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/FormBackendConfig.java index 591c398e12..c50a71b74e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/FormBackendConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/FormBackendConfig.java @@ -6,11 +6,11 @@ import java.util.HashSet; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.ws.rs.client.Client; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.ws.rs.client.Client; import com.bakdata.conquery.apiv1.forms.ExternalForm; import com.bakdata.conquery.commands.ManagerNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java index 96065200d0..90f678dcd1 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java @@ -4,10 +4,10 @@ import java.net.URL; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.forms.frontendconfiguration.FormScanner; import com.fasterxml.jackson.annotation.JsonAlias; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java index 1457102826..25d6c050e5 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java @@ -10,8 +10,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.apiv1.query.concept.specific.external.DateFormat; import com.bakdata.conquery.models.identifiable.mapping.EntityIdMap; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/IndexConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IndexConfig.java index d39d3759c9..08b812c7e2 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/IndexConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/IndexConfig.java @@ -4,8 +4,8 @@ import java.net.URI; import javax.annotation.Nullable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.index.IndexKey; import com.bakdata.conquery.util.search.TrieSearch; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/LocaleConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/LocaleConfig.java index 9b92381ab8..15f222e30f 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/LocaleConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/LocaleConfig.java @@ -7,9 +7,9 @@ import java.util.Set; import java.util.StringJoiner; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.bakdata.conquery.models.common.CDateSet; import com.bakdata.conquery.models.common.daterange.CDateRange; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ManualConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ManualConfig.java index 41a5ed3a1e..e9e719ab4e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ManualConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ManualConfig.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.util.validation.ManualURI; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/MinaConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/MinaConfig.java index d6560a6fbb..127977a2c4 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/MinaConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/MinaConfig.java @@ -1,12 +1,12 @@ package com.bakdata.conquery.models.config; +import io.dropwizard.util.DataSize; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSessionConfig; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.primitives.Ints; -import io.dropwizard.util.Size; import lombok.Getter; import lombok.Setter; @@ -20,7 +20,7 @@ public class MinaConfig implements IoSessionConfig { private int readBufferSize = 8192; /** The maximum size of the buffer used to read incoming data */ - private int maxReadBufferSize = Ints.checkedCast(Size.megabytes(500).toBytes()); + private int maxReadBufferSize = Ints.checkedCast(DataSize.megabytes(500).toBytes()); /** The delay before we notify a session that it has been idle on read. Default to infinite */ private int readerIdleTime; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ParquetResultProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/ParquetResultProvider.java index aa3d66f20c..095f4cd8ce 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ParquetResultProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ParquetResultProvider.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ParserConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ParserConfig.java index dc9e310132..b347795782 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ParserConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ParserConfig.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.Setter; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.*; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/PreprocessingConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/PreprocessingConfig.java index 82ae0f03e2..09dfe0698b 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/PreprocessingConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/PreprocessingConfig.java @@ -1,8 +1,7 @@ package com.bakdata.conquery.models.config; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ThreadPoolDefinition.java b/backend/src/main/java/com/bakdata/conquery/models/config/ThreadPoolDefinition.java index 661bc775a3..faba2ae254 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/ThreadPoolDefinition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/ThreadPoolDefinition.java @@ -3,10 +3,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; -import javax.validation.constraints.Min; - import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.dropwizard.util.Duration; +import jakarta.validation.constraints.Min; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/XodusConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/XodusConfig.java index 0f8a2aa70a..f08897be9e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/XodusConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/XodusConfig.java @@ -1,120 +1,216 @@ package com.bakdata.conquery.models.config; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.google.common.primitives.Ints; +import io.dropwizard.util.DataSize; +import io.dropwizard.util.DataSizeUnit; import io.dropwizard.util.Duration; -import io.dropwizard.util.Size; -import io.dropwizard.util.SizeUnit; -import io.dropwizard.validation.MaxSize; +import io.dropwizard.validation.MaxDataSize; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import jetbrains.exodus.env.EnvironmentConfig; import lombok.Getter; import lombok.Setter; import lombok.ToString; -@Getter @Setter @ToString +@Getter +@Setter +@ToString public class XodusConfig { - private Size memoryUsage; - private Integer memoryUsagePercentage; - private String cipherId; - private String cipherKey; - private Long cipherBasicIV; - private Boolean logDurableWrite; - @MaxSize(value=1,unit=SizeUnit.GIGABYTES) - private Size logFileSize = Size.megabytes(400L); - private String logLockId; + private DataSize memoryUsage; + private Integer memoryUsagePercentage; + private String cipherId; + private String cipherKey; + private Long cipherBasicIV; + private Boolean logDurableWrite; + @MaxDataSize(value = 1, unit = DataSizeUnit.GIGABYTES) + private DataSize logFileSize = DataSize.megabytes(400L); + private String logLockId; private Duration logLockTimeout = Duration.seconds(1); - private Size logCachePageSize; - private Integer logCacheOpenFilesCount; - private Boolean logCacheUseNio; - private Long logCacheFreePhysicalMemoryThreshold; - private Boolean logCacheShared; - private Boolean logCacheNonBlocking; - private Boolean logCleanDirectoryExpected; - private Boolean logClearInvalid; - private Long logSyncPeriod; - private Boolean fullFileReadonly; - private Boolean envIsReadonly; - private Boolean envReadonlyEmptyStores; - private Integer envStoreGetCacheSize; - private Boolean envCloseForcedly; - private Long envTxnReplayTimeout; - private Integer envTxnReplayMaxCount; - private Boolean envTxnDowngradeAfterFlush; - private Integer envMaxParallelTxns; - private Integer envMaxParallelReadonlyTxns; - @NotNull @Valid + private DataSize logCachePageSize; + private Integer logCacheOpenFilesCount; + private Boolean logCacheUseNio; + private Long logCacheFreePhysicalMemoryThreshold; + private Boolean logCacheShared; + private Boolean logCacheNonBlocking; + private Boolean logCleanDirectoryExpected; + private Boolean logClearInvalid; + private Long logSyncPeriod; + private Boolean fullFileReadonly; + private Boolean envIsReadonly; + private Boolean envReadonlyEmptyStores; + private Integer envStoreGetCacheSize; + private Boolean envCloseForcedly; + private Long envTxnReplayTimeout; + private Integer envTxnReplayMaxCount; + private Boolean envTxnDowngradeAfterFlush; + private Integer envMaxParallelTxns; + private Integer envMaxParallelReadonlyTxns; + @NotNull + @Valid private Duration envMonitorTxnsTimeout = Duration.minutes(10); - private Integer envMonitorTxnsCheckFreq; - private Boolean envGatherStatistics; - private Integer treeMaxPageSize; - private Boolean gcEnabled; - private Integer gcStartIn; - private Integer gcMinUtilization; - private Boolean gcRenameFiles; - private Integer gcFileMinAge; - private Integer gcFilesInterval; - private Integer gcRunPeriod; - private Boolean gcUtilizationFromScratch; - private String gcUtilizationFromFile; - private Boolean gcUseExclusiveTransaction; - private Integer gcTransactionAcquireTimeout; - private Integer gcTransactionTimeout; - private Integer gcFilesDeletionDelay; - private Boolean managementEnabled; - private Boolean managementOperationsRestricted; - + private Integer envMonitorTxnsCheckFreq; + private Boolean envGatherStatistics; + private Integer treeMaxPageSize; + private Boolean gcEnabled; + private Integer gcStartIn; + private Integer gcMinUtilization; + private Boolean gcRenameFiles; + private Integer gcFileMinAge; + private Integer gcFilesInterval; + private Integer gcRunPeriod; + private Boolean gcUtilizationFromScratch; + private String gcUtilizationFromFile; + private Boolean gcUseExclusiveTransaction; + private Integer gcTransactionAcquireTimeout; + private Integer gcTransactionTimeout; + private Integer gcFilesDeletionDelay; + private Boolean managementEnabled; + private Boolean managementOperationsRestricted; + public EnvironmentConfig createConfig() { - EnvironmentConfig config = new EnvironmentConfig(); - if(memoryUsage != null) {config.setMemoryUsage(memoryUsage.toBytes());} - if(memoryUsagePercentage != null) {config.setMemoryUsagePercentage(memoryUsagePercentage);} - if(cipherId != null) {config.setCipherId(cipherId);} - if(cipherKey != null) {config.setCipherKey(cipherKey);} - if(cipherBasicIV != null) {config.setCipherBasicIV(cipherBasicIV);} - if(logDurableWrite != null) {config.setLogDurableWrite(logDurableWrite);} - if(logFileSize != null) {config.setLogFileSize(logFileSize.toKilobytes());} - if(logLockId != null) {config.setLogLockId(logLockId);} - if(logLockTimeout != null) {config.setLogLockTimeout(logLockTimeout.toMilliseconds());} - if(logCachePageSize != null) {config.setLogCachePageSize(Ints.checkedCast(logCachePageSize.toBytes()));} - if(logCacheOpenFilesCount != null) {config.setLogCacheOpenFilesCount(logCacheOpenFilesCount);} - if(logCacheUseNio != null) {config.setLogCacheUseNio(logCacheUseNio);} - if(logCacheFreePhysicalMemoryThreshold != null) {config.setLogCacheFreePhysicalMemoryThreshold(logCacheFreePhysicalMemoryThreshold);} - if(logCacheShared != null) {config.setLogCacheShared(logCacheShared);} - if(logCacheNonBlocking != null) {config.setLogCacheNonBlocking(logCacheNonBlocking);} - if(logCleanDirectoryExpected != null) {config.setLogCleanDirectoryExpected(logCleanDirectoryExpected);} - if(logClearInvalid != null) {config.setLogClearInvalid(logClearInvalid);} - if(logSyncPeriod != null) {config.setLogSyncPeriod(logSyncPeriod);} - if(fullFileReadonly != null) {config.setFullFileReadonly(fullFileReadonly);} - if(envIsReadonly != null) {config.setEnvIsReadonly(envIsReadonly);} - if(envReadonlyEmptyStores != null) {config.setEnvReadonlyEmptyStores(envReadonlyEmptyStores);} - if(envStoreGetCacheSize != null) {config.setEnvStoreGetCacheSize(envStoreGetCacheSize);} - if(envCloseForcedly != null) {config.setEnvCloseForcedly(envCloseForcedly);} - if(envTxnReplayTimeout != null) {config.setEnvTxnReplayTimeout(envTxnReplayTimeout);} - if(envTxnReplayMaxCount != null) {config.setEnvTxnReplayMaxCount(envTxnReplayMaxCount);} - if(envTxnDowngradeAfterFlush != null) {config.setEnvTxnDowngradeAfterFlush(envTxnDowngradeAfterFlush);} - if(envMaxParallelTxns != null) {config.setEnvMaxParallelTxns(envMaxParallelTxns);} - if(envMaxParallelReadonlyTxns != null) {config.setEnvMaxParallelReadonlyTxns(envMaxParallelReadonlyTxns);} - if(envMonitorTxnsTimeout != null) {config.setEnvMonitorTxnsTimeout(Ints.checkedCast(envMonitorTxnsTimeout.toMilliseconds()));} - if(envMonitorTxnsCheckFreq != null) {config.setEnvMonitorTxnsCheckFreq(envMonitorTxnsCheckFreq);} - if(envGatherStatistics != null) {config.setEnvGatherStatistics(envGatherStatistics);} - if(treeMaxPageSize != null) {config.setTreeMaxPageSize(treeMaxPageSize);} - if(gcEnabled != null) {config.setGcEnabled(gcEnabled);} - if(gcStartIn != null) {config.setGcStartIn(gcStartIn);} - if(gcMinUtilization != null) {config.setGcMinUtilization(gcMinUtilization);} - if(gcRenameFiles != null) {config.setGcRenameFiles(gcRenameFiles);} - if(gcFileMinAge != null) {config.setGcFileMinAge(gcFileMinAge);} - if(gcFilesInterval != null) {config.setGcFilesInterval(gcFilesInterval);} - if(gcRunPeriod != null) {config.setGcRunPeriod(gcRunPeriod);} - if(gcUtilizationFromScratch != null) {config.setGcUtilizationFromScratch(gcUtilizationFromScratch);} - if(gcUtilizationFromFile != null) {config.setGcUtilizationFromFile(gcUtilizationFromFile);} - if(gcUseExclusiveTransaction != null) {config.setGcUseExclusiveTransaction(gcUseExclusiveTransaction);} - if(gcTransactionAcquireTimeout != null) {config.setGcTransactionAcquireTimeout(gcTransactionAcquireTimeout);} - if(gcTransactionTimeout != null) {config.setGcTransactionTimeout(gcTransactionTimeout);} - if(gcFilesDeletionDelay != null) {config.setGcFilesDeletionDelay(gcFilesDeletionDelay);} - if(managementEnabled != null) {config.setManagementEnabled(managementEnabled);} - if(managementOperationsRestricted != null) {config.setManagementOperationsRestricted(managementOperationsRestricted);} - + final EnvironmentConfig config = new EnvironmentConfig(); + if (memoryUsage != null) { + config.setMemoryUsage(memoryUsage.toBytes()); + } + if (memoryUsagePercentage != null) { + config.setMemoryUsagePercentage(memoryUsagePercentage); + } + if (cipherId != null) { + config.setCipherId(cipherId); + } + if (cipherKey != null) { + config.setCipherKey(cipherKey); + } + if (cipherBasicIV != null) { + config.setCipherBasicIV(cipherBasicIV); + } + if (logDurableWrite != null) { + config.setLogDurableWrite(logDurableWrite); + } + if (logFileSize != null) { + config.setLogFileSize(logFileSize.toKilobytes()); + } + if (logLockId != null) { + config.setLogLockId(logLockId); + } + if (logLockTimeout != null) { + config.setLogLockTimeout(logLockTimeout.toMilliseconds()); + } + if (logCachePageSize != null) { + config.setLogCachePageSize(Ints.checkedCast(logCachePageSize.toBytes())); + } + if (logCacheOpenFilesCount != null) { + config.setLogCacheOpenFilesCount(logCacheOpenFilesCount); + } + if (logCacheUseNio != null) { + config.setLogCacheUseNio(logCacheUseNio); + } + if (logCacheFreePhysicalMemoryThreshold != null) { + config.setLogCacheFreePhysicalMemoryThreshold(logCacheFreePhysicalMemoryThreshold); + } + if (logCacheShared != null) { + config.setLogCacheShared(logCacheShared); + } + if (logCacheNonBlocking != null) { + config.setLogCacheNonBlocking(logCacheNonBlocking); + } + if (logCleanDirectoryExpected != null) { + config.setLogCleanDirectoryExpected(logCleanDirectoryExpected); + } + if (logClearInvalid != null) { + config.setLogClearInvalid(logClearInvalid); + } + if (logSyncPeriod != null) { + config.setLogSyncPeriod(logSyncPeriod); + } + if (fullFileReadonly != null) { + config.setFullFileReadonly(fullFileReadonly); + } + if (envIsReadonly != null) { + config.setEnvIsReadonly(envIsReadonly); + } + if (envReadonlyEmptyStores != null) { + config.setEnvReadonlyEmptyStores(envReadonlyEmptyStores); + } + if (envStoreGetCacheSize != null) { + config.setEnvStoreGetCacheSize(envStoreGetCacheSize); + } + if (envCloseForcedly != null) { + config.setEnvCloseForcedly(envCloseForcedly); + } + if (envTxnReplayTimeout != null) { + config.setEnvTxnReplayTimeout(envTxnReplayTimeout); + } + if (envTxnReplayMaxCount != null) { + config.setEnvTxnReplayMaxCount(envTxnReplayMaxCount); + } + if (envTxnDowngradeAfterFlush != null) { + config.setEnvTxnDowngradeAfterFlush(envTxnDowngradeAfterFlush); + } + if (envMaxParallelTxns != null) { + config.setEnvMaxParallelTxns(envMaxParallelTxns); + } + if (envMaxParallelReadonlyTxns != null) { + config.setEnvMaxParallelReadonlyTxns(envMaxParallelReadonlyTxns); + } + if (envMonitorTxnsTimeout != null) { + config.setEnvMonitorTxnsTimeout(Ints.checkedCast(envMonitorTxnsTimeout.toMilliseconds())); + } + if (envMonitorTxnsCheckFreq != null) { + config.setEnvMonitorTxnsCheckFreq(envMonitorTxnsCheckFreq); + } + if (envGatherStatistics != null) { + config.setEnvGatherStatistics(envGatherStatistics); + } + if (treeMaxPageSize != null) { + config.setTreeMaxPageSize(treeMaxPageSize); + } + if (gcEnabled != null) { + config.setGcEnabled(gcEnabled); + } + if (gcStartIn != null) { + config.setGcStartIn(gcStartIn); + } + if (gcMinUtilization != null) { + config.setGcMinUtilization(gcMinUtilization); + } + if (gcRenameFiles != null) { + config.setGcRenameFiles(gcRenameFiles); + } + if (gcFileMinAge != null) { + config.setGcFileMinAge(gcFileMinAge); + } + if (gcFilesInterval != null) { + config.setGcFilesInterval(gcFilesInterval); + } + if (gcRunPeriod != null) { + config.setGcRunPeriod(gcRunPeriod); + } + if (gcUtilizationFromScratch != null) { + config.setGcUtilizationFromScratch(gcUtilizationFromScratch); + } + if (gcUtilizationFromFile != null) { + config.setGcUtilizationFromFile(gcUtilizationFromFile); + } + if (gcUseExclusiveTransaction != null) { + config.setGcUseExclusiveTransaction(gcUseExclusiveTransaction); + } + if (gcTransactionAcquireTimeout != null) { + config.setGcTransactionAcquireTimeout(gcTransactionAcquireTimeout); + } + if (gcTransactionTimeout != null) { + config.setGcTransactionTimeout(gcTransactionTimeout); + } + if (gcFilesDeletionDelay != null) { + config.setGcFilesDeletionDelay(gcFilesDeletionDelay); + } + if (managementEnabled != null) { + config.setManagementEnabled(managementEnabled); + } + if (managementOperationsRestricted != null) { + config.setManagementOperationsRestricted(managementOperationsRestricted); + } + return config; } } diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java index 36eed3c6bb..ae74ba9f23 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java @@ -18,10 +18,6 @@ import java.util.function.Function; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.Validator; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.storage.IdentifiableStore; @@ -68,6 +64,10 @@ import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; import io.dropwizard.util.Duration; +import jakarta.validation.Valid; +import jakarta.validation.Validator; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import jetbrains.exodus.env.Environment; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiKeyClientFilterProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiKeyClientFilterProvider.java index 91978d693b..ccec1d9d19 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiKeyClientFilterProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiKeyClientFilterProvider.java @@ -1,11 +1,10 @@ package com.bakdata.conquery.models.config.auth; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.client.ClientRequestFilter; - import com.bakdata.conquery.io.cps.CPSType; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.client.ClientRequestFilter; @CPSType(id = "API_KEY", base = AuthenticationClientFilterProvider.class) diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationClientFilterProvider.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationClientFilterProvider.java index 5003a868c9..5fe9519e80 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationClientFilterProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationClientFilterProvider.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.models.config.auth; -import javax.ws.rs.client.ClientRequestFilter; - import com.bakdata.conquery.io.cps.CPSBase; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.ws.rs.client.ClientRequestFilter; @CPSBase @JsonTypeInfo(property = "type", use = JsonTypeInfo.Id.CUSTOM) diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationConfig.java index f10deaa750..4e6000524e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationConfig.java @@ -1,16 +1,16 @@ package com.bakdata.conquery.models.config.auth; +import java.util.concurrent.atomic.AtomicReference; + import com.bakdata.conquery.models.auth.web.AuthCookieFilter; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.util.Duration; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.NewCookie; import lombok.Getter; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.NewCookie; -import java.util.concurrent.atomic.AtomicReference; - @NoArgsConstructor @Getter public class AuthenticationConfig { diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationRealmFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationRealmFactory.java index 907fc43a90..dbf2ba9633 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationRealmFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthenticationRealmFactory.java @@ -6,7 +6,7 @@ import com.bakdata.conquery.models.config.ConqueryConfig; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "type") @CPSBase diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthorizationConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthorizationConfig.java index e89b3e6d25..a6dbd3fdf1 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthorizationConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthorizationConfig.java @@ -2,14 +2,13 @@ import java.util.List; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.auth.ProtoRole; import com.bakdata.conquery.apiv1.auth.ProtoUser; import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.models.auth.UserManageable; import com.bakdata.conquery.models.auth.permissions.ExecutionPermission; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.validation.constraints.NotNull; /** * Configurations of this type define the initial users with their permissions diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/DefaultAuthorizationConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/DefaultAuthorizationConfig.java index 0c4132fd10..299b402789 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/DefaultAuthorizationConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/DefaultAuthorizationConfig.java @@ -3,13 +3,12 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.apiv1.auth.ProtoRole; import com.bakdata.conquery.apiv1.auth.ProtoUser; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.auth.permissions.AdminPermission; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; @CPSType(base = AuthorizationConfig.class, id = "DEFAULT") diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/DevelopmentAuthorizationConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/DevelopmentAuthorizationConfig.java index 8f48ec668a..410d325607 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/DevelopmentAuthorizationConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/DevelopmentAuthorizationConfig.java @@ -3,15 +3,14 @@ import java.util.List; import java.util.Set; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.auth.ProtoRole; import com.bakdata.conquery.apiv1.auth.ProtoUser; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.auth.permissions.AdminPermission; import com.bakdata.conquery.models.auth.permissions.DatasetPermission; import com.bakdata.conquery.models.auth.permissions.SuperPermission; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/IntrospectionDelegatingRealmFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/IntrospectionDelegatingRealmFactory.java index 94b7c449f0..7cc033aa7d 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/IntrospectionDelegatingRealmFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/IntrospectionDelegatingRealmFactory.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import com.bakdata.conquery.models.auth.AuthorizationController; import com.bakdata.conquery.models.auth.ConqueryAuthenticationRealm; @@ -18,7 +18,7 @@ import com.nimbusds.oauth2.sdk.id.ClientID; import io.dropwizard.client.JerseyClientBuilder; import io.dropwizard.servlets.tasks.Task; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import io.dropwizard.validation.ValidationMethod; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/JwtPkceVerifyingRealmFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/JwtPkceVerifyingRealmFactory.java index c7f5692e45..4f6edcc9f9 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/JwtPkceVerifyingRealmFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/JwtPkceVerifyingRealmFactory.java @@ -14,17 +14,17 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.client.Client; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.RequestHelper; import com.bakdata.conquery.io.cps.CPSType; @@ -54,7 +54,7 @@ import groovy.lang.GroovyShell; import groovy.lang.Script; import io.dropwizard.client.JerseyClientBuilder; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import io.dropwizard.validation.ValidationMethod; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/LocalAuthenticationConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/LocalAuthenticationConfig.java index a6bdef03de..1c1146d052 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/LocalAuthenticationConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/LocalAuthenticationConfig.java @@ -5,10 +5,10 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.UriBuilder; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.RequestHelper; import com.bakdata.conquery.io.cps.CPSType; @@ -29,7 +29,7 @@ import com.password4j.BenchmarkResult; import com.password4j.SystemChecker; import io.dropwizard.jersey.DropwizardResourceConfig; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import io.dropwizard.util.Duration; import io.dropwizard.validation.MinDuration; import io.dropwizard.validation.ValidationMethod; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/MultiInstancePlugin.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/MultiInstancePlugin.java index fcf0840c32..b0000971a2 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/MultiInstancePlugin.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/MultiInstancePlugin.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.config.auth; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; /** * Allows a {@link com.bakdata.conquery.models.config.PluginConfig} to be defined multiple times with different ids. diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCAuthorizationCodeFlowRealmFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCAuthorizationCodeFlowRealmFactory.java index 3bca2eae83..fafad825d3 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCAuthorizationCodeFlowRealmFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCAuthorizationCodeFlowRealmFactory.java @@ -4,7 +4,7 @@ import com.bakdata.conquery.models.auth.AuthorizationController; import com.bakdata.conquery.models.auth.ConqueryAuthenticationRealm; import com.bakdata.conquery.models.config.ConqueryConfig; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCResourceOwnerPasswordCredentialRealmFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCResourceOwnerPasswordCredentialRealmFactory.java index dd54ea34d3..8726be6e4f 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCResourceOwnerPasswordCredentialRealmFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/OIDCResourceOwnerPasswordCredentialRealmFactory.java @@ -8,7 +8,7 @@ import com.bakdata.conquery.resources.unprotected.LoginResource; import com.bakdata.conquery.resources.unprotected.TokenResource; import io.dropwizard.jersey.DropwizardResourceConfig; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java index 6859976095..aa1236e410 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java @@ -1,7 +1,6 @@ package com.bakdata.conquery.models.datasets; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; @@ -15,6 +14,7 @@ import com.bakdata.conquery.util.search.TrieSearch; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/Import.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/Import.java index 0302a9c367..aeee1a4e4a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/Import.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/Import.java @@ -1,8 +1,8 @@ package com.bakdata.conquery.models.datasets; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.identifiable.NamedImpl; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/ImportColumn.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/ImportColumn.java index 598cb307cd..a00bfbfb9e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/ImportColumn.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/ImportColumn.java @@ -1,7 +1,7 @@ package com.bakdata.conquery.models.datasets; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.events.stores.root.ColumnStore; import com.bakdata.conquery.models.identifiable.NamedImpl; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java index 12367ec4c7..5d8fc1d451 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/PreviewConfig.java @@ -7,11 +7,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.common.Range; @@ -33,6 +28,10 @@ import com.google.common.collect.MoreCollectors; import com.google.common.collect.Sets; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.UriBuilder; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/Table.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/Table.java index 4d59ac4910..e3f4e1bd85 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/Table.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/Table.java @@ -6,8 +6,6 @@ import java.util.stream.Stream; import javax.annotation.CheckForNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.io.storage.NamespacedStorage; @@ -17,6 +15,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Concept.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Concept.java index 368334b54c..961a8c6d0a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Concept.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Concept.java @@ -5,8 +5,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.Valid; - import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.auth.permissions.Ability; @@ -29,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.validation.Valid; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Connector.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Connector.java index c55355d0cc..046142ca2e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Connector.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Connector.java @@ -8,8 +8,6 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.Dataset; @@ -31,6 +29,8 @@ import com.google.common.collect.ImmutableMultiset; import com.google.common.collect.Multiset.Entry; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Searchable.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Searchable.java index ee8c13d5ab..579b373449 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Searchable.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Searchable.java @@ -2,8 +2,6 @@ import java.util.List; -import javax.validation.constraints.Min; - import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.io.storage.NamespaceStorage; import com.bakdata.conquery.models.config.IndexConfig; @@ -13,6 +11,7 @@ import com.bakdata.conquery.models.query.FilterSearch; import com.bakdata.conquery.util.search.TrieSearch; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.Min; /** * @implNote This class is tightly coupled with {@link FilterSearch} and {@link com.bakdata.conquery.models.datasets.concepts.filters.specific.SelectFilter}. diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/StructureNode.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/StructureNode.java index 42c74d823d..bfbcbfcee0 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/StructureNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/StructureNode.java @@ -4,9 +4,6 @@ import java.util.LinkedHashSet; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.KeyValue; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.datasets.Dataset; @@ -15,6 +12,8 @@ import com.bakdata.conquery.models.identifiable.ids.specific.StructureNodeId; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonManagedReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/AndCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/AndCondition.java index 5429d2b3ff..86c7dbc772 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/AndCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/AndCondition.java @@ -3,15 +3,14 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.concepts.tree.ConceptTreeNode; import com.bakdata.conquery.models.exceptions.ConceptConfigurationException; import com.bakdata.conquery.sql.conversion.cqelement.concept.CTConditionContext; import com.bakdata.conquery.sql.conversion.model.filter.WhereCondition; import com.bakdata.conquery.util.CalculatedValue; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/ColumnEqualCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/ColumnEqualCondition.java index e8a8e327ae..1b98784e95 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/ColumnEqualCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/ColumnEqualCondition.java @@ -3,8 +3,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.sql.conversion.cqelement.concept.CTConditionContext; import com.bakdata.conquery.sql.conversion.model.filter.MultiSelectCondition; @@ -12,6 +10,7 @@ import com.bakdata.conquery.util.CalculatedValue; import com.bakdata.conquery.util.CollectionsUtil; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/EqualCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/EqualCondition.java index 1a8f0d098b..80e3e104a6 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/EqualCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/EqualCondition.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.sql.conversion.cqelement.concept.CTConditionContext; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/GroovyCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/GroovyCondition.java index 52c2ca56ee..6dc5829a95 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/GroovyCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/GroovyCondition.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.Range; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/NotCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/NotCondition.java index 01a2f319b6..ac628ab371 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/NotCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/NotCondition.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.concepts.tree.ConceptTreeNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/OrCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/OrCondition.java index 91bcf96d1f..4773fdaf73 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/OrCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/OrCondition.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.concepts.tree.ConceptTreeNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixCondition.java index da9a839175..0aa21b8cdc 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixCondition.java @@ -4,14 +4,13 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.sql.conversion.cqelement.concept.CTConditionContext; import com.bakdata.conquery.sql.conversion.model.filter.ConditionType; import com.bakdata.conquery.sql.conversion.model.filter.WhereCondition; import com.bakdata.conquery.sql.conversion.model.filter.WhereConditionWrapper; import com.bakdata.conquery.util.CalculatedValue; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixRangeCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixRangeCondition.java index 0cf07febb6..d7fa2f25bc 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixRangeCondition.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixRangeCondition.java @@ -2,8 +2,6 @@ import java.util.Map; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.sql.conversion.cqelement.concept.CTConditionContext; import com.bakdata.conquery.sql.conversion.dialect.SqlFunctionProvider; @@ -13,6 +11,7 @@ import com.bakdata.conquery.util.CalculatedValue; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; import lombok.Setter; import org.jooq.Condition; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java index 5c53205df5..b549f898fb 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java @@ -3,14 +3,13 @@ import java.util.EnumSet; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.events.MajorTypeId; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountFilter.java index 8b4ec67998..0214fe9b6d 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountFilter.java @@ -4,8 +4,6 @@ import java.util.Collections; import java.util.List; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration; import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; import com.bakdata.conquery.io.cps.CPSType; @@ -22,6 +20,7 @@ import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext; import com.bakdata.conquery.sql.conversion.model.aggregator.CountSqlAggregator; import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/DateDistanceFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/DateDistanceFilter.java index 088342f596..82f5df279a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/DateDistanceFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/DateDistanceFilter.java @@ -3,8 +3,6 @@ import java.time.temporal.ChronoUnit; import java.util.EnumSet; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration; import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; import com.bakdata.conquery.io.cps.CPSType; @@ -19,6 +17,7 @@ import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext; import com.bakdata.conquery.sql.conversion.model.aggregator.DateDistanceSqlAggregator; import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/SumFilter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/SumFilter.java index a1b8105d2d..a3747018b2 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/SumFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/SumFilter.java @@ -5,7 +5,6 @@ import java.util.List; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration; import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; @@ -36,6 +35,7 @@ import com.bakdata.conquery.sql.conversion.model.aggregator.SumSqlAggregator; import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/QuarterSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/QuarterSelect.java index 42429f9875..55b1656d15 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/QuarterSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/QuarterSelect.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.models.datasets.concepts.select.concept.specific; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.concept.specific.temporal.TemporalSamplerFactory; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.concepts.select.Select; @@ -9,6 +7,7 @@ import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.QuarterAggregator; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/SingleColumnSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/SingleColumnSelect.java index b279df9d8c..edd2f640ad 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/SingleColumnSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/SingleColumnSelect.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.Set; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.datasets.Column; @@ -17,6 +15,7 @@ import com.bakdata.conquery.models.types.SemanticType; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountOccurencesSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountOccurencesSelect.java index 089d9e73d0..f2a504b083 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountOccurencesSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountOccurencesSelect.java @@ -2,18 +2,17 @@ import java.util.EnumSet; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; +import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.concepts.select.Select; import com.bakdata.conquery.models.datasets.concepts.select.connector.SingleColumnSelect; -import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.events.MajorTypeId; import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.MultiSelectAggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.SelectAggregator; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountSelect.java index e6dac93589..c750732529 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountSelect.java @@ -4,8 +4,6 @@ import java.util.Collections; import java.util.List; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection; @@ -14,9 +12,10 @@ import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.DistinctValuesWrapperAggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountAggregator; -import com.bakdata.conquery.sql.conversion.model.select.SelectContext; import com.bakdata.conquery.sql.conversion.model.aggregator.CountSqlAggregator; +import com.bakdata.conquery.sql.conversion.model.select.SelectContext; import com.bakdata.conquery.sql.conversion.model.select.SqlSelects; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DateDistanceSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DateDistanceSelect.java index 6b3aa7ebc6..e0bab20ec1 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DateDistanceSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DateDistanceSelect.java @@ -3,8 +3,6 @@ import java.time.temporal.ChronoUnit; import java.util.EnumSet; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.datasets.Column; @@ -13,10 +11,11 @@ import com.bakdata.conquery.models.events.MajorTypeId; import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.DateDistanceAggregator; -import com.bakdata.conquery.sql.conversion.model.select.SelectContext; import com.bakdata.conquery.sql.conversion.model.aggregator.DateDistanceSqlAggregator; +import com.bakdata.conquery.sql.conversion.model.select.SelectContext; import com.bakdata.conquery.sql.conversion.model.select.SqlSelects; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/MappableSingleColumnSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/MappableSingleColumnSelect.java index d9501508ef..0a6720ee0e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/MappableSingleColumnSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/MappableSingleColumnSelect.java @@ -5,7 +5,7 @@ import java.util.function.BiFunction; import javax.annotation.Nullable; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.io.jackson.View; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/SumSelect.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/SumSelect.java index 680d50cc9e..e3467a1639 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/SumSelect.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/SumSelect.java @@ -5,8 +5,6 @@ import java.util.EnumSet; import java.util.List; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection; @@ -24,13 +22,14 @@ import com.bakdata.conquery.models.query.queryplan.aggregators.specific.sum.IntegerSumAggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.sum.MoneySumAggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.sum.RealSumAggregator; -import com.bakdata.conquery.sql.conversion.model.select.SelectContext; import com.bakdata.conquery.sql.conversion.model.aggregator.SumDistinctSqlAggregator; import com.bakdata.conquery.sql.conversion.model.aggregator.SumSqlAggregator; +import com.bakdata.conquery.sql.conversion.model.select.SelectContext; import com.bakdata.conquery.sql.conversion.model.select.SqlSelects; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeChild.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeChild.java index 03eaa3f034..d9bfe7c94c 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeChild.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeChild.java @@ -4,8 +4,6 @@ import java.util.Collections; import java.util.List; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.concepts.ConceptElement; import com.bakdata.conquery.models.datasets.concepts.conditions.CTCondition; @@ -14,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeConnector.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeConnector.java index a6e187f57f..bb00b8d103 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeConnector.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/ConceptTreeConnector.java @@ -4,7 +4,6 @@ import java.util.List; import javax.annotation.CheckForNull; -import javax.validation.Valid; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.datasets.Column; @@ -16,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/TreeConcept.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/TreeConcept.java index 85d4306d64..3a389dfa47 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/TreeConcept.java +++ b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/tree/TreeConcept.java @@ -7,9 +7,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Stream; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.Import; import com.bakdata.conquery.models.datasets.concepts.Concept; @@ -22,6 +19,8 @@ import com.bakdata.conquery.util.CalculatedValue; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java b/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java index 225e0d629e..42520a5343 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java +++ b/backend/src/main/java/com/bakdata/conquery/models/error/ConqueryError.java @@ -3,8 +3,6 @@ import java.util.Set; import java.util.UUID; -import javax.validation.constraints.NotNull; - import c10n.C10N; import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.io.cps.CPSType; @@ -16,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/error/SimpleErrorInfo.java b/backend/src/main/java/com/bakdata/conquery/models/error/SimpleErrorInfo.java index 1a4f1a9edc..bca7602c9e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/error/SimpleErrorInfo.java +++ b/backend/src/main/java/com/bakdata/conquery/models/error/SimpleErrorInfo.java @@ -2,8 +2,7 @@ import java.util.UUID; -import javax.validation.constraints.NotNull; - +import jakarta.validation.constraints.NotNull; import lombok.Data; /** diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/Bucket.java b/backend/src/main/java/com/bakdata/conquery/models/events/Bucket.java index 2fccdf4f61..2257ab8b2c 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/Bucket.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/Bucket.java @@ -6,9 +6,6 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.common.CDateSet; import com.bakdata.conquery.models.common.daterange.CDateRange; @@ -35,6 +32,8 @@ import com.google.common.collect.ImmutableSet; import io.dropwizard.validation.ValidationMethod; import it.unimi.dsi.fastutil.objects.Object2IntMap; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/CBlock.java b/backend/src/main/java/com/bakdata/conquery/models/events/CBlock.java index e85e10c72f..f5057b9c58 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/CBlock.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/CBlock.java @@ -5,8 +5,6 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.jackson.serializer.CBlockDeserializer; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.common.daterange.CDateRange; @@ -29,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/CompoundDateRangeStore.java b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/CompoundDateRangeStore.java index 1883fba168..9c72287b4e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/CompoundDateRangeStore.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/CompoundDateRangeStore.java @@ -1,8 +1,5 @@ package com.bakdata.conquery.models.events.stores.specific; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.daterange.CDateRange; import com.bakdata.conquery.models.events.Bucket; @@ -11,6 +8,8 @@ import com.bakdata.conquery.models.events.stores.root.DateRangeStore; import com.bakdata.conquery.models.events.stores.root.DateStore; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; import lombok.NonNull; diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/RebasingIntegerStore.java b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/RebasingIntegerStore.java index ba69d9b802..559457c0d8 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/RebasingIntegerStore.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/RebasingIntegerStore.java @@ -1,10 +1,9 @@ package com.bakdata.conquery.models.events.stores.specific; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.events.stores.root.ColumnStore; import com.bakdata.conquery.models.events.stores.root.IntegerStore; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.ToString; import org.jetbrains.annotations.Nullable; diff --git a/backend/src/main/java/com/bakdata/conquery/models/exceptions/ValidatorHelper.java b/backend/src/main/java/com/bakdata/conquery/models/exceptions/ValidatorHelper.java index 52e54ef038..2531be721e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/exceptions/ValidatorHelper.java +++ b/backend/src/main/java/com/bakdata/conquery/models/exceptions/ValidatorHelper.java @@ -7,11 +7,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; -import javax.validation.ValidationException; - +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ValidationException; import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; @UtilityClass diff --git a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java index a8c0792d33..18b013e691 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java +++ b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java @@ -13,8 +13,8 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; -import javax.ws.rs.core.UriBuilder; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/configs/FormConfig.java b/backend/src/main/java/com/bakdata/conquery/models/forms/configs/FormConfig.java index 91ce5ca1bc..12299bd15c 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/configs/FormConfig.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/configs/FormConfig.java @@ -11,8 +11,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.io.jackson.serializer.MetaIdRef; diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/frontendconfiguration/FormConfigProcessor.java b/backend/src/main/java/com/bakdata/conquery/models/forms/frontendconfiguration/FormConfigProcessor.java index 2356d2811c..4ade864697 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/frontendconfiguration/FormConfigProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/frontendconfiguration/FormConfigProcessor.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.validation.Validator; +import jakarta.inject.Inject; +import jakarta.validation.Validator; import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.apiv1.forms.FormConfigAPI; diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/AbsoluteFormQuery.java b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/AbsoluteFormQuery.java index 6ce35c51de..2594b0aab7 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/AbsoluteFormQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/AbsoluteFormQuery.java @@ -6,9 +6,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.forms.export_form.ExportForm; import com.bakdata.conquery.apiv1.query.ArrayConceptQuery; @@ -26,6 +23,8 @@ import com.bakdata.conquery.models.query.RequiredEntities; import com.bakdata.conquery.models.query.Visitable; import com.bakdata.conquery.models.query.resultinfo.ResultInfo; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; @Getter diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/EntityDateQuery.java b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/EntityDateQuery.java index 8a2963b189..8499566772 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/EntityDateQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/EntityDateQuery.java @@ -6,10 +6,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.forms.export_form.ExportForm; import com.bakdata.conquery.apiv1.query.ArrayConceptQuery; @@ -27,6 +23,9 @@ import com.bakdata.conquery.models.query.Visitable; import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ExternalExecution.java b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ExternalExecution.java index 58c3fcfb01..8ab4d3a779 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ExternalExecution.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ExternalExecution.java @@ -8,7 +8,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.ResultAsset; diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/RelativeFormQuery.java b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/RelativeFormQuery.java index 120614ca10..9cc8448c9a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/RelativeFormQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/RelativeFormQuery.java @@ -5,10 +5,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.forms.IndexPlacement; import com.bakdata.conquery.apiv1.forms.export_form.ExportForm; @@ -27,6 +23,9 @@ import com.bakdata.conquery.models.query.Visitable; import com.bakdata.conquery.models.query.resultinfo.ResultInfo; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/identifiable/IdMap.java b/backend/src/main/java/com/bakdata/conquery/models/identifiable/IdMap.java index 9f69c8719a..137194cb48 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/identifiable/IdMap.java +++ b/backend/src/main/java/com/bakdata/conquery/models/identifiable/IdMap.java @@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Stream; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.bakdata.conquery.models.identifiable.ids.Id; import com.google.common.collect.ForwardingMap; diff --git a/backend/src/main/java/com/bakdata/conquery/models/identifiable/Identifiable.java b/backend/src/main/java/com/bakdata/conquery/models/identifiable/Identifiable.java index b9565e84bd..4c6037f87c 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/identifiable/Identifiable.java +++ b/backend/src/main/java/com/bakdata/conquery/models/identifiable/Identifiable.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.identifiable; -import javax.validation.Valid; +import jakarta.validation.Valid; import com.bakdata.conquery.models.identifiable.ids.Id; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java b/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java index 3e91496b8c..b4c178ddb0 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java +++ b/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.identifiable; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; diff --git a/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java b/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java index e9f33255b6..c4f2b995c3 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java +++ b/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.identifiable; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import com.bakdata.conquery.models.identifiable.ids.Id; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/identifiable/mapping/EntityPrintId.java b/backend/src/main/java/com/bakdata/conquery/models/identifiable/mapping/EntityPrintId.java index 02b4c9e0e4..7d780e8ff1 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/identifiable/mapping/EntityPrintId.java +++ b/backend/src/main/java/com/bakdata/conquery/models/identifiable/mapping/EntityPrintId.java @@ -2,10 +2,8 @@ import java.util.Arrays; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonCreator; - +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/index/MapInternToExternMapper.java b/backend/src/main/java/com/bakdata/conquery/models/index/MapInternToExternMapper.java index 0ee8181697..2fc9927e1a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/index/MapInternToExternMapper.java +++ b/backend/src/main/java/com/bakdata/conquery/models/index/MapInternToExternMapper.java @@ -3,8 +3,8 @@ import java.net.URI; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; diff --git a/backend/src/main/java/com/bakdata/conquery/models/jobs/ImportJob.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/ImportJob.java index e7fc45b644..f7fd2d29b7 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/jobs/ImportJob.java +++ b/backend/src/main/java/com/bakdata/conquery/models/jobs/ImportJob.java @@ -12,9 +12,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.datasets.Column; diff --git a/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java index ec2397604c..6314bb75e4 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/backend/src/main/java/com/bakdata/conquery/models/messages/namespaces/specific/UpdateConcept.java b/backend/src/main/java/com/bakdata/conquery/models/messages/namespaces/specific/UpdateConcept.java index 8986bcc47e..8ad428d28e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/messages/namespaces/specific/UpdateConcept.java +++ b/backend/src/main/java/com/bakdata/conquery/models/messages/namespaces/specific/UpdateConcept.java @@ -1,8 +1,5 @@ package com.bakdata.conquery.models.messages.namespaces.specific; -import javax.validation.Validator; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.concepts.Concept; import com.bakdata.conquery.models.exceptions.ValidatorHelper; @@ -13,6 +10,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.OptBoolean; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessage.java b/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessage.java index 2bf2ac53d3..e14dbb18fe 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessage.java +++ b/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessage.java @@ -2,7 +2,7 @@ import java.util.UUID; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.models.messages.Message; diff --git a/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessageContext.java b/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessageContext.java index dd6d332c7b..499de2d11b 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessageContext.java +++ b/backend/src/main/java/com/bakdata/conquery/models/messages/network/NetworkMessageContext.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.messages.network; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.commands.ShardNode; diff --git a/backend/src/main/java/com/bakdata/conquery/models/messages/network/specific/UpdateJobManagerStatus.java b/backend/src/main/java/com/bakdata/conquery/models/messages/network/specific/UpdateJobManagerStatus.java index a215af08dd..9e31ba18c9 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/messages/network/specific/UpdateJobManagerStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/models/messages/network/specific/UpdateJobManagerStatus.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.models.messages.network.specific; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.jobs.JobManagerStatus; import com.bakdata.conquery.models.messages.network.MessageToManagerNode; @@ -9,6 +7,7 @@ import com.bakdata.conquery.models.messages.network.NetworkMessageContext.ManagerNodeNetworkContext; import com.bakdata.conquery.models.worker.ShardNodeInformation; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/TableImportDescriptor.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/TableImportDescriptor.java index 47d1e2fc20..9873bdf25e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/TableImportDescriptor.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/TableImportDescriptor.java @@ -9,9 +9,6 @@ import java.util.List; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.models.events.MajorTypeId; import com.bakdata.conquery.models.identifiable.Labeled; @@ -19,6 +16,8 @@ import com.bakdata.conquery.models.preproc.outputs.OutputDescription; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/TableInputDescriptor.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/TableInputDescriptor.java index 9640ffb95c..90ad85ee94 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/TableInputDescriptor.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/TableInputDescriptor.java @@ -4,22 +4,19 @@ import java.util.Arrays; import java.util.stream.Stream; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.common.Range; -import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.MajorTypeId; import com.bakdata.conquery.models.preproc.outputs.CopyOutput; import com.bakdata.conquery.models.preproc.outputs.OutputDescription; -import com.bakdata.conquery.models.preproc.parser.Parser; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import groovy.lang.GroovyShell; import io.dropwizard.validation.ValidationMethod; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CompoundDateRangeOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CompoundDateRangeOutput.java index 686eb21106..ec8447a182 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CompoundDateRangeOutput.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CompoundDateRangeOutput.java @@ -2,9 +2,6 @@ import java.util.Arrays; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.MajorTypeId; @@ -16,6 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CopyOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CopyOutput.java index ead87f6ac1..235996be51 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CopyOutput.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/CopyOutput.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.models.preproc.outputs; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.MajorTypeId; @@ -9,6 +7,7 @@ import com.bakdata.conquery.models.preproc.parser.Parser; import com.bakdata.conquery.util.DateReader; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/DateRangeOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/DateRangeOutput.java index 847f1d94e0..5e13281afc 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/DateRangeOutput.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/DateRangeOutput.java @@ -2,8 +2,6 @@ import java.time.LocalDate; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.daterange.CDateRange; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -14,6 +12,7 @@ import com.bakdata.conquery.util.DateReader; import com.google.common.base.Strings; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.ToString; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochDateRangeOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochDateRangeOutput.java index feaa723334..1a4635a87d 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochDateRangeOutput.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochDateRangeOutput.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.preproc.outputs; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.daterange.CDateRange; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochOutput.java index 71790915e5..510c878c36 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochOutput.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochOutput.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.preproc.outputs; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.config.ConqueryConfig; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/NullOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/NullOutput.java index 84f4084332..dc4c88663e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/NullOutput.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/NullOutput.java @@ -1,6 +1,6 @@ package com.bakdata.conquery.models.preproc.outputs; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.config.ConqueryConfig; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/OutputDescription.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/OutputDescription.java index 5e0c226442..7738ed6273 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/OutputDescription.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/OutputDescription.java @@ -3,7 +3,7 @@ import java.util.InputMismatchException; import java.util.StringJoiner; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.io.cps.CPSType; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/CompoundDateRangeParser.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/CompoundDateRangeParser.java index a0d5fc02f7..44cde3958d 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/CompoundDateRangeParser.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/CompoundDateRangeParser.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.models.preproc.parser.specific; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.stores.primitive.BitSetStore; import com.bakdata.conquery.models.events.stores.root.DateRangeStore; @@ -10,6 +8,7 @@ import com.bakdata.conquery.models.preproc.parser.ColumnValues; import com.bakdata.conquery.models.preproc.parser.Parser; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotEmpty; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/DateDistanceFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/DateDistanceFilterNode.java index 71bb0c9a04..77693b4811 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/DateDistanceFilterNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/DateDistanceFilterNode.java @@ -4,8 +4,6 @@ import java.time.temporal.ChronoUnit; import java.util.Set; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.common.CDate; import com.bakdata.conquery.models.common.Range; import com.bakdata.conquery.models.datasets.Column; @@ -13,6 +11,7 @@ import com.bakdata.conquery.models.events.Bucket; import com.bakdata.conquery.models.query.QueryExecutionContext; import com.bakdata.conquery.models.query.queryplan.filter.EventFilterNode; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/MultiSelectFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/MultiSelectFilterNode.java index 0086e28c49..80b49cc756 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/MultiSelectFilterNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/MultiSelectFilterNode.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.Table; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/PrefixTextFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/PrefixTextFilterNode.java index 7a81eb4b8a..23ca0ca243 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/PrefixTextFilterNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/PrefixTextFilterNode.java @@ -2,13 +2,12 @@ import java.util.Set; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.Table; import com.bakdata.conquery.models.events.Bucket; import com.bakdata.conquery.models.events.stores.root.StringStore; import com.bakdata.conquery.models.query.queryplan.filter.EventFilterNode; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/SelectFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/SelectFilterNode.java index fba41540d9..4bb8b6b6ee 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/SelectFilterNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/SelectFilterNode.java @@ -3,12 +3,11 @@ import java.util.Objects; import java.util.Set; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.Table; import com.bakdata.conquery.models.events.Bucket; import com.bakdata.conquery.models.query.queryplan.filter.EventFilterNode; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/number/NumberFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/number/NumberFilterNode.java index 3912597863..3059a9c298 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/number/NumberFilterNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/number/NumberFilterNode.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.common.IRange; import com.bakdata.conquery.models.datasets.Column; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/specific/ExternalNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/specific/ExternalNode.java index 0135a0e894..a4432db24e 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/specific/ExternalNode.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/specific/ExternalNode.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.bakdata.conquery.models.common.CDateSet; import com.bakdata.conquery.models.datasets.Table; diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/results/MultilineEntityResult.java b/backend/src/main/java/com/bakdata/conquery/models/query/results/MultilineEntityResult.java index 08ce6911fc..2fb0442678 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/results/MultilineEntityResult.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/results/MultilineEntityResult.java @@ -6,7 +6,7 @@ import java.util.function.UnaryOperator; import java.util.stream.Stream; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.io.cps.CPSType; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/worker/DatasetRegistry.java b/backend/src/main/java/com/bakdata/conquery/models/worker/DatasetRegistry.java index 72eac99d22..afc490de52 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/worker/DatasetRegistry.java +++ b/backend/src/main/java/com/bakdata/conquery/models/worker/DatasetRegistry.java @@ -10,8 +10,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.MutableInjectableValues; import com.bakdata.conquery.io.jackson.View; import com.bakdata.conquery.io.storage.MetaStorage; @@ -29,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreType; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.cache.CacheStats; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/worker/Worker.java b/backend/src/main/java/com/bakdata/conquery/models/worker/Worker.java index 048851a0a1..853830d3de 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/worker/Worker.java +++ b/backend/src/main/java/com/bakdata/conquery/models/worker/Worker.java @@ -4,8 +4,6 @@ import java.io.IOException; import java.util.concurrent.ExecutorService; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.io.mina.MessageSender; import com.bakdata.conquery.io.mina.NetworkSession; @@ -28,6 +26,7 @@ import com.bakdata.conquery.models.messages.network.specific.ForwardToNamespace; import com.bakdata.conquery.models.query.QueryExecutor; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Validator; import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/worker/WorkerInformation.java b/backend/src/main/java/com/bakdata/conquery/models/worker/WorkerInformation.java index 45f8430a53..def028d002 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/worker/WorkerInformation.java +++ b/backend/src/main/java/com/bakdata/conquery/models/worker/WorkerInformation.java @@ -1,8 +1,5 @@ package com.bakdata.conquery.models.worker; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.mina.MessageSender; import com.bakdata.conquery.models.identifiable.NamedImpl; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; @@ -13,6 +10,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.ObjectWriter; import it.unimi.dsi.fastutil.ints.IntArraySet; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/worker/Workers.java b/backend/src/main/java/com/bakdata/conquery/models/worker/Workers.java index 5b2ed31281..99ddb7e633 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/worker/Workers.java +++ b/backend/src/main/java/com/bakdata/conquery/models/worker/Workers.java @@ -9,8 +9,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import javax.validation.Validator; - import com.bakdata.conquery.io.storage.WorkerStorage; import com.bakdata.conquery.models.config.StoreFactory; import com.bakdata.conquery.models.config.ThreadPoolDefinition; @@ -20,6 +18,7 @@ import com.bakdata.conquery.models.identifiable.ids.specific.WorkerId; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Validator; import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminPermissionFilter.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminPermissionFilter.java index ac2e9810b2..011c155934 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminPermissionFilter.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminPermissionFilter.java @@ -3,15 +3,14 @@ import java.io.IOException; import java.util.Set; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; - import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.auth.permissions.AdminPermission; import com.bakdata.conquery.models.auth.permissions.Authorized; import com.bakdata.conquery.models.auth.permissions.ConqueryPermission; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; /** * Enforces that the requesting subject has the admin permission. diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminServlet.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminServlet.java index c92842009c..a9ffefe0ba 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminServlet.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/AdminServlet.java @@ -5,8 +5,6 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; -import javax.validation.Validator; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.freemarker.Freemarker; import com.bakdata.conquery.io.jackson.IdRefPathParamConverterProvider; @@ -41,11 +39,12 @@ import com.bakdata.conquery.resources.admin.ui.TablesUIResource; import com.bakdata.conquery.resources.admin.ui.UserUIResource; import com.bakdata.conquery.resources.admin.ui.model.ConnectorUIResource; +import io.dropwizard.core.setup.AdminEnvironment; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider; import io.dropwizard.servlets.assets.AssetServlet; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.views.ViewMessageBodyWriter; +import io.dropwizard.views.common.ViewMessageBodyWriter; +import jakarta.validation.Validator; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.glassfish.hk2.utilities.binding.AbstractBinder; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminConceptsResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminConceptsResource.java index 94d93e81fe..82b90a7a51 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminConceptsResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminConceptsResource.java @@ -3,19 +3,18 @@ import static com.bakdata.conquery.resources.ResourceConstants.CONCEPT; import static com.bakdata.conquery.resources.ResourceConstants.DATASET; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; - import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.concepts.Concept; import com.bakdata.conquery.models.worker.Namespace; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetProcessor.java index 34b952dde5..a8adad0a1e 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetProcessor.java @@ -9,13 +9,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.validation.Validator; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.mode.ImportHandler; import com.bakdata.conquery.mode.StorageListener; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -42,6 +35,12 @@ import com.bakdata.conquery.models.worker.DatasetRegistry; import com.bakdata.conquery.models.worker.Namespace; import com.univocity.parsers.csv.CsvParser; +import jakarta.inject.Inject; +import jakarta.validation.Validator; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import lombok.Data; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetResource.java index d403f9ce7c..4a1de584ce 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetResource.java @@ -9,26 +9,6 @@ import java.util.stream.Collectors; import java.util.zip.GZIPInputStream; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; - import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.PreviewConfig; @@ -43,6 +23,25 @@ import com.bakdata.conquery.models.index.search.SearchIndex; import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.util.io.FileUtil; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetsResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetsResource.java index 306b32b1e6..3090a7d6af 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetsResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminDatasetsResource.java @@ -3,18 +3,17 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java index adc9d9091d..da415e39b4 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java @@ -12,8 +12,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.AuthorizationHelper; @@ -38,6 +36,7 @@ import com.google.common.collect.Multimap; import com.univocity.parsers.csv.CsvWriter; import groovy.lang.GroovyShell; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index 67586819f5..db5cbbc540 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -10,18 +10,6 @@ import java.util.OptionalLong; import java.util.UUID; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.io.storage.MetaStorage; @@ -33,6 +21,17 @@ import com.bakdata.conquery.models.worker.ShardNodeInformation; import com.bakdata.conquery.resources.admin.ui.AdminUIResource; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; @Consumes({ExtraMimeTypes.JSON_STRING, ExtraMimeTypes.SMILE_STRING}) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminTablesResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminTablesResource.java index 5655daa1db..f10c8369d1 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminTablesResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminTablesResource.java @@ -5,19 +5,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.Dataset; @@ -26,6 +13,18 @@ import com.bakdata.conquery.models.identifiable.ids.specific.ConceptId; import com.bakdata.conquery.models.identifiable.ids.specific.ImportId; import com.bakdata.conquery.models.worker.Namespace; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AuthOverviewResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AuthOverviewResource.java index 6d94aac4c8..09762b287d 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AuthOverviewResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AuthOverviewResource.java @@ -2,17 +2,16 @@ import static com.bakdata.conquery.resources.ResourceConstants.GROUP_ID; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.models.auth.entities.Group; import com.bakdata.conquery.resources.ResourceConstants; import com.bakdata.conquery.util.io.FileUtil; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; /** diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/GroupResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/GroupResource.java index e18b6d0ad6..d9aca561ac 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/GroupResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/GroupResource.java @@ -5,17 +5,17 @@ import java.util.Collection; import java.util.List; -import javax.inject.Inject; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.models.auth.entities.Group; import com.bakdata.conquery.models.auth.entities.Role; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/PermissionResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/PermissionResource.java index 6057b6aa65..4a412ed3c8 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/PermissionResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/PermissionResource.java @@ -2,18 +2,17 @@ import static com.bakdata.conquery.resources.ResourceConstants.OWNER_ID; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.entities.PermissionOwner; import com.bakdata.conquery.models.auth.permissions.WildcardPermission; import com.bakdata.conquery.models.exceptions.JSONException; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @Consumes(ExtraMimeTypes.JSON_STRING) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/RoleResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/RoleResource.java index f0c392a435..b4cfdf3ca8 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/RoleResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/RoleResource.java @@ -5,19 +5,18 @@ import java.util.Collection; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.models.auth.entities.Role; import com.bakdata.conquery.models.exceptions.JSONException; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @Consumes(MediaType.APPLICATION_JSON) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java index 27797fef8b..78b0448a2e 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java @@ -13,8 +13,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; - import com.bakdata.conquery.io.cps.CPSTypeIdResolver; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.io.storage.NamespaceStorage; @@ -45,6 +43,7 @@ import com.bakdata.conquery.resources.admin.ui.model.TableStatistics; import com.bakdata.conquery.resources.admin.ui.model.UIContext; import com.google.common.cache.CacheStats; +import jakarta.inject.Inject; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserAuthenticationManagementResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserAuthenticationManagementResource.java index 222df1570d..6a28b229b1 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserAuthenticationManagementResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserAuthenticationManagementResource.java @@ -2,21 +2,20 @@ import static com.bakdata.conquery.resources.ResourceConstants.USER_ID; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import com.bakdata.conquery.apiv1.auth.ProtoUser; import com.bakdata.conquery.models.auth.basic.UserAuthenticationManagementProcessor; import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.resources.hierarchies.HAuthorized; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import lombok.RequiredArgsConstructor; @Path("local-authentiaction") diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserResource.java index 70b8fe46a2..a02e44a167 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UserResource.java @@ -5,20 +5,19 @@ import java.util.Collection; import java.util.List; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.models.auth.entities.Role; import com.bakdata.conquery.models.auth.entities.User; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @Path(USERS_PATH_ELEMENT) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java index 4f68069536..c4fefb8b73 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java @@ -3,23 +3,22 @@ import java.net.URI; import java.util.Objects; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.config.auth.AuthenticationConfig; import com.bakdata.conquery.resources.ResourceConstants; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; import io.dropwizard.auth.Auth; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @Produces(MediaType.TEXT_HTML) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AuthOverviewUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AuthOverviewUIResource.java index fa937f3317..f9ab29d6a5 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AuthOverviewUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AuthOverviewUIResource.java @@ -1,15 +1,14 @@ package com.bakdata.conquery.resources.admin.ui; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.resources.ResourceConstants; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.RequiredArgsConstructor; @Produces(MediaType.TEXT_HTML) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/ConceptsUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/ConceptsUIResource.java index b33312f06c..fd7029ba17 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/ConceptsUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/ConceptsUIResource.java @@ -1,22 +1,25 @@ package com.bakdata.conquery.resources.admin.ui; +import static com.bakdata.conquery.resources.ResourceConstants.CONCEPT; +import static com.bakdata.conquery.resources.ResourceConstants.DATASET; + import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.concepts.Concept; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; - -import static com.bakdata.conquery.resources.ResourceConstants.CONCEPT; -import static com.bakdata.conquery.resources.ResourceConstants.DATASET; - @Produces(MediaType.TEXT_HTML) @Consumes({ExtraMimeTypes.JSON_STRING, ExtraMimeTypes.SMILE_STRING}) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/DatasetsUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/DatasetsUIResource.java index b68ebb84b5..fef955311a 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/DatasetsUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/DatasetsUIResource.java @@ -6,13 +6,6 @@ import java.util.Collection; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.Import; import com.bakdata.conquery.models.datasets.SecondaryIdDescription; @@ -24,7 +17,13 @@ import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/GroupUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/GroupUIResource.java index bc96fcff2f..7b4eb1e68d 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/GroupUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/GroupUIResource.java @@ -3,15 +3,15 @@ import com.bakdata.conquery.models.auth.entities.Group; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; import lombok.RequiredArgsConstructor; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import static com.bakdata.conquery.resources.ResourceConstants.GROUPS_PATH_ELEMENT; import static com.bakdata.conquery.resources.ResourceConstants.GROUP_ID; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/IndexServiceUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/IndexServiceUIResource.java index ec65eb2578..557b8e1dec 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/IndexServiceUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/IndexServiceUIResource.java @@ -4,17 +4,17 @@ import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.bakdata.conquery.models.index.IndexKey; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; import com.google.common.cache.CacheStats; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/RoleUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/RoleUIResource.java index 61df2205ce..ff7ebfc8e4 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/RoleUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/RoleUIResource.java @@ -1,21 +1,20 @@ package com.bakdata.conquery.resources.admin.ui; +import static com.bakdata.conquery.resources.ResourceConstants.ROLES_PATH_ELEMENT; +import static com.bakdata.conquery.resources.ResourceConstants.ROLE_ID; + import com.bakdata.conquery.models.auth.entities.Role; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.RequiredArgsConstructor; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import static com.bakdata.conquery.resources.ResourceConstants.ROLES_PATH_ELEMENT; -import static com.bakdata.conquery.resources.ResourceConstants.ROLE_ID; - @Produces(MediaType.TEXT_HTML) @Path(ROLES_PATH_ELEMENT) @RequiredArgsConstructor(onConstructor_ = @Inject) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/TablesUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/TablesUIResource.java index 3c8677550d..1aa4fbe0d8 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/TablesUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/TablesUIResource.java @@ -1,25 +1,24 @@ package com.bakdata.conquery.resources.admin.ui; +import static com.bakdata.conquery.resources.ResourceConstants.*; + import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.Import; import com.bakdata.conquery.models.datasets.Table; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import static com.bakdata.conquery.resources.ResourceConstants.*; - @Produces(MediaType.TEXT_HTML) @Path("datasets/{" + DATASET + "}/tables/{" + TABLE + "}") @Getter diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/UserUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/UserUIResource.java index 76b5a7b0b0..892528a8d1 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/UserUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/UserUIResource.java @@ -1,20 +1,20 @@ package com.bakdata.conquery.resources.admin.ui; +import static com.bakdata.conquery.resources.ResourceConstants.USERS_PATH_ELEMENT; +import static com.bakdata.conquery.resources.ResourceConstants.USER_ID; + import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.resources.admin.rest.UIProcessor; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.RequiredArgsConstructor; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import static com.bakdata.conquery.resources.ResourceConstants.*; - @Produces(MediaType.TEXT_HTML) @Path(USERS_PATH_ELEMENT) @RequiredArgsConstructor(onConstructor_ = @Inject) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/ConnectorUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/ConnectorUIResource.java index 609545202b..4168fa7ab2 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/ConnectorUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/ConnectorUIResource.java @@ -3,19 +3,18 @@ import static com.bakdata.conquery.resources.ResourceConstants.CONNECTOR; import static com.bakdata.conquery.resources.ResourceConstants.DATASET; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.datasets.concepts.Connector; import com.bakdata.conquery.resources.admin.rest.UIProcessor; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/UIView.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/UIView.java index 996c251f3c..a4b360d0db 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/UIView.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/model/UIView.java @@ -2,7 +2,7 @@ import java.nio.charset.StandardCharsets; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; import lombok.Getter; @Getter diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java index 8971384428..ddd919ed27 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptResource.java @@ -5,20 +5,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.frontend.FrontendList; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.permissions.Ability; @@ -26,9 +12,21 @@ import com.bakdata.conquery.models.datasets.concepts.tree.TreeConcept; import com.bakdata.conquery.resources.hierarchies.HAuthorized; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import lombok.Data; import lombok.RequiredArgsConstructor; -import lombok.Setter; import lombok.ToString; @Produces({ExtraMimeTypes.JSON_STRING, ExtraMimeTypes.SMILE_STRING}) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java index a1a16e1696..2d1d9a0722 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java @@ -14,9 +14,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.validation.Validator; - import com.bakdata.conquery.apiv1.IdLabel; import com.bakdata.conquery.apiv1.frontend.FrontendList; import com.bakdata.conquery.apiv1.frontend.FrontendPreviewConfig; @@ -50,6 +47,8 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.Iterators; +import jakarta.inject.Inject; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConfigResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConfigResource.java index deeb7e5d21..53f0cdd931 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConfigResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConfigResource.java @@ -2,11 +2,6 @@ import java.time.Year; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.apiv1.frontend.FrontendConfiguration; import com.bakdata.conquery.models.config.ColumnConfig; @@ -14,6 +9,10 @@ import com.bakdata.conquery.models.config.FrontendConfig; import com.bakdata.conquery.models.config.IdColumnConfig; import com.bakdata.conquery.util.VersionInfo; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import lombok.RequiredArgsConstructor; @Path("config") diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormConfigResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormConfigResource.java index 7b8711e794..09dfe9bee0 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormConfigResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormConfigResource.java @@ -5,18 +5,6 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import com.bakdata.conquery.apiv1.forms.FormConfigAPI; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.entities.Subject; @@ -27,6 +15,17 @@ import com.bakdata.conquery.models.forms.frontendconfiguration.FormConfigProcessor.PostResponse; import com.bakdata.conquery.resources.hierarchies.HAuthorized; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import lombok.RequiredArgsConstructor; import lombok.ToString; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormResource.java index c25c73905a..8f9dbf0609 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetFormResource.java @@ -4,18 +4,17 @@ import java.util.Collection; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.forms.frontendconfiguration.FormProcessor; import com.fasterxml.jackson.databind.JsonNode; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetQueryResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetQueryResource.java index 2b637b7d1c..37e3100c12 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetQueryResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetQueryResource.java @@ -8,22 +8,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.apiv1.QueryProcessor; import com.bakdata.conquery.apiv1.RequestAwareUriBuilder; @@ -38,6 +22,21 @@ import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.execution.ManagedExecution; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java index 10cac99017..abcf57ed35 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetResource.java @@ -2,17 +2,16 @@ import static com.bakdata.conquery.resources.ResourceConstants.DATASET; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import com.bakdata.conquery.apiv1.frontend.FrontendPreviewConfig; import com.bakdata.conquery.apiv1.frontend.FrontendRoot; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.identifiable.ids.specific.ConnectorId; import com.bakdata.conquery.resources.hierarchies.HDatasets; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetsResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetsResource.java index aebe772d9c..92f9f26ca6 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetsResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/DatasetsResource.java @@ -2,16 +2,15 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import com.bakdata.conquery.apiv1.IdLabel; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.bakdata.conquery.resources.hierarchies.HAuthorized; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java index d3c77a85d5..58ad274147 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java @@ -6,16 +6,16 @@ import java.util.Optional; import java.util.OptionalInt; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response.Status; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response.Status; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.permissions.Ability; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/FormConfigResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/FormConfigResource.java index 40e575d613..cc07b57be9 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/FormConfigResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/FormConfigResource.java @@ -2,14 +2,14 @@ import static com.bakdata.conquery.resources.ResourceConstants.FORM_CONFIG; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/MeResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/MeResource.java index 33ca3bde4d..5a9c76d75d 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/MeResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/MeResource.java @@ -1,10 +1,10 @@ package com.bakdata.conquery.resources.api; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.bakdata.conquery.apiv1.MeProcessor; import com.bakdata.conquery.apiv1.MeProcessor.FrontendMeInformation; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/QueryResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/QueryResource.java index 5fe05d8652..e3615bed1a 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/QueryResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/QueryResource.java @@ -5,21 +5,6 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.apiv1.MetaDataPatch; import com.bakdata.conquery.apiv1.QueryProcessor; @@ -32,6 +17,20 @@ import com.bakdata.conquery.models.query.ManagedQuery; import io.dropwizard.auth.Auth; import io.dropwizard.jersey.PATCH; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @Path("queries") diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultArrowResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultArrowResource.java index 5678bd9b98..c99e4b5bee 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultArrowResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultArrowResource.java @@ -8,18 +8,6 @@ import java.util.Optional; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.io.result.arrow.ResultArrowProcessor; import com.bakdata.conquery.models.auth.entities.Subject; @@ -27,6 +15,17 @@ import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.resources.ResourceConstants; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultCsvResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultCsvResource.java index 99cf6fcfdb..caf4b1d33c 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultCsvResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultCsvResource.java @@ -8,18 +8,6 @@ import java.net.URL; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.io.result.csv.ResultCsvProcessor; import com.bakdata.conquery.models.auth.entities.Subject; @@ -27,6 +15,17 @@ import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.resources.ResourceConstants; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExcelResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExcelResource.java index 4cfe62791c..5fa2bdf217 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExcelResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExcelResource.java @@ -7,18 +7,6 @@ import java.net.URL; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.io.result.excel.ResultExcelProcessor; import com.bakdata.conquery.models.auth.entities.Subject; @@ -26,6 +14,17 @@ import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.resources.ResourceConstants; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExternalResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExternalResource.java index 2cf338b4f9..93732d3e1b 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExternalResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExternalResource.java @@ -7,21 +7,20 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.io.result.ExternalResult; import com.bakdata.conquery.io.result.external.ExternalResultProcessor; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.execution.ManagedExecution; import com.bakdata.conquery.resources.ResourceConstants; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.extern.slf4j.Slf4j; @Path("result/external") diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultParquetResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultParquetResource.java index 3b85eb1d90..74709908e7 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ResultParquetResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultParquetResource.java @@ -8,24 +8,23 @@ import java.net.URL; import java.util.OptionalLong; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.io.result.parquet.ResultParquetProcessor; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.execution.ManagedExecution; import com.bakdata.conquery.models.query.SingleTableResult; import com.bakdata.conquery.resources.ResourceConstants; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HAuthorized.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HAuthorized.java index 446944119a..8f61179e65 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HAuthorized.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HAuthorized.java @@ -2,10 +2,10 @@ import java.security.Principal; -import javax.annotation.PostConstruct; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response.Status; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response.Status; import com.bakdata.conquery.models.auth.entities.Subject; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConcepts.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConcepts.java index b807b507bb..88ef0d1653 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConcepts.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConcepts.java @@ -3,9 +3,9 @@ import static com.bakdata.conquery.resources.ResourceConstants.CONCEPT; import static com.bakdata.conquery.resources.ResourceConstants.DATASET; -import javax.annotation.PostConstruct; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.datasets.concepts.Concept; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConnectors.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConnectors.java index e9ffc4ca1d..792779e24e 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConnectors.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HConnectors.java @@ -2,10 +2,10 @@ import static com.bakdata.conquery.resources.ResourceConstants.*; -import javax.annotation.PostConstruct; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import com.bakdata.conquery.models.datasets.concepts.Connector; import com.bakdata.conquery.models.datasets.Table; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HDatasets.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HDatasets.java index 0bff459b4e..dfeb09fe1a 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HDatasets.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HDatasets.java @@ -2,10 +2,10 @@ import static com.bakdata.conquery.resources.ResourceConstants.DATASET; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.datasets.Dataset; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HFilters.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HFilters.java index d92f3ee76c..e312a20224 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HFilters.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HFilters.java @@ -2,8 +2,8 @@ import static com.bakdata.conquery.resources.ResourceConstants.*; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import com.bakdata.conquery.models.datasets.concepts.filters.Filter; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HTables.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HTables.java index 149a7f190b..1a1b3a1a77 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HTables.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HTables.java @@ -3,8 +3,8 @@ import static com.bakdata.conquery.resources.ResourceConstants.DATASET; import static com.bakdata.conquery.resources.ResourceConstants.TABLE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import com.bakdata.conquery.models.datasets.Table; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HierarchyHelper.java b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HierarchyHelper.java index 150acb3099..532de433da 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HierarchyHelper.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/hierarchies/HierarchyHelper.java @@ -2,14 +2,14 @@ import java.lang.reflect.Method; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; import lombok.experimental.UtilityClass; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/unprotected/AuthServlet.java b/backend/src/main/java/com/bakdata/conquery/resources/unprotected/AuthServlet.java index 6b58fa5e6d..e82d3807f1 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/unprotected/AuthServlet.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/unprotected/AuthServlet.java @@ -13,7 +13,7 @@ import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider; import io.dropwizard.jersey.setup.JerseyContainerHolder; import io.dropwizard.jetty.setup.ServletEnvironment; -import io.dropwizard.views.ViewMessageBodyWriter; +import io.dropwizard.views.common.ViewMessageBodyWriter; import lombok.experimental.UtilityClass; import org.glassfish.jersey.servlet.ServletContainer; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/unprotected/LoginResource.java b/backend/src/main/java/com/bakdata/conquery/resources/unprotected/LoginResource.java index f3fbe5b41d..30556939e5 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/unprotected/LoginResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/unprotected/LoginResource.java @@ -2,18 +2,18 @@ import java.net.URI; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; import com.bakdata.conquery.models.auth.web.RedirectingAuthFilter; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; +import io.dropwizard.views.common.View; @Path("/login") @Produces(MediaType.TEXT_HTML) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/unprotected/TokenResource.java b/backend/src/main/java/com/bakdata/conquery/resources/unprotected/TokenResource.java index da4be49818..8805f77510 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/unprotected/TokenResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/unprotected/TokenResource.java @@ -1,15 +1,14 @@ package com.bakdata.conquery.resources.unprotected; -import javax.ws.rs.Consumes; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.apiv1.auth.JwtWrapper; import com.bakdata.conquery.apiv1.auth.UsernamePasswordToken; import com.bakdata.conquery.models.auth.basic.AccessTokenCreator; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authc.AuthenticationException; diff --git a/backend/src/main/java/com/bakdata/conquery/util/ResourceUtil.java b/backend/src/main/java/com/bakdata/conquery/util/ResourceUtil.java index 16b77789c0..1bbece3e84 100644 --- a/backend/src/main/java/com/bakdata/conquery/util/ResourceUtil.java +++ b/backend/src/main/java/com/bakdata/conquery/util/ResourceUtil.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.util; -import javax.ws.rs.NotFoundException; - import com.bakdata.conquery.models.identifiable.ids.Id; import com.google.common.base.Preconditions; +import jakarta.ws.rs.NotFoundException; import lombok.NonNull; import lombok.experimental.UtilityClass; diff --git a/backend/src/main/java/com/bakdata/conquery/util/Wait.java b/backend/src/main/java/com/bakdata/conquery/util/Wait.java index 5103e37c6f..d6ac483eca 100644 --- a/backend/src/main/java/com/bakdata/conquery/util/Wait.java +++ b/backend/src/main/java/com/bakdata/conquery/util/Wait.java @@ -3,9 +3,8 @@ import java.time.Duration; import java.util.function.BooleanSupplier; -import javax.validation.constraints.NotNull; - import com.google.common.util.concurrent.Uninterruptibles; +import jakarta.validation.constraints.NotNull; import lombok.Builder; @Builder diff --git a/backend/src/main/java/com/bakdata/conquery/util/search/TrieSearch.java b/backend/src/main/java/com/bakdata/conquery/util/search/TrieSearch.java index 923d72186d..fced6ccfde 100644 --- a/backend/src/main/java/com/bakdata/conquery/util/search/TrieSearch.java +++ b/backend/src/main/java/com/bakdata/conquery/util/search/TrieSearch.java @@ -18,12 +18,11 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.validation.constraints.Min; - import com.google.common.base.Strings; import com.google.common.collect.Iterators; import it.unimi.dsi.fastutil.objects.Object2LongAVLTreeMap; import it.unimi.dsi.fastutil.objects.Object2LongMap; +import jakarta.validation.constraints.Min; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.trie.PatriciaTrie; diff --git a/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURI.java b/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURI.java index 3c2870233b..3b3eed1ef6 100644 --- a/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURI.java +++ b/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURI.java @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ANNOTATION_TYPE, FIELD, TYPE_USE}) @Retention(RUNTIME) diff --git a/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURIValidator.java b/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURIValidator.java index a15d74fb72..49cc6067f5 100644 --- a/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURIValidator.java +++ b/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURIValidator.java @@ -4,8 +4,8 @@ import java.net.URI; import java.util.List; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ManualURIValidator implements ConstraintValidator { diff --git a/backend/src/test/java/com/bakdata/conquery/api/StoredQueriesProcessorTest.java b/backend/src/test/java/com/bakdata/conquery/api/StoredQueriesProcessorTest.java index 69c3233289..bddbad030c 100644 --- a/backend/src/test/java/com/bakdata/conquery/api/StoredQueriesProcessorTest.java +++ b/backend/src/test/java/com/bakdata/conquery/api/StoredQueriesProcessorTest.java @@ -11,8 +11,6 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.QueryProcessor; import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.OverviewExecutionStatus; @@ -50,7 +48,8 @@ import com.bakdata.conquery.models.worker.DistributedNamespace; import com.bakdata.conquery.util.NonPersistentStoreFactory; import com.google.common.collect.ImmutableList; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; +import jakarta.ws.rs.core.UriBuilder; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/bakdata/conquery/api/form/config/FormConfigTest.java b/backend/src/test/java/com/bakdata/conquery/api/form/config/FormConfigTest.java index 6773eb3996..f20effb7f5 100644 --- a/backend/src/test/java/com/bakdata/conquery/api/form/config/FormConfigTest.java +++ b/backend/src/test/java/com/bakdata/conquery/api/form/config/FormConfigTest.java @@ -13,7 +13,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.apiv1.forms.FormConfigAPI; @@ -53,7 +53,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; import io.dropwizard.jersey.validation.Validators; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/IntegrationUtils.java b/backend/src/test/java/com/bakdata/conquery/integration/common/IntegrationUtils.java index d93de07fd4..8295740eab 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/IntegrationUtils.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/IntegrationUtils.java @@ -6,9 +6,9 @@ import java.net.URI; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/LoadingUtil.java b/backend/src/test/java/com/bakdata/conquery/integration/common/LoadingUtil.java index 89837a6112..7afa5afce2 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/LoadingUtil.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/LoadingUtil.java @@ -17,10 +17,10 @@ import java.util.Map; import java.util.UUID; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.query.ConceptQuery; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredColumn.java b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredColumn.java index fbbd76227e..3d187f970a 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredColumn.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredColumn.java @@ -1,8 +1,6 @@ package com.bakdata.conquery.integration.common; import javax.annotation.Nullable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.SecondaryIdDescription; @@ -12,6 +10,8 @@ import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId; import com.bakdata.conquery.models.preproc.outputs.CopyOutput; import com.bakdata.conquery.models.preproc.outputs.OutputDescription; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.assertj.core.util.Strings; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredData.java b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredData.java index bfc5d20ea1..a7fc2dc1ca 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredData.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredData.java @@ -3,12 +3,11 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.util.support.StandaloneSupport; import com.fasterxml.jackson.databind.JsonNode; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredSecondaryId.java b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredSecondaryId.java index c012cdef26..6b2db6d950 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredSecondaryId.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredSecondaryId.java @@ -3,8 +3,6 @@ import java.io.IOException; import java.util.Objects; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.models.datasets.Dataset; @@ -14,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; @Data diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredTable.java b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredTable.java index 074d7fcbfd..d46a92a68f 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredTable.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredTable.java @@ -1,5 +1,9 @@ package com.bakdata.conquery.integration.common; +import java.io.IOException; +import java.util.Arrays; +import java.util.Objects; + import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.models.datasets.Column; @@ -9,17 +13,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import net.minidev.json.annotate.JsonIgnore; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.IOException; -import java.util.Arrays; -import java.util.Objects; - @Getter @Setter public class RequiredTable { diff --git a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredUser.java b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredUser.java index 867c243631..8b3af2d3c6 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredUser.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/common/RequiredUser.java @@ -1,11 +1,8 @@ package com.bakdata.conquery.integration.common; -import javax.validation.Valid; - import com.bakdata.conquery.integration.tests.TestUser; -import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.identifiable.ids.specific.RoleId; - +import jakarta.validation.Valid; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/AbstractQueryEngineTest.java b/backend/src/test/java/com/bakdata/conquery/integration/json/AbstractQueryEngineTest.java index 8f64443f01..5f648e5ea9 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/json/AbstractQueryEngineTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/json/AbstractQueryEngineTest.java @@ -11,9 +11,6 @@ import java.util.Map; import java.util.OptionalLong; -import javax.validation.UnexpectedTypeException; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.apiv1.query.EditorQuery; import com.bakdata.conquery.apiv1.query.Query; @@ -32,6 +29,8 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.powerlibraries.io.In; +import jakarta.validation.UnexpectedTypeException; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java b/backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java index 1744813710..0fbda3acee 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java @@ -12,9 +12,9 @@ import java.util.OptionalLong; import java.util.concurrent.TimeUnit; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.forms.Form; import com.bakdata.conquery.integration.common.LoadingUtil; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/JsonIntegrationTest.java b/backend/src/test/java/com/bakdata/conquery/integration/json/JsonIntegrationTest.java index 29fbc9c444..6423c5862d 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/json/JsonIntegrationTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/json/JsonIntegrationTest.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.io.InputStream; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.io.jackson.Jackson; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/QueryTest.java b/backend/src/test/java/com/bakdata/conquery/integration/json/QueryTest.java index 069908624b..1e56c09588 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/json/QueryTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/json/QueryTest.java @@ -2,9 +2,6 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.integration.common.IntegrationUtils; import com.bakdata.conquery.integration.common.RequiredData; @@ -17,6 +14,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterDescription.java b/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterDescription.java index f44662878e..a60f549eb8 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterDescription.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterDescription.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.models.datasets.concepts.Concept; import com.bakdata.conquery.apiv1.query.concept.filter.FilterValue; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterTest.java b/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterTest.java index 58547e6c8c..dade5aca56 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/json/filter/FilterTest.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration; import com.bakdata.conquery.apiv1.query.ConceptQuery; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/sql/SqlStandaloneCommand.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/SqlStandaloneCommand.java index 363b28ed2a..37c74be44b 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/sql/SqlStandaloneCommand.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/sql/SqlStandaloneCommand.java @@ -16,8 +16,9 @@ import com.bakdata.conquery.models.worker.LocalNamespace; import com.bakdata.conquery.sql.conversion.dialect.SqlDialect; import com.bakdata.conquery.util.io.ConqueryMDC; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.cli.ServerCommand; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.sourceforge.argparse4j.inf.Namespace; @@ -25,7 +26,7 @@ @Slf4j @Getter -public class SqlStandaloneCommand extends io.dropwizard.cli.ServerCommand implements StandaloneCommand { +public class SqlStandaloneCommand extends ServerCommand implements StandaloneCommand { private final Conquery conquery; private ManagerNode managerNode = new ManagerNode(); diff --git a/backend/src/test/java/com/bakdata/conquery/integration/sql/programmatic/SqlReusedQueryTest.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/programmatic/SqlReusedQueryTest.java index 73e157775e..f9230b6f00 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/sql/programmatic/SqlReusedQueryTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/sql/programmatic/SqlReusedQueryTest.java @@ -6,9 +6,6 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.query.ConceptQuery; import com.bakdata.conquery.apiv1.query.Query; @@ -29,6 +26,8 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; import lombok.extern.slf4j.Slf4j; /** diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/ConceptResolutionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ConceptResolutionTest.java index 3472aa1f03..b48a0cdc9d 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/ConceptResolutionTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/ConceptResolutionTest.java @@ -8,10 +8,6 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.integration.json.ConqueryTestSpec; import com.bakdata.conquery.integration.json.JsonIntegrationTest; @@ -25,6 +21,9 @@ import com.bakdata.conquery.resources.hierarchies.HierarchyHelper; import com.bakdata.conquery.util.support.StandaloneSupport; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityExportTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityExportTest.java index 8969932dc7..033544c373 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityExportTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityExportTest.java @@ -13,10 +13,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.AdditionalMediaTypes; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.integration.common.LoadingUtil; @@ -44,6 +40,9 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; import org.assertj.core.description.LazyTextDescription; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityResolveTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityResolveTest.java index cc75d336e0..2da49e4e1d 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityResolveTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/EntityResolveTest.java @@ -8,9 +8,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.query.concept.filter.FilterValue; import com.bakdata.conquery.integration.common.LoadingUtil; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/ExternalFormBackendTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ExternalFormBackendTest.java index 93617d472f..80c24af481 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/ExternalFormBackendTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/ExternalFormBackendTest.java @@ -1,5 +1,6 @@ package com.bakdata.conquery.integration.tests; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockserver.model.HttpRequest.request; @@ -10,7 +11,7 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.execution.ResultAsset; @@ -97,7 +98,7 @@ public void execute(String name, TestConquery testConquery) throws Exception { log.info("Download Result"); final String response = - support.getClient().target(executionStatus.getResultUrls().get(0).url()).request(javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE).get(String.class); + support.getClient().target(executionStatus.getResultUrls().get(0).url()).request(TEXT_PLAIN_TYPE).get(String.class); assertThat(response).isEqualTo("Hello"); diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterAutocompleteTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterAutocompleteTest.java index 227d40e0e2..4f3222f920 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterAutocompleteTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterAutocompleteTest.java @@ -12,10 +12,10 @@ import java.util.OptionalInt; import java.util.Set; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.FilterTemplate; import com.bakdata.conquery.apiv1.frontend.FrontendValue; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterResolutionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterResolutionTest.java index f4a8983766..62a292c2f7 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterResolutionTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterResolutionTest.java @@ -10,9 +10,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.apiv1.FilterTemplate; import com.bakdata.conquery.apiv1.frontend.FrontendValue; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/ImportUpdateTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ImportUpdateTest.java index e62ddc3b9b..7e35786d72 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/ImportUpdateTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/ImportUpdateTest.java @@ -6,7 +6,7 @@ import java.io.File; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.query.Query; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/QueryStatisticsTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/QueryStatisticsTest.java index 2c94d39c10..328cf223f7 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/QueryStatisticsTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/QueryStatisticsTest.java @@ -8,8 +8,6 @@ import java.util.Map; import java.util.TreeMap; -import javax.ws.rs.core.UriBuilder; - import c10n.C10N; import com.bakdata.conquery.integration.common.IntegrationUtils; import com.bakdata.conquery.integration.json.JsonIntegrationTest; @@ -29,6 +27,7 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.core.UriBuilder; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/RestartTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/RestartTest.java index 0a0af0aa8e..5b3e8280fc 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/RestartTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/RestartTest.java @@ -2,8 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.validation.Validator; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.integration.json.ConqueryTestSpec; import com.bakdata.conquery.integration.json.JsonIntegrationTest; @@ -25,6 +23,7 @@ import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/ReusedQueryTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ReusedQueryTest.java index c211b94c28..d437492a8f 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/ReusedQueryTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/ReusedQueryTest.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; - import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.query.ConceptQuery; import com.bakdata.conquery.apiv1.query.SecondaryIdQuery; @@ -47,6 +44,8 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/RoleUITest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/RoleUITest.java index 7145165d96..19e3ea373a 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/RoleUITest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/RoleUITest.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.Role; @@ -22,6 +20,7 @@ import com.bakdata.conquery.resources.admin.ui.RoleUIResource; import com.bakdata.conquery.resources.hierarchies.HierarchyHelper; import com.bakdata.conquery.util.support.StandaloneSupport; +import jakarta.ws.rs.core.Response; /** * Tests the mandator UI interface. Before the request is done, a mandator, a diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/SecondaryIdEndpointTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/SecondaryIdEndpointTest.java index df8029d0e2..fa395475f7 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/SecondaryIdEndpointTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/SecondaryIdEndpointTest.java @@ -6,10 +6,6 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.frontend.FrontendSecondaryId; import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.io.jackson.Jackson; @@ -27,6 +23,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ConceptUpdateAndDeletionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ConceptUpdateAndDeletionTest.java index 0a35b34014..8795093de6 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ConceptUpdateAndDeletionTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ConceptUpdateAndDeletionTest.java @@ -5,8 +5,6 @@ import java.util.Objects; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.integration.common.IntegrationUtils; @@ -25,6 +23,7 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; /** diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/DatasetDeletionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/DatasetDeletionTest.java index cd583dbc78..e5ba64967a 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/DatasetDeletionTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/DatasetDeletionTest.java @@ -4,8 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.ws.rs.WebApplicationException; - import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.integration.common.IntegrationUtils; @@ -24,6 +22,7 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.WebApplicationException; import lombok.extern.slf4j.Slf4j; /** diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ImportDeletionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ImportDeletionTest.java index 62d05782ca..e123998d0c 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ImportDeletionTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/ImportDeletionTest.java @@ -10,8 +10,8 @@ import java.util.Map; import java.util.zip.GZIPInputStream; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.query.Query; diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/TableDeletionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/TableDeletionTest.java index c20ac871ec..661bc05c31 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/TableDeletionTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/deletion/TableDeletionTest.java @@ -7,8 +7,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.integration.common.IntegrationUtils; @@ -31,6 +29,7 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; import com.github.powerlibraries.io.In; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; /** diff --git a/backend/src/test/java/com/bakdata/conquery/io/AbstractSerializationTest.java b/backend/src/test/java/com/bakdata/conquery/io/AbstractSerializationTest.java index e09081772f..5c88386bde 100644 --- a/backend/src/test/java/com/bakdata/conquery/io/AbstractSerializationTest.java +++ b/backend/src/test/java/com/bakdata/conquery/io/AbstractSerializationTest.java @@ -3,8 +3,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import javax.validation.Validator; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.io.jackson.Jackson; @@ -20,6 +18,7 @@ import com.bakdata.conquery.util.NonPersistentStoreFactory; import com.fasterxml.jackson.databind.ObjectMapper; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.Getter; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/com/bakdata/conquery/io/jackson/serializer/SerializationTestUtil.java b/backend/src/test/java/com/bakdata/conquery/io/jackson/serializer/SerializationTestUtil.java index 6b51838920..10c92e1004 100644 --- a/backend/src/test/java/com/bakdata/conquery/io/jackson/serializer/SerializationTestUtil.java +++ b/backend/src/test/java/com/bakdata/conquery/io/jackson/serializer/SerializationTestUtil.java @@ -9,8 +9,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.UnaryOperator; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.Injectable; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.models.auth.entities.User; @@ -25,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java b/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java index d55eb144ed..96b4c394e9 100644 --- a/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java +++ b/backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java @@ -6,8 +6,6 @@ import java.io.IOException; import java.util.concurrent.Executors; -import javax.validation.Validator; - import com.bakdata.conquery.apiv1.query.ConceptQuery; import com.bakdata.conquery.apiv1.query.QueryDescription; import com.bakdata.conquery.apiv1.query.concept.specific.CQReusedQuery; @@ -24,6 +22,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.Files; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import jetbrains.exodus.env.Environment; import jetbrains.exodus.env.Environments; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java b/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java index 5f717a149d..7df0c58cff 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java +++ b/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java @@ -15,8 +15,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.validation.Validator; - import com.bakdata.conquery.apiv1.IdLabel; import com.bakdata.conquery.apiv1.MeProcessor; import com.bakdata.conquery.apiv1.auth.PasswordCredential; @@ -92,6 +90,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMaps; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; import org.assertj.core.api.RecursiveComparisonAssert; import org.junit.jupiter.api.Tag; diff --git a/backend/src/test/java/com/bakdata/conquery/models/auth/IdpDelegatingAccessTokenCreatorTest.java b/backend/src/test/java/com/bakdata/conquery/models/auth/IdpDelegatingAccessTokenCreatorTest.java index 0d30bd9e8a..01b3301d79 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/auth/IdpDelegatingAccessTokenCreatorTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/auth/IdpDelegatingAccessTokenCreatorTest.java @@ -11,7 +11,7 @@ import java.util.Map; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; diff --git a/backend/src/test/java/com/bakdata/conquery/models/auth/IntrospectionDelegatingRealmTest.java b/backend/src/test/java/com/bakdata/conquery/models/auth/IntrospectionDelegatingRealmTest.java index 5193bf847d..82c65ab045 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/auth/IntrospectionDelegatingRealmTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/auth/IntrospectionDelegatingRealmTest.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.UUID; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; diff --git a/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/IdpConfigRetrievalTest.java b/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/IdpConfigRetrievalTest.java index ac81ce9e47..f12774d576 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/IdpConfigRetrievalTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/IdpConfigRetrievalTest.java @@ -6,12 +6,12 @@ import java.net.URI; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import com.bakdata.conquery.models.auth.OIDCMockServer; import com.bakdata.conquery.models.config.auth.JwtPkceVerifyingRealmFactory; import io.dropwizard.client.JerseyClientBuilder; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/KeycloakApiTest.java b/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/KeycloakApiTest.java index 3aac485d2a..529659342a 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/KeycloakApiTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/auth/oidc/KeycloakApiTest.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientBuilder; import com.bakdata.conquery.models.auth.oidc.keycloak.KeycloakApi; import com.bakdata.conquery.models.auth.oidc.keycloak.KeycloakGroup; diff --git a/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/filters/TestGroupFilter.java b/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/filters/TestGroupFilter.java index bcdd7a33e6..c0e07a1101 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/filters/TestGroupFilter.java +++ b/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/filters/TestGroupFilter.java @@ -5,9 +5,6 @@ import java.util.stream.Collectors; import java.util.stream.LongStream; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration; import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; import com.bakdata.conquery.io.cps.CPSType; @@ -20,6 +17,8 @@ import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.experimental.FieldNameConstants; diff --git a/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/tree/GroovyIndexedTest.java b/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/tree/GroovyIndexedTest.java index 6de9840e8e..d5549e0723 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/tree/GroovyIndexedTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/datasets/concepts/tree/GroovyIndexedTest.java @@ -9,7 +9,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.validation.Validator; +import jakarta.validation.Validator; import com.bakdata.conquery.io.jackson.Injectable; import com.bakdata.conquery.io.jackson.Jackson; diff --git a/backend/src/test/java/com/bakdata/conquery/models/query/DefaultColumnNameTest.java b/backend/src/test/java/com/bakdata/conquery/models/query/DefaultColumnNameTest.java index 8043860107..8f183f1bb1 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/query/DefaultColumnNameTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/query/DefaultColumnNameTest.java @@ -14,8 +14,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.validation.Validator; - import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -36,6 +34,7 @@ import com.bakdata.conquery.models.worker.LocalNamespace; import com.bakdata.conquery.models.worker.Namespace; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.params.ParameterizedTest; diff --git a/backend/src/test/java/com/bakdata/conquery/util/support/ConfigOverride.java b/backend/src/test/java/com/bakdata/conquery/util/support/ConfigOverride.java index 23cd1dedbd..ec595bb877 100644 --- a/backend/src/test/java/com/bakdata/conquery/util/support/ConfigOverride.java +++ b/backend/src/test/java/com/bakdata/conquery/util/support/ConfigOverride.java @@ -2,12 +2,13 @@ import java.io.File; import java.net.ServerSocket; +import java.util.Collection; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.config.XodusStoreFactory; +import io.dropwizard.core.server.DefaultServerFactory; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; -import io.dropwizard.server.DefaultServerFactory; import lombok.SneakyThrows; import org.apache.commons.collections4.CollectionUtils; import org.junit.jupiter.api.TestInstance; @@ -15,17 +16,10 @@ /** * This interface allows to override the configuration used in tests. - * */ @TestInstance(Lifecycle.PER_CLASS) public interface ConfigOverride { - /** - * Is called upon initialization of the test instance of Conquery. - * @param config The configuration that is initialized with the defaults. - */ - void override(ConqueryConfig config); - @SneakyThrows static void configurePathsAndLogging(ConqueryConfig config, File tmpDir) { @@ -46,11 +40,12 @@ static void configurePathsAndLogging(ConqueryConfig config, File tmpDir) { static void configureRandomPorts(ConqueryConfig config) { // set random open ports - for (ConnectorFactory con : CollectionUtils - .union( - ((DefaultServerFactory) config.getServerFactory()).getAdminConnectors(), - ((DefaultServerFactory) config.getServerFactory()).getApplicationConnectors() - )) { + final Collection connectorFactories = CollectionUtils.union( + ((DefaultServerFactory) config.getServerFactory()).getAdminConnectors(), + ((DefaultServerFactory) config.getServerFactory()).getApplicationConnectors() + ); + + for (ConnectorFactory con : connectorFactories) { try (ServerSocket s = new ServerSocket(0)) { ((HttpConnectorFactory) con).setPort(s.getLocalPort()); } @@ -60,4 +55,11 @@ static void configureRandomPorts(ConqueryConfig config) { } } + /** + * Is called upon initialization of the test instance of Conquery. + * + * @param config The configuration that is initialized with the defaults. + */ + void override(ConqueryConfig config); + } diff --git a/backend/src/test/java/com/bakdata/conquery/util/support/StandaloneSupport.java b/backend/src/test/java/com/bakdata/conquery/util/support/StandaloneSupport.java index 7e246c5818..1abc9b0fc9 100644 --- a/backend/src/test/java/com/bakdata/conquery/util/support/StandaloneSupport.java +++ b/backend/src/test/java/com/bakdata/conquery/util/support/StandaloneSupport.java @@ -5,12 +5,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Validator; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.commands.PreprocessorCommand; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.integration.json.TestDataImporter; @@ -28,7 +22,12 @@ import com.bakdata.conquery.resources.admin.rest.AdminDatasetProcessor; import com.bakdata.conquery.resources.admin.rest.AdminProcessor; import com.google.common.util.concurrent.MoreExecutors; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; +import jakarta.validation.Validator; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.UriBuilder; import lombok.Data; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/com/bakdata/conquery/util/support/TestBootstrappingConquery.java b/backend/src/test/java/com/bakdata/conquery/util/support/TestBootstrappingConquery.java index 01a551fede..6571f52c2a 100644 --- a/backend/src/test/java/com/bakdata/conquery/util/support/TestBootstrappingConquery.java +++ b/backend/src/test/java/com/bakdata/conquery/util/support/TestBootstrappingConquery.java @@ -3,8 +3,6 @@ import java.io.File; import java.io.IOException; -import javax.validation.Validator; - import com.bakdata.conquery.Conquery; import com.bakdata.conquery.models.config.ConqueryConfig; import com.fasterxml.jackson.databind.JsonNode; @@ -13,9 +11,10 @@ import io.dropwizard.configuration.ConfigurationFactory; import io.dropwizard.configuration.DefaultConfigurationFactoryFactory; import io.dropwizard.configuration.YamlConfigurationFactory; -import io.dropwizard.logging.BootstrapLogging; -import io.dropwizard.logging.DropwizardLayout; -import io.dropwizard.setup.Bootstrap; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.logging.common.BootstrapLogging; +import io.dropwizard.logging.common.DropwizardLayout; +import jakarta.validation.Validator; public class TestBootstrappingConquery extends Conquery { diff --git a/backend/src/test/java/com/bakdata/conquery/util/support/TestConquery.java b/backend/src/test/java/com/bakdata/conquery/util/support/TestConquery.java index 1832db13ec..4346306bc3 100644 --- a/backend/src/test/java/com/bakdata/conquery/util/support/TestConquery.java +++ b/backend/src/test/java/com/bakdata/conquery/util/support/TestConquery.java @@ -12,9 +12,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.validation.Validator; -import javax.ws.rs.client.Client; - import com.bakdata.conquery.Conquery; import com.bakdata.conquery.commands.DistributedStandaloneCommand; import com.bakdata.conquery.commands.ShardNode; @@ -36,9 +33,11 @@ import com.bakdata.conquery.util.Wait; import com.bakdata.conquery.util.io.Cloner; import com.google.common.util.concurrent.Uninterruptibles; -import io.dropwizard.cli.Command; import io.dropwizard.client.JerseyClientBuilder; +import io.dropwizard.core.cli.Command; import io.dropwizard.testing.DropwizardTestSupport; +import jakarta.validation.Validator; +import jakarta.ws.rs.client.Client; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/backend/src/test/java/com/bakdata/conquery/util/support/TestLoggingFactory.java b/backend/src/test/java/com/bakdata/conquery/util/support/TestLoggingFactory.java index 7e13bda4da..20b2e1231f 100644 --- a/backend/src/test/java/com/bakdata/conquery/util/support/TestLoggingFactory.java +++ b/backend/src/test/java/com/bakdata/conquery/util/support/TestLoggingFactory.java @@ -3,22 +3,13 @@ import static java.util.Objects.requireNonNull; import java.io.PrintStream; -import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.concurrent.locks.ReentrantLock; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; -import javax.management.ObjectName; - import ch.qos.logback.classic.AsyncAppender; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.jmx.JMXConfigurator; import ch.qos.logback.classic.jul.LevelChangePropagator; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; @@ -29,15 +20,15 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; -import io.dropwizard.logging.ConsoleAppenderFactory; -import io.dropwizard.logging.LoggingFactory; -import io.dropwizard.logging.LoggingUtil; -import io.dropwizard.logging.async.AsyncAppenderFactory; -import io.dropwizard.logging.async.AsyncLoggingEventAppenderFactory; -import io.dropwizard.logging.filter.LevelFilterFactory; -import io.dropwizard.logging.filter.ThresholdLevelFilterFactory; -import io.dropwizard.logging.layout.DropwizardLayoutFactory; -import io.dropwizard.logging.layout.LayoutFactory; +import io.dropwizard.logging.common.ConsoleAppenderFactory; +import io.dropwizard.logging.common.LoggingFactory; +import io.dropwizard.logging.common.LoggingUtil; +import io.dropwizard.logging.common.async.AsyncAppenderFactory; +import io.dropwizard.logging.common.async.AsyncLoggingEventAppenderFactory; +import io.dropwizard.logging.common.filter.LevelFilterFactory; +import io.dropwizard.logging.common.filter.ThresholdLevelFilterFactory; +import io.dropwizard.logging.common.layout.DropwizardLayoutFactory; +import io.dropwizard.logging.common.layout.LayoutFactory; public class TestLoggingFactory implements LoggingFactory { @@ -91,20 +82,21 @@ public void configure(MetricRegistry metricRegistry, String name) { StatusPrinter.setPrintStream(System.out); } - final MBeanServer server = ManagementFactory.getPlatformMBeanServer(); - MBEAN_REGISTRATION_LOCK.lock(); - try { - final ObjectName objectName = new ObjectName("io.dropwizard:type=Logging"); - if (!server.isRegistered(objectName)) { - server.registerMBean(new JMXConfigurator(loggerContext, server, objectName), objectName); - } - } - catch (MalformedObjectNameException | InstanceAlreadyExistsException | NotCompliantMBeanException | MBeanRegistrationException e) { - throw new RuntimeException(e); - } - finally { - MBEAN_REGISTRATION_LOCK.unlock(); - } + //TODO whatt does this even do!? +// final MBeanServer server = ManagementFactory.getPlatformMBeanServer(); +// MBEAN_REGISTRATION_LOCK.lock(); +// try { +// final ObjectName objectName = new ObjectName("io.dropwizard:type=Logging"); +// if (!server.isRegistered(objectName)) { +// server.registerMBean(new JMXConfigurator(loggerContext, server, objectName), objectName); +// } +// } +// catch (MalformedObjectNameException | InstanceAlreadyExistsException | NotCompliantMBeanException | MBeanRegistrationException e) { +// throw new RuntimeException(e); +// } +// finally { +// MBEAN_REGISTRATION_LOCK.unlock(); +// } configureInstrumentation(root, metricRegistry); } diff --git a/backend/src/test/java/com/bakdata/conquery/util/support/TestSupport.java b/backend/src/test/java/com/bakdata/conquery/util/support/TestSupport.java index 6f878f6c9d..3f0a4b8763 100644 --- a/backend/src/test/java/com/bakdata/conquery/util/support/TestSupport.java +++ b/backend/src/test/java/com/bakdata/conquery/util/support/TestSupport.java @@ -1,9 +1,5 @@ package com.bakdata.conquery.util.support; -import javax.validation.Validator; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.io.storage.NamespaceStorage; import com.bakdata.conquery.models.auth.AuthorizationController; @@ -11,6 +7,9 @@ import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.worker.Namespace; +import jakarta.validation.Validator; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.UriBuilder; public interface TestSupport {