diff --git a/autodoc/src/main/java/com/bakdata/conquery/Constants.java b/autodoc/src/main/java/com/bakdata/conquery/Constants.java index 005ad4a0b43..273b12682ce 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 daeaccefffa..91f9c9d8443 100644 --- a/autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java +++ b/autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java @@ -16,8 +16,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.introspection.Introspection; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.Jackson; @@ -47,6 +45,7 @@ import io.github.classgraph.TypeParameter; import io.github.classgraph.TypeSignature; import io.github.classgraph.TypeVariableSignature; +import jakarta.ws.rs.core.UriBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; diff --git a/backend/src/main/java/com/bakdata/conquery/Conquery.java b/backend/src/main/java/com/bakdata/conquery/Conquery.java index 0e28353dfe6..269c0965691 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.CollectEntitiesCommand; import com.bakdata.conquery.commands.DistributedStandaloneCommand; @@ -18,12 +16,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 03cda498bac..b2cdb521c69 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java @@ -2,9 +2,6 @@ import java.net.URI; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; @@ -25,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.OptBoolean; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; 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 39fe58b4bab..1f95091d28b 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java @@ -1,9 +1,8 @@ package com.bakdata.conquery.apiv1; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.models.identifiable.ids.Id; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; 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 18dc7b923dd..16e2794dbca 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java @@ -5,8 +5,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.AuthorizationHelper; import com.bakdata.conquery.models.auth.entities.User; @@ -17,6 +15,7 @@ import com.bakdata.conquery.models.worker.DatasetRegistry; import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.resources.api.MeResource; +import jakarta.inject.Inject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; 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 5aa1182101a..da2708eb66b 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java @@ -24,12 +24,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; @@ -98,6 +92,11 @@ import com.google.common.collect.MutableClassToInstanceMap; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; +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 f206d3b2a89..825d2896142 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 da93e28bd65..f004570c4a8 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/ApiTokenDataRepresentation.java b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ApiTokenDataRepresentation.java index a95156501c0..98dbffcb3f1 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ApiTokenDataRepresentation.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/auth/ApiTokenDataRepresentation.java @@ -1,21 +1,19 @@ package com.bakdata.conquery.apiv1.auth; -import com.bakdata.conquery.io.storage.MetaStorage; -import com.bakdata.conquery.models.auth.apitoken.ApiTokenData; -import com.bakdata.conquery.models.auth.apitoken.ApiTokenRealm; -import com.bakdata.conquery.models.auth.apitoken.Scopes; -import com.bakdata.conquery.models.auth.entities.User; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.dropwizard.validation.ValidationMethod; -import lombok.*; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.Set; import java.util.UUID; +import com.bakdata.conquery.models.auth.apitoken.Scopes; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + /** * Container class for how tokens are represented through the API. * This is necessary so that the actual token and it's hash are not leaked (with except for the token on creation). 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 31f161579ea..4db84fbf0e8 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,11 +1,10 @@ package com.bakdata.conquery.apiv1.auth; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; -import com.bakdata.conquery.models.config.auth.AuthorizationConfig; import com.bakdata.conquery.models.auth.basic.LocalAuthenticationRealm; +import com.bakdata.conquery.models.config.auth.AuthorizationConfig; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.RequiredArgsConstructor; 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 6d57ee44dee..282ec717411 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 @@ -4,10 +4,6 @@ import java.util.List; 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; @@ -15,6 +11,9 @@ import com.bakdata.conquery.models.auth.permissions.WildcardPermission; 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 2c759685b1c..a246b6f6134 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 16257945f4b..6a3226ffc63 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,14 +3,13 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.forms.configs.FormConfig; import com.bakdata.conquery.util.VariableDefaultValue; import com.fasterxml.jackson.databind.JsonNode; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; 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 2f58701d2ee..b7528e56ef7 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 a7223e4e69a..c382856d0b6 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 63f37f96b8d..39263662636 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,6 @@ 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 c10n.C10N; import com.bakdata.conquery.ConqueryConstants; @@ -43,6 +39,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableList; +import jakarta.validation.Valid; +import jakarta.validation.ValidationException; +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/apiv1/forms/export_form/FullExportForm.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/FullExportForm.java index f457c1a04fa..9f81d8bad0f 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,6 @@ import java.util.function.Consumer; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; import c10n.C10N; import com.bakdata.conquery.ConqueryConstants; @@ -37,6 +35,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableList; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; 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 07c50073412..fcf155796f9 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 eca2fd13453..77e695eba75 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,12 +5,12 @@ import java.util.Map; import javax.annotation.Nullable; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.FilterTemplate; import com.bakdata.conquery.models.identifiable.ids.specific.FilterId; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; 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 824c0ef696b..a9e106ecfbd 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,13 +4,12 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.EntityTag; - import com.bakdata.conquery.models.identifiable.ids.specific.ConceptElementId; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializable; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; +import jakarta.ws.rs.core.EntityTag; import lombok.Getter; import org.apache.commons.lang3.tuple.Pair; 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 6eeace55957..b5afd4a65af 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,12 +3,11 @@ import java.time.LocalDate; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.KeyValue; import com.bakdata.conquery.models.common.Range; import com.bakdata.conquery.models.identifiable.ids.Id; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; 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 a1a883f3864..62d08c91159 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,9 +5,8 @@ import java.util.Map; import java.util.Set; -import javax.validation.Valid; - import com.bakdata.conquery.models.identifiable.ids.Id; +import jakarta.validation.Valid; 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 d68285401f9..e154778cba9 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,14 +3,13 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.identifiable.ids.specific.ConnectorId; import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId; import com.bakdata.conquery.models.identifiable.ids.specific.TableId; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; 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 a55793d4cc5..cf9344539b5 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 704e672cb8a..8088dd09c8a 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 da4d655d291..3ddece071f9 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 31495a2cf25..8e5a50842f4 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 @@ -7,7 +7,6 @@ import java.util.function.Consumer; import javax.annotation.CheckForNull; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; @@ -32,6 +31,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 bd5116638ff..c756e9cccc0 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 b858c3741d3..21b28c3927c 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 @@ -4,8 +4,6 @@ import java.util.List; 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; @@ -18,6 +16,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 8ff915eafd6..39e4084b64a 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 @@ -3,9 +3,6 @@ import java.io.IOException; import java.math.BigDecimal; -import javax.annotation.Nonnull; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.io.cps.CPSType; @@ -34,17 +31,18 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.exc.InvalidTypeIdException; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.SneakyThrows; import lombok.ToString; @Getter @Setter -@RequiredArgsConstructor +@AllArgsConstructor @NoArgsConstructor @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "type") @CPSBase @@ -56,12 +54,10 @@ public abstract class FilterValue { */ private static final int MAX_NUMBER_FILTER_VALUES = 20_000; @NotNull - @Nonnull @NsIdRef private Filter filter; @NotNull - @Nonnull private VALUE value; 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 058c521afdf..320ed0721ae 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 e425c8f1069..7553f7a1d76 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 @@ -9,10 +9,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; @@ -50,6 +46,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 be315465c5f..58f9bdefbff 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 @@ -5,9 +5,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.CQElement; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.CDateSet; @@ -22,6 +19,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 58f37a6b262..4300e6d4a76 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 @@ -3,9 +3,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.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 bab24d2f7d9..b723b12e5a7 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 e6f9116f21f..199e8d5088f 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 dc0fa1c0f88..3f7b5454cd2 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 8030c5c6c99..25cd59a259e 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.google.common.collect.Streams; import io.dropwizard.validation.ValidationMethod; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +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 9045dee23ae..febf2766dbf 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/CollectEntitiesCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/CollectEntitiesCommand.java index 45c60ca39ef..f1db16d8d77 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/CollectEntitiesCommand.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/CollectEntitiesCommand.java @@ -31,8 +31,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.powerlibraries.io.Out; import com.google.common.collect.Sets; -import io.dropwizard.cli.Command; -import io.dropwizard.setup.Bootstrap; +import io.dropwizard.core.cli.Command; +import io.dropwizard.core.setup.Bootstrap; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 7176b61a431..8e86590476d 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 2342a6eadf9..60064ff0fa4 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 c7b649fe1fd..31d0aab9d95 100644 --- a/backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java +++ b/backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java @@ -9,9 +9,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.validation.Validator; -import javax.ws.rs.client.Client; - import com.bakdata.conquery.io.cps.CPSTypeIdResolver; import com.bakdata.conquery.io.jackson.MutableInjectableValues; import com.bakdata.conquery.io.jackson.PathParamInjector; @@ -40,9 +37,11 @@ import com.fasterxml.jackson.databind.SerializationConfig; import com.google.common.base.Throwables; import io.dropwizard.client.JerseyClientBuilder; +import io.dropwizard.core.setup.Environment; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.lifecycle.Managed; -import io.dropwizard.setup.Environment; +import jakarta.validation.Validator; +import jakarta.ws.rs.client.Client; 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 5a5484184dd..abc52905653 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 d61543db3c0..ea5f91cd780 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 a129201bfd3..816aa8819bc 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 a2bb9e62a2c..0f631a615b6 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 5f4b6015528..abf7ec7fe3f 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 23fee291602..d7090073739 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,14 +7,6 @@ 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 com.bakdata.conquery.apiv1.forms.ExternalForm; import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.auth.permissions.Ability; @@ -24,6 +16,13 @@ import com.codahale.metrics.health.HealthCheck; import com.fasterxml.jackson.databind.node.ObjectNode; import io.dropwizard.health.check.http.HttpHealthCheck; +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 lombok.extern.slf4j.Slf4j; @Slf4j 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 b4c56d189a9..d04deff8312 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,16 +4,15 @@ 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 com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.models.error.SimpleErrorInfo; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data 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 3434ee5bc89..ca887fb1016 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 8f4b0af0562..13127332798 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,20 +3,17 @@ 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 com.bakdata.conquery.io.storage.MetaStorage; -import com.bakdata.conquery.models.identifiable.CentralRegistry; import com.bakdata.conquery.models.identifiable.Identifiable; import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; import com.bakdata.conquery.models.identifiable.ids.NamespacedId; import com.bakdata.conquery.models.worker.DatasetRegistry; +import jakarta.inject.Inject; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; @NoArgsConstructor @AllArgsConstructor 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 6715ec61bdd..a79214272d5 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,11 +1,10 @@ package com.bakdata.conquery.io.jackson; -import javax.ws.rs.ext.ParamConverter; - import com.bakdata.conquery.models.identifiable.CentralRegistry; import com.bakdata.conquery.models.identifiable.Identifiable; import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; +import jakarta.ws.rs.ext.ParamConverter; import lombok.NonNull; import lombok.RequiredArgsConstructor; 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 3f816bf52fc..b4acb56e617 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,12 +1,11 @@ package com.bakdata.conquery.io.jackson; -import javax.ws.rs.ext.ParamConverter; - import com.bakdata.conquery.models.identifiable.Identifiable; import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; import com.bakdata.conquery.models.identifiable.ids.NamespacedId; import com.bakdata.conquery.models.worker.DatasetRegistry; +import jakarta.ws.rs.ext.ParamConverter; import lombok.NonNull; import lombok.RequiredArgsConstructor; 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 ded8a2b635c..fdc6c5f4d9f 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 352882b4c4a..e3b69042633 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 @@ -1,12 +1,11 @@ package com.bakdata.conquery.io.jackson.serializer; +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; - -import javax.ws.rs.core.MediaType; -import java.io.IOException; +import jakarta.ws.rs.core.MediaType; public class MediaTypeDeserializer extends JsonDeserializer { @Override 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 cfc638a231c..45ff93428f2 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,12 +3,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; - import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; import com.bakdata.conquery.models.identifiable.ids.IdUtil.Parser; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; public class IdParamConverter> implements ParamConverter { 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 1346945138f..58df93a833d 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,12 +3,11 @@ 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 com.bakdata.conquery.models.i18n.I18n; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; /** * Extracts the user specific locale for internationalization, that is contained 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 abea3c15ad9..10d80d43c47 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,17 +6,15 @@ 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 com.bakdata.conquery.io.jackson.Jackson; import com.fasterxml.jackson.databind.ObjectMapper; +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 lombok.RequiredArgsConstructor; @Provider 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 2531a57e465..9a042aeb5fb 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 7d774555369..fccd44a4097 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 b4215535fe1..fdcb052738f 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 ff8e1b0695f..fa157ff9f16 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 22d52925f92..50625b48d13 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 644e7d049e3..920c507e0a5 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 4662974ef1b..d19e288173c 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,27 +1,24 @@ 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 org.glassfish.jersey.server.ContainerRequest; - import com.google.common.base.Joiner; import com.google.common.collect.Iterables; - import io.dropwizard.jersey.errors.ErrorMessage; +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 lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.glassfish.jersey.server.ContainerRequest; @Slf4j @Provider @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 f751f9f31f6..cd73a975c7c 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,10 +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; @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 130d05f1ee4..2bfdb36dcec 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 26e994479d7..c5d98253ccf 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 e97a9b8e78f..92afcfdabf3 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,12 +3,11 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.models.execution.ManagedExecution; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; /** * Interface for executions, whose final result is produced externally. 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 fe44f332785..eb26f82c9a8 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 c37ce87e005..e49a9554ba5 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 6e9c535fc9c..8fe379c0d3f 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 @@ -11,11 +11,6 @@ import java.util.Locale; 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; @@ -31,6 +26,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 543cf3a1955..1debf251e43 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 @@ -8,12 +8,6 @@ import java.nio.charset.Charset; import java.util.Locale; -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; @@ -28,6 +22,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 12c586b6446..5e17c26bcab 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 @@ -4,11 +4,6 @@ import java.util.Locale; -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; @@ -24,6 +19,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 7fac0a1085c..4ff6f3d541d 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,13 +1,12 @@ package com.bakdata.conquery.io.result.external; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.io.result.ExternalResult; import com.bakdata.conquery.io.result.ResultUtil; import com.bakdata.conquery.models.auth.entities.Subject; import com.bakdata.conquery.models.execution.ManagedExecution; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor_ = @Inject) 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 6676d0b14e9..0e0608b41b4 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 @@ -4,11 +4,6 @@ import java.util.Locale; -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; @@ -24,6 +19,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 5fa5e50969a..94d75187c12 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 @@ -3,8 +3,6 @@ import java.util.Collection; import java.util.Objects; -import javax.validation.Validator; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.io.storage.xodus.stores.KeyIncludingStore; import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore; @@ -24,6 +22,7 @@ import com.bakdata.conquery.models.worker.WorkerToBucketsMap; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import jakarta.validation.Validator; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; 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 4fe3f60e242..d854689a146 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,9 +5,6 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; - import com.bakdata.conquery.io.storage.xodus.stores.KeyIncludingStore; import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore; import com.bakdata.conquery.mode.StorageHandler; @@ -30,6 +27,8 @@ import com.bakdata.conquery.models.identifiable.ids.specific.TableId; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; import lombok.Getter; import lombok.SneakyThrows; import lombok.ToString; 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 fe6130307d7..821a5f4621a 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.KeyIncludingStore; import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore; import com.bakdata.conquery.mode.cluster.ClusterStorageHandler; @@ -17,6 +15,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 4beb3633c09..d0e4b11be7f 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 bffb1a5426c..fe7ac7e0e99 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 d6b85d91e37..9b84d6619d2 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 b4bf4ef7cdd..f4a402adced 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 3706f728a01..6d5c15020f9 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,6 @@ package com.bakdata.conquery.mode; import javax.annotation.Nullable; -import javax.validation.Validator; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.jackson.MutableInjectableValues; @@ -13,6 +12,7 @@ import com.fasterxml.jackson.databind.DeserializationConfig; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationConfig; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; 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 d2cc6fee79a..b896aeda246 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/Manager.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/Manager.java @@ -10,9 +10,9 @@ 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.lifecycle.Managed; import io.dropwizard.servlets.tasks.Task; -import io.dropwizard.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 c82eab5779e..024fd0ef77a 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/ManagerProvider.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/ManagerProvider.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.mode; -import javax.validation.Validator; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.mode.cluster.ClusterStorageHandler; import com.bakdata.conquery.mode.local.SqlStorageHandler; @@ -13,7 +11,8 @@ import com.bakdata.conquery.models.worker.LocalNamespace; import com.bakdata.conquery.models.worker.Namespace; import com.bakdata.conquery.sql.execution.SqlExecutionService; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; +import jakarta.validation.Validator; /** * 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 b9101d6b626..9a2340c5db4 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 ec25ecab4df..10a86ecbf15 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,11 +17,12 @@ 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 { + @Override public ClusterManager provideManager(ConqueryConfig config, Environment environment) { final JobManager jobManager = ManagerProvider.newJobManager(config); final InternalObjectMapperCreator creator = ManagerProvider.newInternalObjectMapperCreator(config, environment.getValidator()); 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 6214b223749..7ec6b551dde 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/ConqueryAuthenticationRealm.java b/backend/src/main/java/com/bakdata/conquery/models/auth/ConqueryAuthenticationRealm.java index c8afae54dda..595d61ecdd4 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/apitoken/ApiToken.java b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiToken.java index 15df971cdac..9d461d863ab 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiToken.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiToken.java @@ -1,25 +1,23 @@ package com.bakdata.conquery.models.auth.apitoken; +import java.security.NoSuchAlgorithmException; +import java.security.spec.InvalidKeySpecException; +import java.util.Arrays; +import java.util.UUID; + +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AccessLevel; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.Setter; import org.apache.http.util.CharArrayBuffer; import org.apache.shiro.authc.AuthenticationToken; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.nio.CharBuffer; -import java.security.NoSuchAlgorithmException; -import java.security.spec.InvalidKeySpecException; -import java.util.Arrays; -import java.util.UUID; - /** * Container for a sensitive token that allows to use the APIs (see {@link ApiTokenRealm}) * This object only carries the authenticating part of the token. The authorizing part is within a corresponding diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenCreator.java b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenCreator.java index ef48f4f6152..fe17f5b2f90 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenCreator.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenCreator.java @@ -1,16 +1,12 @@ package com.bakdata.conquery.models.auth.apitoken; +import java.security.SecureRandom; +import java.util.Random; + import lombok.Data; import org.apache.http.util.CharArrayBuffer; import org.jetbrains.annotations.TestOnly; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.security.spec.InvalidKeySpecException; -import java.util.Random; - /** * Provider for random generated API tokens. * diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenData.java b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenData.java index 757bf896dc6..ed9f89b64fa 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenData.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenData.java @@ -4,9 +4,6 @@ import java.util.Set; import java.util.UUID; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.auth.permissions.Ability; @@ -20,6 +17,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.Data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenRealm.java b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenRealm.java index 07c32f016f1..b763bfe64f8 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenRealm.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/ApiTokenRealm.java @@ -7,8 +7,6 @@ import java.util.Optional; import java.util.UUID; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.auth.ApiTokenDataRepresentation; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.ConqueryAuthenticationInfo; @@ -18,6 +16,7 @@ import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.auth.util.SkippingCredentialsMatcher; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; +import jakarta.validation.constraints.NotNull; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Pair; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/TokenStorage.java b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/TokenStorage.java index 86b34d5267c..1d823755e1a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/TokenStorage.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/apitoken/TokenStorage.java @@ -10,8 +10,6 @@ import java.util.UUID; import java.util.concurrent.Executors; -import javax.validation.Validator; - import com.bakdata.conquery.io.storage.Store; import com.bakdata.conquery.io.storage.StoreMappings; import com.bakdata.conquery.io.storage.xodus.stores.SerializingStore; @@ -20,6 +18,7 @@ import com.bakdata.conquery.util.io.FileUtil; import com.fasterxml.jackson.databind.ObjectMapper; import io.dropwizard.lifecycle.Managed; +import jakarta.validation.Validator; import jetbrains.exodus.ExodusException; import jetbrains.exodus.env.Environment; import jetbrains.exodus.env.EnvironmentClosedException; 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 1e156b883d7..49d6a9dfd53 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,16 +5,14 @@ import java.util.Random; import javax.annotation.Nullable; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import io.dropwizard.auth.oauth.OAuthCredentialAuthFilter; import io.dropwizard.util.Duration; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; 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 e2686f2125d..3523cd5616c 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 @@ -6,8 +6,6 @@ import java.util.Optional; import java.util.concurrent.Executors; -import javax.validation.Validator; - import com.bakdata.conquery.Conquery; import com.bakdata.conquery.apiv1.auth.CredentialType; import com.bakdata.conquery.apiv1.auth.PasswordCredential; @@ -30,6 +28,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.MoreCollectors; import io.dropwizard.util.Duration; +import jakarta.validation.Validator; import jetbrains.exodus.ExodusException; import jetbrains.exodus.env.Environment; import jetbrains.exodus.env.EnvironmentClosedException; diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/basic/PasswordHasher.java b/backend/src/main/java/com/bakdata/conquery/models/auth/basic/PasswordHasher.java index 8a12d1cd9f3..8faac350e38 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/auth/basic/PasswordHasher.java +++ b/backend/src/main/java/com/bakdata/conquery/models/auth/basic/PasswordHasher.java @@ -1,6 +1,5 @@ package com.bakdata.conquery.models.auth.basic; -import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.spec.InvalidKeySpecException; @@ -8,10 +7,6 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; -import com.bakdata.conquery.io.jackson.Jackson; -import com.fasterxml.jackson.core.JsonProcessingException; -import jetbrains.exodus.ArrayByteIterable; -import jetbrains.exodus.ByteIterable; import lombok.Data; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; 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 476353d5978..a21332e1aed 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 be6f9ee1fa2..279e693356a 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 2f04dd7be96..ff545a6e409 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 5092dfe5725..76a890c4ad8 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 6ea9d5189c7..51a5bc45c3b 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,13 +3,12 @@ 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 com.bakdata.conquery.models.config.auth.IntrospectionDelegatingRealmFactory; import com.bakdata.conquery.util.ResourceUtil; import com.google.common.base.Preconditions; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; import lombok.extern.slf4j.Slf4j; @Slf4j 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 467c7328085..e783edbbed2 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,9 +3,8 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.validation.constraints.NotEmpty; @JsonIgnoreProperties(ignoreUnknown = true) public record KeycloakGroup( 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 ede4952fde6..8b6c045ea7f 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,8 +2,6 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.models.auth.basic.AccessTokenCreator; import com.bakdata.conquery.models.config.auth.IntrospectionDelegatingRealmFactory; import com.nimbusds.oauth2.sdk.AccessTokenResponse; @@ -15,6 +13,7 @@ import com.nimbusds.oauth2.sdk.auth.Secret; import com.nimbusds.oauth2.sdk.http.HTTPResponse; import com.nimbusds.oauth2.sdk.token.AccessToken; +import jakarta.ws.rs.core.UriBuilder; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; 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 7ea128d265a..bc26db578e5 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,26 +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; /** * This filter is only used for the admin endpoints which serve static sites @@ -84,7 +79,7 @@ public void filter(ContainerRequestContext request, ContainerResponseContext res log.debug("Overwriting {} cookie", ACCESS_TOKEN); } response.getHeaders().add( - HttpHeader.SET_COOKIE.toString(), + HttpHeaders.SET_COOKIE, cookieCreator.apply(request,token) ); 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 f20c2016136..84e22e5a8dc 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 ed6961eb698..4162a49ca2f 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 ed94d8bc7ee..a512806c3f8 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 @@ -1,5 +1,9 @@ package com.bakdata.conquery.models.auth.web; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.AuthorizationController; import com.bakdata.conquery.models.auth.ConqueryAuthenticationRealm; @@ -8,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; @@ -16,16 +26,6 @@ import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationToken; -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 java.io.IOException; -import java.util.HashSet; -import java.util.Set; - /** * This filter hooks into dropwizard's request handling to extract and process * security relevant information for protected resources. The request is first 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 4fe56294ee7..9c03c089154 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 @@ -1,23 +1,28 @@ package com.bakdata.conquery.models.auth.web; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + 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; import org.apache.shiro.authc.AuthenticationToken; -import javax.annotation.Priority; -import javax.ws.rs.*; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Response; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; - /** * The {@link RedirectingAuthFilter} first delegates a request to the actual authentication filter. * If that filter is unable to map a user to the request, this filter checks if this request is in 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 59b695aa3ca..6e4ffed3b42 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 777cc00cb46..8fc2f6749a2 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 f47cc6bd0e6..3337b670899 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 9fe3ad7a6be..b04edbf68f2 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 b923c7bad4c..80a98a320b9 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 d04ad65584d..9e148bd223b 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 aa6172544d6..09bd6f1d6b3 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 01d4b4aa5ad..c29370dfc40 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 @@ -1,7 +1,13 @@ package com.bakdata.conquery.models.config; +import java.util.Collections; +import java.util.Map; + import com.bakdata.conquery.models.query.PrintSettings; import com.google.common.collect.ImmutableMap; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,15 +18,6 @@ import org.apache.poi.ss.usermodel.Font; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFDataFormat; -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 java.util.Collections; -import java.util.Map; @Data public class ExcelConfig { 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 3d15f845e65..ead7354f6ed 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,11 +7,6 @@ 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 com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; @@ -22,6 +17,10 @@ import com.bakdata.conquery.resources.api.ResultExcelResource; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.jersey.DropwizardResourceConfig; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriBuilder; import lombok.Data; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; 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 2e85348ffa7..0e0d311fb3a 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,8 +3,6 @@ import java.util.Collection; import java.util.Collections; -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; @@ -14,6 +12,7 @@ import com.bakdata.conquery.models.execution.ManagedExecution; import com.bakdata.conquery.resources.api.ResultExternalResource; import io.dropwizard.jersey.DropwizardResourceConfig; +import jakarta.ws.rs.core.UriBuilder; import lombok.Getter; import lombok.Setter; import org.glassfish.hk2.utilities.binding.AbstractBinder; 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 d8845e24eed..d2f144772d8 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,12 +6,6 @@ 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 com.bakdata.conquery.apiv1.forms.ExternalForm; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; @@ -31,6 +25,11 @@ import com.google.common.collect.ImmutableCollection; import io.dropwizard.client.JerseyClientBuilder; import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider; +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 lombok.Data; import lombok.extern.slf4j.Slf4j; 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 531f08d82ab..411a29117b3 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,13 +4,13 @@ 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 com.bakdata.conquery.models.forms.frontendconfiguration.FormScanner; import com.fasterxml.jackson.annotation.JsonAlias; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; 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 14571028265..244e5964fe3 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,9 +10,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.apiv1.query.concept.specific.external.DateFormat; import com.bakdata.conquery.models.identifiable.mapping.EntityIdMap; import com.bakdata.conquery.models.query.resultinfo.LocalizedDefaultResultInfo; @@ -23,6 +20,8 @@ import com.google.common.base.Functions; import com.google.common.collect.MoreCollectors; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +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/config/IndexConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IndexConfig.java index c027587ff4c..4f69ad90ef9 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,12 +4,12 @@ import java.net.URI; import javax.annotation.Nullable; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.models.index.IndexKey; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.extern.slf4j.Slf4j; 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 9b92381ab8b..9c1bca4bbab 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,16 +7,15 @@ import java.util.Set; import java.util.StringJoiner; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - import com.bakdata.conquery.models.common.CDateSet; import com.bakdata.conquery.models.common.daterange.CDateRange; import com.bakdata.conquery.models.exceptions.ParsingException; import com.bakdata.conquery.util.DateReader; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Sets; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import lombok.Getter; import lombok.NonNull; 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 41a5ed3a1e6..ba58715c318 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 @@ -1,14 +1,9 @@ package com.bakdata.conquery.models.config; -import java.net.MalformedURLException; import java.net.URI; import java.util.Collections; -import java.util.List; import java.util.Map; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.util.validation.ManualURI; import lombok.Getter; 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 d6560a6fbba..4bc8c51b98e 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,14 +1,12 @@ package com.bakdata.conquery.models.config; -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 io.dropwizard.util.DataSize; import lombok.Getter; import lombok.Setter; +import org.apache.mina.core.session.IdleStatus; +import org.apache.mina.core.session.IoSessionConfig; @Getter @Setter public class MinaConfig implements IoSessionConfig { @@ -20,7 +18,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 aa3d66f20c3..c34becd17cc 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,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.ResultParquetResource; import io.dropwizard.jersey.DropwizardResourceConfig; +import jakarta.ws.rs.core.UriBuilder; import lombok.Data; import org.glassfish.hk2.utilities.binding.AbstractBinder; 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 dc9e310132e..5e49d0d8544 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 @@ -1,13 +1,11 @@ package com.bakdata.conquery.models.config; -import com.bakdata.conquery.util.DateReader; +import java.util.Currency; + +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.Setter; -import javax.validation.constraints.NotNull; - -import java.util.*; - @Data @Setter public class ParserConfig { 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 82ae0f03e2e..09dfe0698b6 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 661bc775a32..faba2ae254d 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 0f8a2aa70a6..6bbcd299736 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,218 @@ 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; + + //TODO make sure this is the same as previous Size! + @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);} - + 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 2aa54ed50ef..feb1d385373 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; @@ -73,6 +69,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 jetbrains.exodus.env.Environments; import lombok.AllArgsConstructor; 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 91978d693b5..ccec1d9d192 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/ApiTokenRealmFactory.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiTokenRealmFactory.java index 7884bdb3b93..10591d11282 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiTokenRealmFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/models/config/auth/ApiTokenRealmFactory.java @@ -2,10 +2,6 @@ import java.nio.file.Path; -import javax.validation.constraints.NotNull; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.Jackson; @@ -17,8 +13,11 @@ import com.bakdata.conquery.models.auth.web.DefaultAuthFilter; import com.bakdata.conquery.models.config.XodusConfig; import com.bakdata.conquery.resources.api.ApiTokenResource; +import com.google.common.base.Strings; import io.dropwizard.jersey.setup.JerseyEnvironment; -import io.dropwizard.util.Strings; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; import lombok.Data; import org.apache.http.util.CharArrayBuffer; import org.apache.shiro.authc.AuthenticationToken; 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 5003a868c9d..5fe9519e803 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 f10deaa7509..4e6000524ee 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/AuthorizationConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/auth/AuthorizationConfig.java index c74ce52c1ec..51bb88c2dea 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 @@ -1,13 +1,13 @@ package com.bakdata.conquery.models.config.auth; +import java.util.List; + 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 javax.validation.constraints.NotNull; -import java.util.List; +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 68dd7896788..e9162855827 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 @@ -1,13 +1,13 @@ package com.bakdata.conquery.models.config.auth; +import java.util.List; + import com.bakdata.conquery.apiv1.auth.ProtoUser; import com.bakdata.conquery.io.cps.CPSType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import lombok.Getter; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import java.util.List; - @CPSType(base = AuthorizationConfig.class, id = "DEFAULT") @Getter public class DefaultAuthorizationConfig implements AuthorizationConfig { 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 b4eeb5064c5..8e0fce472dd 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 @@ -1,17 +1,17 @@ package com.bakdata.conquery.models.config.auth; +import java.util.List; +import java.util.Set; + 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; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Set; - @CPSType(base = AuthorizationConfig.class, id = "DEVELOPMENT") @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 8d812f73279..463142a7adb 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,8 +4,6 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Client; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.models.auth.ConqueryAuthenticationRealm; import com.bakdata.conquery.models.auth.basic.JWTokenHandler; @@ -19,6 +17,7 @@ import io.dropwizard.client.JerseyClientBuilder; import io.dropwizard.servlets.tasks.Task; import io.dropwizard.validation.ValidationMethod; +import jakarta.ws.rs.client.Client; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; 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 d70bdb21dc0..22dd4599bc7 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,18 +14,6 @@ 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 com.bakdata.conquery.apiv1.RequestHelper; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; @@ -53,6 +41,17 @@ import groovy.lang.GroovyShell; import groovy.lang.Script; import io.dropwizard.validation.ValidationMethod; +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 lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; 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 c39febe33fd..9d51da9e3f6 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,11 +5,6 @@ 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 com.bakdata.conquery.apiv1.RequestHelper; import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.io.cps.CPSType; @@ -28,6 +23,10 @@ import io.dropwizard.util.Duration; import io.dropwizard.validation.MinDuration; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.UriBuilder; import lombok.Getter; import lombok.Setter; 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 fcf0840c320..b0000971a29 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/datasets/Column.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java index 3b5ceefdcac..753d8283f78 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 @@ -3,7 +3,6 @@ import java.util.Map; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; @@ -24,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Preconditions; import io.dropwizard.validation.ValidationMethod; +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 1284ee66bd1..e6903092e19 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 @@ -2,9 +2,6 @@ import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.identifiable.NamedImpl; import com.bakdata.conquery.models.identifiable.ids.NamespacedIdentifiable; @@ -13,6 +10,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; 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.RequiredArgsConstructor; import lombok.Setter; 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 598cb307cd3..b32df587246 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,8 +1,5 @@ package com.bakdata.conquery.models.datasets; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.events.stores.root.ColumnStore; import com.bakdata.conquery.models.identifiable.NamedImpl; import com.bakdata.conquery.models.identifiable.ids.NamespacedIdentifiable; @@ -10,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; 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 12367ec4c7d..5d8fc1d4516 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 856fdd54b7d..fbf53539eb2 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 @@ -5,9 +5,6 @@ import java.util.Set; import java.util.stream.Stream; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.io.storage.NamespacedStorage; import com.bakdata.conquery.models.identifiable.Labeled; @@ -16,6 +13,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 368334b54ce..961a8c6d0a7 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 c55355d0cc1..046142ca2ed 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 ee8c13d5ab5..579b373449e 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 42c74d823d2..bfbcbfcee0d 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 216aa5fb5ae..f00d9b1e631 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,9 +3,6 @@ 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; @@ -14,6 +11,8 @@ 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.Valid; +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/conditions/ColumnEqualCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/ColumnEqualCondition.java index e8a8e327ae7..1b98784e959 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 1a8f0d098b3..7728dc2ea04 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,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.AllArgsConstructor; import lombok.Getter; import lombok.Setter; 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 52c2ca56ee4..45a9534b110 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,8 +4,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.common.Range; import com.bakdata.conquery.models.datasets.concepts.tree.ConceptTreeNode; @@ -16,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import groovy.lang.GroovyShell; import groovy.lang.Script; +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/datasets/concepts/conditions/NotCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/NotCondition.java index 01a2f319b62..7ecec06b3c4 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,14 +2,13 @@ import java.util.Map; -import javax.validation.Valid; - 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 lombok.Getter; import lombok.Setter; 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 9856705ab5d..38347e04217 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,9 +3,6 @@ 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; @@ -14,6 +11,8 @@ 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.Valid; +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/conditions/PrefixCondition.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixCondition.java index 07abf512a21..68b81b3e015 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 fef3ba818f8..e7249e313a8 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.model.filter.ConditionType; @@ -12,6 +10,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 5c53205df51..b549f898fbe 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 2097ced2b37..a1d772005ba 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 @@ -5,8 +5,6 @@ import java.util.List; import java.util.Set; -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; @@ -24,6 +22,7 @@ import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext; import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters; import com.bakdata.conquery.sql.conversion.model.select.CountSqlAggregator; +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 7a33869c137..73f924028a8 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 @@ -4,8 +4,6 @@ import java.util.EnumSet; import java.util.Set; -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; @@ -21,6 +19,7 @@ import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext; import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters; import com.bakdata.conquery.sql.conversion.model.select.DateDistanceSqlAggregator; +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 721718ffc9f..2f77265b860 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 @@ -6,7 +6,6 @@ import java.util.Set; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration; import com.bakdata.conquery.apiv1.frontend.FrontendFilterType; @@ -38,6 +37,7 @@ import com.bakdata.conquery.sql.conversion.model.select.SumDistinctSqlAggregator; import com.bakdata.conquery.sql.conversion.model.select.SumSqlAggregator; 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 42429f98753..55b1656d15b 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 b279df9d8cd..edd2f640ad4 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 089d9e73d00..f2a504b083c 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 0e5193425e1..bf52eb4c77b 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; @@ -17,6 +15,7 @@ import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext; import com.bakdata.conquery.sql.conversion.model.select.CountSqlAggregator; 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 5a51626ac30..eff14be1da3 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; @@ -17,6 +15,7 @@ import com.bakdata.conquery.sql.conversion.model.select.DateDistanceSqlAggregator; 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 d9501508ef0..678e33e0d32 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,6 @@ import java.util.function.BiFunction; import javax.annotation.Nullable; -import javax.validation.Valid; import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.io.jackson.View; @@ -18,6 +17,7 @@ import com.bakdata.conquery.models.types.ResultType; import com.bakdata.conquery.models.types.SemanticType; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.Valid; import lombok.Getter; public abstract class MappableSingleColumnSelect extends SingleColumnSelect { 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 db8a5a38b43..a36d1b447f2 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 @@ -6,8 +6,6 @@ import java.util.List; import java.util.Set; -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; @@ -33,6 +31,7 @@ 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 a7ea7b18797..d894f05fbc1 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 a6e187f57fc..bb00b8d103c 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 92640e3213e..7fdc1a91ecd 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; @@ -23,6 +20,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/dictionary/Dictionary.java b/backend/src/main/java/com/bakdata/conquery/models/dictionary/Dictionary.java index 8516d2f6524..ccb78ce6654 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/dictionary/Dictionary.java +++ b/backend/src/main/java/com/bakdata/conquery/models/dictionary/Dictionary.java @@ -1,7 +1,5 @@ package com.bakdata.conquery.models.dictionary; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; import com.bakdata.conquery.models.datasets.Dataset; @@ -9,6 +7,7 @@ import com.bakdata.conquery.models.identifiable.ids.NamespacedIdentifiable; import com.bakdata.conquery.models.identifiable.ids.specific.DictionaryId; import com.fasterxml.jackson.annotation.JsonTypeInfo; +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/dictionary/MapDictionary.java b/backend/src/main/java/com/bakdata/conquery/models/dictionary/MapDictionary.java index 22d44034d28..d75b4883ac6 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/dictionary/MapDictionary.java +++ b/backend/src/main/java/com/bakdata/conquery/models/dictionary/MapDictionary.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.ListIterator; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.datasets.Dataset; import com.fasterxml.jackson.annotation.JsonCreator; @@ -17,6 +15,7 @@ import it.unimi.dsi.fastutil.Hash; import it.unimi.dsi.fastutil.bytes.ByteArrayList; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import jakarta.validation.constraints.NotNull; import lombok.ToString; @CPSType(id = "MAP_DICTIONARY", base = Dictionary.class) 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 225e0d629e4..42520a5343f 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 1a4f1a9edce..bca7602c9ec 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 618920194f9..4265bd649c4 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 @@ -7,9 +7,6 @@ import java.util.Map; import java.util.Set; -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; @@ -34,6 +31,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; import io.dropwizard.validation.ValidationMethod; +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 99541ebaaae..e2dd83c19f3 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 @@ -4,8 +4,6 @@ import java.util.List; 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 1883fba1683..9c72287b4ef 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 ba69d9b802f..559457c0d85 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/events/stores/specific/string/EncodedStringStore.java b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/EncodedStringStore.java index 7792cc93ded..e81699cfce8 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/EncodedStringStore.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/EncodedStringStore.java @@ -3,9 +3,6 @@ import java.nio.charset.StandardCharsets; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.ParametersAreNonnullByDefault; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.dictionary.Dictionary; import com.bakdata.conquery.models.events.stores.root.ColumnStore; @@ -17,6 +14,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.io.BaseEncoding; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -35,7 +33,7 @@ @CPSType(base = ColumnStore.class, id = "STRING_ENCODED") public class EncodedStringStore implements StringStore { - @Nonnull + @NotNull protected DictionaryStore subType; @NonNull private Encoding encoding; @@ -54,9 +52,8 @@ public EncodedStringStore(DictionaryStore subType, Encoding encoding) { this.encoding = encoding; elementCache = CacheBuilder.newBuilder() .softValues() - .build(new CacheLoader() { + .build(new CacheLoader<>() { @Override - @ParametersAreNonnullByDefault public String load(Integer key) throws Exception { return encoding.decode(subType.getElement(key)); } diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/NumberStringStore.java b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/NumberStringStore.java index e8e07858de0..df9de919a5b 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/NumberStringStore.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/NumberStringStore.java @@ -6,8 +6,6 @@ import java.util.Set; import java.util.stream.Stream; -import javax.annotation.Nonnull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.View; import com.bakdata.conquery.models.common.Range; @@ -19,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -32,7 +31,7 @@ @ToString(of = "delegate") public class NumberStringStore implements StringStore { - @Nonnull + @NotNull protected IntegerStore delegate; //used as a compact intset private Range range; diff --git a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/PrefixSuffixStringStore.java b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/PrefixSuffixStringStore.java index 721f4e22c64..04c16590967 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/PrefixSuffixStringStore.java +++ b/backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/string/PrefixSuffixStringStore.java @@ -3,14 +3,13 @@ import java.nio.charset.StandardCharsets; import java.util.stream.Stream; -import javax.annotation.Nonnull; - import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.dictionary.Dictionary; import com.bakdata.conquery.models.events.stores.root.ColumnStore; import com.bakdata.conquery.models.events.stores.root.IntegerStore; import com.bakdata.conquery.models.events.stores.root.StringStore; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NonNull; import lombok.Setter; @@ -27,7 +26,7 @@ @Slf4j public class PrefixSuffixStringStore implements StringStore { - @Nonnull + @NotNull protected StringStore subType; @NonNull 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 52e54ef0386..2531be721e3 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 b346aaa8ba3..29fc2dd7a94 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 @@ -14,8 +14,6 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; -import javax.ws.rs.core.UriBuilder; import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; @@ -56,6 +54,8 @@ import com.fasterxml.jackson.annotation.OptBoolean; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Uninterruptibles; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.UriBuilder; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; 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 91ce5ca1bcb..a26ffe1fcab 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,9 +11,6 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.io.jackson.serializer.MetaIdRef; import com.bakdata.conquery.io.jackson.serializer.NsIdRef; @@ -34,6 +31,8 @@ import com.bakdata.conquery.models.identifiable.ids.specific.GroupId; import com.bakdata.conquery.util.VariableDefaultValue; import com.fasterxml.jackson.databind.JsonNode; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; 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 2356d2811c3..d8d3b12d744 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,9 +6,6 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.validation.Validator; - import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.apiv1.forms.FormConfigAPI; import com.bakdata.conquery.io.jackson.Jackson; @@ -31,6 +28,8 @@ import com.bakdata.conquery.resources.api.FormConfigResource; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import jakarta.inject.Inject; +import jakarta.validation.Validator; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; 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 6ce35c51ded..2594b0aab7a 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 bf8a9a84bfb..5600c335553 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 58c3fcfb013..ef14cdcd64e 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,8 +8,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.apiv1.forms.ExternalForm; @@ -34,6 +32,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.MoreCollectors; import it.unimi.dsi.fastutil.Pair; +import jakarta.ws.rs.core.Response; import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; 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 120614ca10e..9cc8448c9a0 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 9f69c8719a2..df9e1b619a6 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,10 +9,9 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Stream; -import javax.validation.Valid; - import com.bakdata.conquery.models.identifiable.ids.Id; import com.google.common.collect.ForwardingMap; +import jakarta.validation.Valid; /** * A typesafe mapping for the ID-system that does not allow a remapping of an existing key. 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 b9565e84bdb..559bf4e3587 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,9 +1,8 @@ package com.bakdata.conquery.models.identifiable; -import javax.validation.Valid; - import com.bakdata.conquery.models.identifiable.ids.Id; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.Valid; import lombok.ToString; public interface Identifiable>> { 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 3e91496b8c2..6be8e870689 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,10 +1,9 @@ package com.bakdata.conquery.models.identifiable; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.models.identifiable.ids.Id; import com.bakdata.conquery.models.identifiable.ids.IdUtil; import com.google.common.base.CharMatcher; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; 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 e9f33255b61..b9111398ad2 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,8 +1,7 @@ package com.bakdata.conquery.models.identifiable; -import javax.validation.constraints.NotBlank; - import com.bakdata.conquery.models.identifiable.ids.Id; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/DictionaryId.java b/backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/DictionaryId.java index b40216bf073..500cc100be5 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/DictionaryId.java +++ b/backend/src/main/java/com/bakdata/conquery/models/identifiable/ids/specific/DictionaryId.java @@ -2,13 +2,12 @@ import java.util.List; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.dictionary.Dictionary; import com.bakdata.conquery.models.identifiable.ids.Id; -import com.bakdata.conquery.models.identifiable.ids.IdUtil; import com.bakdata.conquery.models.identifiable.ids.IdIterator; +import com.bakdata.conquery.models.identifiable.ids.IdUtil; import com.bakdata.conquery.models.identifiable.ids.NamespacedId; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; 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 02b4c9e0e41..7d780e8ff11 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 0ee8181697e..215d92b80e0 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,9 +3,6 @@ import java.net.URI; -import javax.validation.constraints.NotEmpty; -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.config.ConqueryConfig; @@ -17,6 +14,8 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.OptBoolean; +import jakarta.validation.constraints.NotEmpty; +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/jobs/ImportJob.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/ImportJob.java index ee3923983ad..a568a508a3f 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 @@ -14,10 +14,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.io.storage.NamespaceStorage; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.datasets.Column; @@ -58,6 +54,9 @@ import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.WebApplicationException; +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/jobs/JobManagerStatus.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java index ec2397604ce..d597ceb3322 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,11 +5,11 @@ import java.util.List; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; 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 8986bcc47e7..8ad428d28e9 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 2bf2ac53d30..e4201c8d21a 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,11 +2,10 @@ import java.util.UUID; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.models.messages.Message; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; 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 dd6d332c7bf..99474aa1ab6 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,7 +1,5 @@ package com.bakdata.conquery.models.messages.network; -import javax.validation.Validator; - import com.bakdata.conquery.commands.ManagerNode; import com.bakdata.conquery.commands.ShardNode; import com.bakdata.conquery.io.mina.MessageSender; @@ -11,6 +9,7 @@ import com.bakdata.conquery.models.worker.DatasetRegistry; import com.bakdata.conquery.models.worker.DistributedNamespace; import com.bakdata.conquery.models.worker.Workers; +import jakarta.validation.Validator; import lombok.Getter; @Getter 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 a215af08ddc..9e31ba18c9a 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/PreprocessedDictionaries.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/PreprocessedDictionaries.java index b1edb04ced4..180bef7a536 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/PreprocessedDictionaries.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/PreprocessedDictionaries.java @@ -3,10 +3,10 @@ import java.util.Map; import javax.annotation.CheckForNull; -import javax.validation.constraints.NotNull; import com.bakdata.conquery.models.dictionary.Dictionary; import com.fasterxml.jackson.annotation.JsonCreator; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; 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 47d1e2fc20e..9873bdf25e5 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 9640ffb95c8..90ad85ee948 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 686eb211066..ec8447a1829 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 ead87f6ac12..235996be515 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 847f1d94e02..5e13281afc4 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 feaa7233341..05e3223c7f6 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,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.common.daterange.CDateRange; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -12,6 +10,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/EpochOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/EpochOutput.java index 71790915e58..13825873bdb 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,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; @@ -10,6 +8,7 @@ import com.bakdata.conquery.models.preproc.parser.specific.DateParser; import com.bakdata.conquery.util.DateReader; 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/NullOutput.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/outputs/NullOutput.java index 84f40843328..8577837fb76 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,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 org.apache.commons.lang3.builder.HashCodeBuilder; 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 5e0c2264426..7ae649980a7 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,8 +3,6 @@ import java.util.InputMismatchException; import java.util.StringJoiner; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.io.cps.CPSBase; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -18,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeInfo; import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/Parser.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/Parser.java index f9a4addd64f..8478c1ddbcd 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/Parser.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/Parser.java @@ -1,11 +1,11 @@ package com.bakdata.conquery.models.preproc.parser; -import javax.annotation.Nonnull; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.EmptyStore; import com.bakdata.conquery.models.events.stores.root.ColumnStore; import com.bakdata.conquery.models.exceptions.ParsingException; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -49,7 +49,7 @@ public final MAJOR_JAVA_TYPE parse(String v) throws ParsingException { /** * Read a raw CSV-value and return a parsed representation. */ - protected abstract MAJOR_JAVA_TYPE parseValue(@Nonnull String value) throws ParsingException; + protected abstract MAJOR_JAVA_TYPE parseValue(@NotNull String value) throws ParsingException; public final STORE_TYPE findBestType() { if (isEmpty()) { diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java index d974ed2c72f..41bff2696d0 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/BooleanParser.java @@ -1,6 +1,5 @@ package com.bakdata.conquery.models.preproc.parser.specific; -import javax.annotation.Nonnull; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.stores.primitive.BitSetStore; @@ -8,6 +7,7 @@ import com.bakdata.conquery.models.exceptions.ParsingException; import com.bakdata.conquery.models.preproc.parser.ColumnValues; import com.bakdata.conquery.models.preproc.parser.Parser; +import lombok.NonNull; import lombok.ToString; @ToString(callSuper = true) @@ -18,7 +18,7 @@ public BooleanParser(ConqueryConfig config) { } @Override - protected Boolean parseValue(@Nonnull String value) throws ParsingException { + protected Boolean parseValue(@NonNull String value) throws ParsingException { return switch (value) { case "J", "true", "1" -> true; case "N", "false", "0" -> false; 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 212fa1b2028..223c41605a8 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.common.daterange.CDateRange; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.events.stores.primitive.BitSetStore; @@ -11,6 +9,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/preproc/parser/specific/DateParser.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateParser.java index e3dc892c211..4270bbf1c38 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateParser.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateParser.java @@ -1,10 +1,8 @@ package com.bakdata.conquery.models.preproc.parser.specific; -import javax.annotation.Nonnull; import com.bakdata.conquery.models.common.CDate; import com.bakdata.conquery.models.config.ConqueryConfig; -import com.bakdata.conquery.models.config.ParserConfig; import com.bakdata.conquery.models.events.stores.primitive.IntegerDateStore; import com.bakdata.conquery.models.events.stores.root.DateStore; import com.bakdata.conquery.models.events.stores.root.IntegerStore; @@ -12,6 +10,7 @@ import com.bakdata.conquery.models.preproc.parser.ColumnValues; import com.bakdata.conquery.models.preproc.parser.Parser; import com.bakdata.conquery.util.DateReader; +import lombok.NonNull; import lombok.SneakyThrows; import lombok.ToString; @@ -35,7 +34,7 @@ public void setLines(int lines) { } @Override - protected Integer parseValue(@Nonnull String value) throws ParsingException { + protected Integer parseValue(@NonNull String value) throws ParsingException { return CDate.ofLocalDate(dateReader.parseToLocalDate(value)); } diff --git a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateRangeParser.java b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateRangeParser.java index 3a065e1c129..63c590a4708 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateRangeParser.java +++ b/backend/src/main/java/com/bakdata/conquery/models/preproc/parser/specific/DateRangeParser.java @@ -1,6 +1,5 @@ package com.bakdata.conquery.models.preproc.parser.specific; -import javax.annotation.Nonnull; import com.bakdata.conquery.models.common.daterange.CDateRange; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -10,6 +9,7 @@ import com.bakdata.conquery.models.preproc.parser.ColumnValues; import com.bakdata.conquery.models.preproc.parser.Parser; import com.bakdata.conquery.util.DateReader; +import lombok.NonNull; import lombok.ToString; import lombok.extern.slf4j.Slf4j; @@ -34,7 +34,7 @@ public DateRangeParser(ConqueryConfig config) { } @Override - protected CDateRange parseValue(@Nonnull String value) { + protected CDateRange parseValue(@NonNull String value) { return dateReader.parseToCDateRange(value); } 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 71bb0c9a045..77693b48115 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 4b9f778a908..c89f621ced0 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,8 +3,6 @@ import java.util.Arrays; 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; @@ -13,6 +11,7 @@ import com.bakdata.conquery.models.query.entity.Entity; import com.bakdata.conquery.models.query.queryplan.filter.EventFilterNode; import it.unimi.dsi.fastutil.ints.IntSet; +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/PrefixTextFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/PrefixTextFilterNode.java index ab1ac047a49..67d41345b46 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 2af64b19429..e74129f36ea 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 @@ -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/number/NumberFilterNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/filter/event/number/NumberFilterNode.java index 3912597863d..f9389da2f63 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,13 +2,12 @@ import java.util.Set; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.models.common.IRange; 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/queryplan/specific/ExternalNode.java b/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/specific/ExternalNode.java index 292e11d736c..7a1a4ae4679 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,8 +5,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.constraints.NotEmpty; - import com.bakdata.conquery.models.common.CDateSet; import com.bakdata.conquery.models.datasets.Table; import com.bakdata.conquery.models.events.Bucket; @@ -16,6 +14,7 @@ import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator; import com.bakdata.conquery.models.query.queryplan.aggregators.specific.ConstantValueAggregator; import com.bakdata.conquery.models.types.ResultType; +import jakarta.validation.constraints.NotEmpty; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.ToString; 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 ecacf8481da..5206b9f0110 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,10 +6,9 @@ import java.util.function.UnaryOperator; import java.util.stream.Stream; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.io.cps.CPSType; +import jakarta.validation.constraints.Min; +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/worker/DatasetRegistry.java b/backend/src/main/java/com/bakdata/conquery/models/worker/DatasetRegistry.java index 4230316a7d1..9caeee3618a 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; @@ -30,6 +28,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 37c066e660f..0f56b3c4d2f 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 @@ -6,8 +6,6 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; -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; @@ -35,6 +33,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 45f8430a531..def028d0027 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 d6592fd7d99..9b098792e44 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 ac2e9810b21..011c155934c 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 e2572257395..6ae88af8636 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 94d93e81fe6..82b90a7a516 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 8aa724f8238..d2cd8bfbf41 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; @@ -43,6 +36,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 09f62e02d8f..2aa576dc5c4 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 306b32b1e69..3090a7d6af7 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 adc9d9091d8..da415e39b48 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 1a3d5ae8d61..c1a0d99f2d7 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,21 +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.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 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; @@ -39,6 +24,20 @@ 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.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 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 5655daa1db8..f10c8369d1a 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 6d94aac4c85..09762b287de 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 e18b6d0ad67..1e4209e7adf 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,21 +5,20 @@ 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 com.bakdata.conquery.models.auth.entities.Group; import com.bakdata.conquery.models.auth.entities.Role; import com.bakdata.conquery.models.auth.entities.User; +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 lombok.RequiredArgsConstructor; @Produces(MediaType.APPLICATION_JSON) 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 6057b6aa659..4a412ed3c81 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 f0c392a4352..b4cfdf3ca87 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 71ab54360d7..babdbe8ba3c 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 @@ -11,8 +11,6 @@ import java.util.TreeSet; 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; @@ -44,6 +42,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 222df1570d6..6a28b229b19 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 70b8fe46a2f..a02e44a1679 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 cc5b1f31ca9..308a88d9270 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 @@ -1,14 +1,13 @@ 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.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/AuthOverviewUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AuthOverviewUIResource.java index fa937f3317e..f9ab29d6a5d 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 b33312f06ce..fd7029ba17f 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 afa4dc1b604..52271375d08 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 @@ -7,13 +7,6 @@ import java.util.Objects; 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; @@ -26,7 +19,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 bc96fcff2f5..bf0d3ae0624 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 @@ -1,21 +1,20 @@ package com.bakdata.conquery.resources.admin.ui; +import static com.bakdata.conquery.resources.ResourceConstants.GROUPS_PATH_ELEMENT; +import static com.bakdata.conquery.resources.ResourceConstants.GROUP_ID; + 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 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.GROUPS_PATH_ELEMENT; -import static com.bakdata.conquery.resources.ResourceConstants.GROUP_ID; - @Produces(MediaType.TEXT_HTML) @Path(GROUPS_PATH_ELEMENT) @RequiredArgsConstructor(onConstructor_ = @Inject) 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 ec65eb25782..738af79c50b 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,16 @@ 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 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 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.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 61df2205ce0..ff7ebfc8e4a 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 3c8677550d9..1aa4fbe0d84 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 76b5a7b0b01..892528a8d1a 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 609545202b7..4168fa7ab22 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 996c251f3ce..a4b360d0db1 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/ApiTokenResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ApiTokenResource.java index cbf5ed7ab0f..cd548c217ea 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ApiTokenResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ApiTokenResource.java @@ -1,22 +1,28 @@ package com.bakdata.conquery.resources.api; +import java.util.List; +import java.util.UUID; + import com.bakdata.conquery.apiv1.auth.ApiTokenDataRepresentation; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.apitoken.ApiToken; import com.bakdata.conquery.models.auth.apitoken.ApiTokenRealm; -import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.auth.entities.Subject; +import com.bakdata.conquery.models.auth.entities.User; import io.dropwizard.auth.Auth; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.ForbiddenException; +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.Response; import lombok.RequiredArgsConstructor; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; - -import java.util.List; -import java.util.UUID; - /** * Endpoints to create and manage scoped {@link ApiToken}s. */ 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 89713844288..ddd919ed279 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 d2c1ebac6bb..3624c5499c8 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 deeb7e5d212..53f0cdd931d 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 7b8711e794d..09dfe9bee00 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 c25c73905a5..8f9dbf0609a 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 2b637b7d1cb..37e3100c12b 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 10cac990171..abcf57ed353 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 aebe772d9cf..92f9f26ca6f 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 d3c77a85d5f..05397b20977 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,22 +6,21 @@ 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 com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.datasets.concepts.filters.Filter; import com.bakdata.conquery.models.datasets.concepts.filters.specific.SelectFilter; import com.bakdata.conquery.resources.hierarchies.HAuthorized; +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 lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.Setter; 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 40e575d613d..d4b8f2e887b 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,15 +2,6 @@ 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 com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.auth.entities.Subject; @@ -19,6 +10,14 @@ import com.bakdata.conquery.models.forms.frontendconfiguration.FormConfigProcessor; import io.dropwizard.auth.Auth; import io.dropwizard.jersey.PATCH; +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 lombok.RequiredArgsConstructor; @Consumes(ExtraMimeTypes.JSON_STRING) 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 33ca3bde4de..e4850e86b10 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,14 +1,13 @@ 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 com.bakdata.conquery.apiv1.MeProcessor; import com.bakdata.conquery.apiv1.MeProcessor.FrontendMeInformation; import com.bakdata.conquery.resources.hierarchies.HAuthorized; +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; import lombok.Setter; 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 5fe05d8652c..e3615bed1a6 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 51eefb75e29..079cd0ff51a 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 @@ -7,18 +7,6 @@ import java.net.URL; import java.util.Optional; -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; @@ -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/ResultCsvResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultCsvResource.java index 70134250e0b..750a295c12b 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 @@ -7,18 +7,6 @@ import java.net.MalformedURLException; import java.net.URL; -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; @@ -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/ResultExcelResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ResultExcelResource.java index 67a2339e757..1b95e0a9b59 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 @@ -6,18 +6,6 @@ import java.net.MalformedURLException; import java.net.URL; -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; @@ -25,6 +13,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 2cf338b4f9d..93732d3e1b3 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 44f0bdf5b71..84160468e61 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 @@ -7,24 +7,23 @@ import java.net.MalformedURLException; import java.net.URL; -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 446944119a6..73a5fce04bf 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,12 +2,11 @@ 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 com.bakdata.conquery.models.auth.entities.Subject; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response.Status; import lombok.Getter; import lombok.Setter; import org.glassfish.jersey.server.ContainerRequest; 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 b807b507bba..e679455752b 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,13 +3,12 @@ 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 com.bakdata.conquery.models.auth.permissions.Ability; -import com.bakdata.conquery.models.datasets.concepts.Concept; import com.bakdata.conquery.models.datasets.Dataset; +import com.bakdata.conquery.models.datasets.concepts.Concept; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import lombok.Getter; import lombok.Setter; 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 e9ffc4ca1d2..657cfcd29e0 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,14 +2,13 @@ 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 com.bakdata.conquery.models.datasets.concepts.Connector; import com.bakdata.conquery.models.datasets.Table; +import com.bakdata.conquery.models.datasets.concepts.Connector; import com.google.common.collect.MoreCollectors; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import lombok.Getter; import lombok.Setter; 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 0bff459b4e8..029689e7973 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,15 +2,14 @@ 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 com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.worker.DatasetRegistry; import com.bakdata.conquery.models.worker.Namespace; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import lombok.Getter; import lombok.Setter; 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 d92f3ee76c3..2183ce6e2cd 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,10 +2,9 @@ import static com.bakdata.conquery.resources.ResourceConstants.*; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import com.bakdata.conquery.models.datasets.concepts.filters.Filter; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import lombok.Getter; import lombok.Setter; 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 149a7f190b3..3395041e355 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,10 +3,9 @@ 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 com.bakdata.conquery.models.datasets.Table; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import lombok.Getter; import lombok.Setter; 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 150acb3099e..5410ea7a63d 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,15 +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; /** @@ -65,7 +64,7 @@ public static UriBuilder hierarchicalPath(UriBuilder uri, Class clazz, String } if (!foundPath) { - throw new IllegalArgumentException("The javax.ws.rs.Path annotation was present neither on the class '"+ clazz.getName() + "' nor on the method " + methodName + "'."); + throw new IllegalArgumentException("The jakarta.ws.rs.Path annotation was present neither on the class '"+ clazz.getName() + "' nor on the method " + methodName + "'."); } return uri; 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 6b58fa5e6d8..e82d3807f1b 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 fa1bb9281db..5ebfa8c55da 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 @@ -1,15 +1,18 @@ package com.bakdata.conquery.resources.unprotected; -import javax.ws.rs.*; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; +import java.net.URI; import com.bakdata.conquery.models.config.auth.LocalAuthenticationConfig; import com.bakdata.conquery.resources.admin.ui.model.UIView; -import io.dropwizard.views.View; - -import java.net.URI; +import io.dropwizard.views.common.View; +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; @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 23cd8c62d62..1df8970ba0d 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,14 +1,13 @@ package com.bakdata.conquery.resources.unprotected; -import javax.ws.rs.Consumes; -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.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import lombok.AllArgsConstructor; @Path("/") diff --git a/backend/src/main/java/com/bakdata/conquery/sql/DslContextFactory.java b/backend/src/main/java/com/bakdata/conquery/sql/DslContextFactory.java index 980aa597bb9..abfc72a7b94 100644 --- a/backend/src/main/java/com/bakdata/conquery/sql/DslContextFactory.java +++ b/backend/src/main/java/com/bakdata/conquery/sql/DslContextFactory.java @@ -1,5 +1,6 @@ package com.bakdata.conquery.sql; + import javax.sql.DataSource; import com.bakdata.conquery.models.config.SqlConnectorConfig; @@ -13,14 +14,14 @@ public class DslContextFactory { public static DSLContext create(SqlConnectorConfig config) { - HikariConfig hikariConfig = new HikariConfig(); + final HikariConfig hikariConfig = new HikariConfig(); hikariConfig.setJdbcUrl(config.getJdbcConnectionUrl()); hikariConfig.setUsername(config.getDatabaseUsername()); hikariConfig.setPassword(config.getDatabasePassword()); - DataSource dataSource = new HikariDataSource(hikariConfig); + final DataSource dataSource = new HikariDataSource(hikariConfig); - Settings settings = new Settings() + final Settings settings = new Settings() .withRenderFormatted(config.isWithPrettyPrinting()) // enforces all identifiers to be quoted if not explicitly unquoted via DSL.unquotedName() // to prevent any lowercase/uppercase SQL dialect specific identifier naming issues 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 16b77789c09..1bbece3e843 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 5103e37c6fc..d6ac483ecad 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/validation/ManualURI.java b/backend/src/main/java/com/bakdata/conquery/util/validation/ManualURI.java index 3c2870233bb..3b3eed1ef6b 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 a15d74fb72e..49cc6067f54 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 ceed909a257..5a4a251c391 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; @@ -51,6 +49,7 @@ import com.bakdata.conquery.models.worker.DistributedNamespace; import com.bakdata.conquery.util.NonPersistentStoreFactory; import com.google.common.collect.ImmutableList; +import jakarta.ws.rs.core.UriBuilder; import lombok.SneakyThrows; 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 d74b89ac957..e8459ed6271 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,8 +13,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.validation.Validator; - import com.bakdata.conquery.apiv1.FormConfigPatch; import com.bakdata.conquery.apiv1.forms.FormConfigAPI; import com.bakdata.conquery.apiv1.forms.export_form.AbsoluteMode; @@ -54,6 +52,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; 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 d93de07fd46..d8c59403f82 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,10 +6,6 @@ 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 com.bakdata.conquery.apiv1.execution.ExecutionStatus; import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.query.Query; @@ -26,6 +22,9 @@ import com.bakdata.conquery.resources.hierarchies.HierarchyHelper; import com.bakdata.conquery.util.support.StandaloneSupport; import com.fasterxml.jackson.databind.JsonNode; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; 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 b3e26e9f9a7..a15ec28dbc9 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,11 +17,6 @@ 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 com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.query.ConceptQuery; import com.bakdata.conquery.apiv1.query.Query; @@ -54,6 +49,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.univocity.parsers.csv.CsvParser; +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 lombok.NonNull; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; 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 5cdd57ee3b5..40fc4299063 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 bfc5d20ea16..a7fc2dc1cac 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 c012cdef260..6b2db6d9505 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 074d7fcbfdc..d46a92a68fc 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 867c2436314..8b3af2d3c6f 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 be9726a5d44..cb9f76773e4 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 @@ -10,9 +10,6 @@ import java.util.Locale; import java.util.Map; -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; @@ -31,6 +28,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 1d16d4486bb..46640c0c3a2 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 @@ -11,10 +11,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.bakdata.conquery.apiv1.forms.Form; import com.bakdata.conquery.integration.common.LoadingUtil; import com.bakdata.conquery.integration.common.RequiredData; @@ -44,6 +40,9 @@ import com.github.powerlibraries.io.In; import com.univocity.parsers.csv.CsvWriter; import io.dropwizard.validation.ValidationMethod; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +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/JsonIntegrationTest.java b/backend/src/test/java/com/bakdata/conquery/integration/json/JsonIntegrationTest.java index 29fbc9c4441..847b5d471af 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,8 +4,6 @@ import java.io.IOException; import java.io.InputStream; -import javax.validation.Validator; - import com.bakdata.conquery.integration.IntegrationTest; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.models.config.ConqueryConfig; @@ -15,6 +13,7 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.fasterxml.jackson.databind.ObjectReader; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 069908624b9..1e56c095887 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 f44662878e9..a1940f1d8c0 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,12 +2,10 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - -import com.bakdata.conquery.models.datasets.concepts.Concept; import com.bakdata.conquery.apiv1.query.concept.filter.FilterValue; - +import com.bakdata.conquery.models.datasets.concepts.Concept; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data 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 58547e6c8ce..e744c61777b 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,8 +7,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.query.ConceptQuery; import com.bakdata.conquery.apiv1.query.Query; @@ -35,6 +33,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; +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/sql/SqlStandaloneCommand.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/SqlStandaloneCommand.java index 363b28ed2af..03e46a464dc 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 @@ -9,15 +9,15 @@ import com.bakdata.conquery.commands.StandaloneCommand; import com.bakdata.conquery.integration.sql.dialect.HanaSqlIntegrationTests; import com.bakdata.conquery.integration.sql.dialect.PostgreSqlIntegrationTests; -import com.bakdata.conquery.mode.DelegateManager; +import com.bakdata.conquery.mode.Manager; import com.bakdata.conquery.mode.local.LocalManagerProvider; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.config.SqlConnectorConfig; -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,11 +25,11 @@ @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(); - private DelegateManager manager; + private Manager manager; private Environment environment; public SqlStandaloneCommand(Conquery conquery) { 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 73e157775e4..f9230b6f008 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/ApiTokenRealmTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ApiTokenRealmTest.java index e5cf23acbcb..7ad45c3bd23 100644 --- a/backend/src/test/java/com/bakdata/conquery/integration/tests/ApiTokenRealmTest.java +++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/ApiTokenRealmTest.java @@ -11,13 +11,6 @@ import java.util.List; import java.util.UUID; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.apiv1.IdLabel; import com.bakdata.conquery.apiv1.auth.ApiTokenDataRepresentation; import com.bakdata.conquery.integration.IntegrationTest; @@ -40,6 +33,12 @@ import com.bakdata.conquery.util.support.StandaloneSupport; import com.google.common.collect.ImmutableList; import com.google.common.collect.MoreCollectors; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class ApiTokenRealmTest extends IntegrationTest.Simple implements ProgrammaticIntegrationTest { 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 3b41f046272..d934986c9fb 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 8969932dc7e..033544c3737 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 cc75d336e0f..eb57f6aff3b 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,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.apiv1.query.concept.filter.FilterValue; import com.bakdata.conquery.integration.common.LoadingUtil; import com.bakdata.conquery.integration.common.RequiredData; @@ -27,6 +23,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/ExternalFormBackendTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ExternalFormBackendTest.java index 93617d472f4..af7bfe5ae05 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 @@ -10,8 +10,6 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.execution.FullExecutionStatus; import com.bakdata.conquery.apiv1.execution.ResultAsset; import com.bakdata.conquery.integration.common.IntegrationUtils; @@ -29,6 +27,7 @@ import com.bakdata.conquery.resources.api.ResultExternalResource; import com.bakdata.conquery.util.support.StandaloneSupport; import com.bakdata.conquery.util.support.TestConquery; +import jakarta.ws.rs.core.UriBuilder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -97,7 +96,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(jakarta.ws.rs.core.MediaType.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 6892260c8d9..5ea5a4d90fb 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,6 @@ import java.util.OptionalInt; 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.FilterTemplate; import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.integration.IntegrationTest; @@ -34,6 +30,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/FilterResolutionTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/FilterResolutionTest.java index bd39ba768d6..10dd859a30b 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,10 +10,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.apiv1.FilterTemplate; import com.bakdata.conquery.apiv1.frontend.FrontendValue; import com.bakdata.conquery.integration.IntegrationTest; @@ -32,6 +28,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/ImportUpdateTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/ImportUpdateTest.java index e62ddc3b9be..c7ea825f993 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,8 +6,6 @@ import java.io.File; import java.util.List; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.commands.ShardNode; @@ -32,6 +30,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; import org.apache.commons.io.FileUtils; 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 aad0493fb55..7b5daecfb25 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 @@ -9,8 +9,6 @@ import java.util.Map; import java.util.TreeMap; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.integration.common.IntegrationUtils; import com.bakdata.conquery.integration.json.JsonIntegrationTest; import com.bakdata.conquery.integration.json.QueryTest; @@ -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 0a0af0aa8eb..5b3e8280fcb 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 5c8f5662094..e30e6016cf7 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 7145165d969..19e3ea373a5 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 df8029d0e2d..fa395475f74 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 0a35b340145..8795093de6d 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 cd583dbc78e..e5ba64967a5 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 62d05782ca3..ac4224cdd82 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,9 +10,6 @@ import java.util.Map; import java.util.zip.GZIPInputStream; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.bakdata.conquery.ConqueryConstants; import com.bakdata.conquery.apiv1.query.Query; import com.bakdata.conquery.commands.ShardNode; @@ -42,6 +39,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.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; 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 04b2a7bb846..ad2c8c88243 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 2e0a9d36e70..bdef72ffe81 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 1bc5d7d1784..fae14acc5a7 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 @@ -8,8 +8,6 @@ import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicInteger; -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; @@ -24,6 +22,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 d55eb144ede..96b4c394e93 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 2a6b4f3f504..a5794d4664e 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java +++ b/backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java @@ -17,8 +17,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; @@ -100,6 +98,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.http.util.CharArrayBuffer; diff --git a/backend/src/test/java/com/bakdata/conquery/models/auth/ApiTokenTest.java b/backend/src/test/java/com/bakdata/conquery/models/auth/ApiTokenTest.java index 5c923e1da57..55041eb6e37 100644 --- a/backend/src/test/java/com/bakdata/conquery/models/auth/ApiTokenTest.java +++ b/backend/src/test/java/com/bakdata/conquery/models/auth/ApiTokenTest.java @@ -1,19 +1,18 @@ package com.bakdata.conquery.models.auth; -import static com.bakdata.conquery.models.auth.apitoken.ApiTokenCreator.*; -import static org.assertj.core.api.Assertions.*; +import static com.bakdata.conquery.models.auth.apitoken.ApiTokenCreator.TOKEN_LENGTH; +import static com.bakdata.conquery.models.auth.apitoken.ApiTokenCreator.TOKEN_PREFIX; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Random; -import com.bakdata.conquery.models.auth.apitoken.ApiToken; import com.bakdata.conquery.models.auth.apitoken.ApiTokenCreator; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.apache.http.util.CharArrayBuffer; import org.junit.jupiter.api.Test; -import java.util.Random; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - @Slf4j public class ApiTokenTest { 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 d6a3dfb1fcb..96ccb7b15fe 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,14 +11,13 @@ import java.util.Map; -import javax.validation.Validator; - import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.bakdata.conquery.models.auth.oidc.passwordflow.IdpDelegatingAccessTokenCreator; import com.bakdata.conquery.models.config.auth.IntrospectionDelegatingRealmFactory; import com.bakdata.conquery.models.exceptions.ValidatorHelper; import io.dropwizard.validation.BaseValidator; +import jakarta.validation.Validator; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpStatus; 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 7ca02946a9b..88a36484cfc 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 @@ -13,8 +13,6 @@ import java.util.Set; import java.util.UUID; -import javax.validation.Validator; - import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.bakdata.conquery.io.storage.MetaStorage; @@ -29,6 +27,7 @@ import com.bakdata.conquery.models.identifiable.ids.specific.UserId; import com.bakdata.conquery.util.NonPersistentStoreFactory; import io.dropwizard.validation.BaseValidator; +import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpStatus; import org.apache.shiro.authc.AuthenticationInfo; 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 ac81ce9e47e..f75f14640e0 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,11 @@ import java.net.URI; -import javax.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 jakarta.ws.rs.client.Client; 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 3aac485d2a1..f2b196c285c 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,11 +5,10 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.ClientBuilder; - import com.bakdata.conquery.models.auth.oidc.keycloak.KeycloakApi; import com.bakdata.conquery.models.auth.oidc.keycloak.KeycloakGroup; import com.bakdata.conquery.models.config.auth.IntrospectionDelegatingRealmFactory; +import jakarta.ws.rs.client.ClientBuilder; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; 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 bcdd7a33e6a..c0e07a11018 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 5cd5874e4a7..7df820a4fd1 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,8 +9,6 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.validation.Validator; - import com.bakdata.conquery.io.jackson.Injectable; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.jackson.MutableInjectableValues; @@ -27,6 +25,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.powerlibraries.io.In; import io.dropwizard.jersey.validation.Validators; +import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.parallel.Execution; 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 80438601073..8f183f1bb19 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 23cd1dedbd5..d194738763f 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 @@ -5,9 +5,9 @@ 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; 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 7e246c58185..1abc9b0fc94 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 01a551fede0..6571f52c2a0 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 1832db13ecb..4346306bc39 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 7e13bda4da3..e11526fba5c 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 @@ -7,18 +7,14 @@ 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 +25,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 { @@ -79,7 +75,7 @@ public void configure(MetricRegistry metricRegistry, String name) { final AsyncAppenderFactory asyncAppenderFactory = new AsyncLoggingEventAppenderFactory(); final LayoutFactory layoutFactory = new DropwizardLayoutFactory(); - ConsoleAppenderFactory consoleAppender = new ConsoleAppenderFactory<>(); + final ConsoleAppenderFactory consoleAppender = new ConsoleAppenderFactory<>(); consoleAppender.setLogFormat(LOG_PATTERN); root.addAppender(consoleAppender.build(loggerContext, name, layoutFactory, levelFilterFactory, asyncAppenderFactory)); @@ -96,10 +92,11 @@ public void configure(MetricRegistry metricRegistry, String name) { try { final ObjectName objectName = new ObjectName("io.dropwizard:type=Logging"); if (!server.isRegistered(objectName)) { - server.registerMBean(new JMXConfigurator(loggerContext, server, objectName), objectName); + //TODO JMXConfigurator does no longer exist +// server.registerMBean(new JMXConfigurator(loggerContext, server, objectName), objectName); } } - catch (MalformedObjectNameException | InstanceAlreadyExistsException | NotCompliantMBeanException | MBeanRegistrationException e) { + catch (MalformedObjectNameException e) { throw new RuntimeException(e); } finally { 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 6f878f6c9d6..3f0a4b87632 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 {