Merge remote-tracking branch 'origin/develop' into reintegrate-master

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 = {

autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java

@@ -16,7 +16,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import com.bakdata.conquery.introspection.Introspection;
 import com.bakdata.conquery.io.cps.CPSType;

backend/src/main/java/com/bakdata/conquery/Conquery.java

@@ -1,7 +1,5 @@
 package com.bakdata.conquery;
 
-import javax.validation.Validator;
-
 import ch.qos.logback.classic.Level;
 import com.bakdata.conquery.commands.DistributedStandaloneCommand;
 import com.bakdata.conquery.commands.ManagerNode;
@@ -17,12 +15,13 @@
 import com.bakdata.conquery.mode.local.LocalManagerProvider;
 import com.bakdata.conquery.models.config.ConqueryConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.dropwizard.Application;
-import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.configuration.JsonConfigurationFactory;
 import io.dropwizard.configuration.SubstitutingSourceProvider;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.ConfiguredBundle;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
+import jakarta.validation.Validator;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;

backend/src/main/java/com/bakdata/conquery/apiv1/ApiV1.java

@@ -8,6 +8,8 @@
 import com.bakdata.conquery.io.jetty.CORSResponseFilter;
 import com.bakdata.conquery.io.result.ResultRender.ResultRendererProvider;
 import com.bakdata.conquery.metrics.ActiveUsersFilter;
+import com.bakdata.conquery.models.auth.basic.JWTokenHandler;
+import com.bakdata.conquery.models.auth.web.DefaultAuthFilter;
 import com.bakdata.conquery.models.forms.frontendconfiguration.FormConfigProcessor;
 import com.bakdata.conquery.models.forms.frontendconfiguration.FormProcessor;
 import com.bakdata.conquery.resources.ResourcesProvider;
@@ -25,14 +27,15 @@
 import com.bakdata.conquery.resources.api.QueryResource;
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import org.glassfish.jersey.internal.inject.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
 
 @CPSType(base = ResourcesProvider.class, id = "ApiV1")
-public class ApiV1 implements ResourcesProvider {
+public class ApiV1 extends ResourceConfig implements ResourcesProvider {
 
 	@Override
 	public void registerResources(ManagerNode manager) {
 
-		JerseyEnvironment jersey = manager.getEnvironment().jersey();
+		final JerseyEnvironment jersey = manager.getEnvironment().jersey();
 		// TODO this does not work, if we really want to do api versioning
 		jersey.setUrlPattern("/api");
 
@@ -60,7 +63,10 @@ protected void configure() {
 		 * We use the same instance of the filter for the api servlet and the admin servlet to have a single
 		 * point for authentication.
 		 */
-		jersey.register(manager.getAuthController().getAuthenticationFilter());
+		jersey.register(DefaultAuthFilter.class);
+		DefaultAuthFilter.registerTokenExtractor(JWTokenHandler.JWTokenExtractor.class, jersey.getResourceConfig());
+
+
 		jersey.register(IdParamConverter.Provider.INSTANCE);
 
 		jersey.register(QueryResource.class);

backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java

@@ -2,8 +2,8 @@
 
 import java.net.URI;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import com.bakdata.conquery.apiv1.frontend.FrontendValue;
 import com.bakdata.conquery.io.cps.CPSType;

backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java

@@ -1,7 +1,7 @@
 package com.bakdata.conquery.apiv1;
 
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 import com.bakdata.conquery.models.identifiable.ids.Id;
 import lombok.Getter;

backend/src/main/java/com/bakdata/conquery/apiv1/MeProcessor.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.bakdata.conquery.io.storage.MetaStorage;
 import com.bakdata.conquery.models.auth.AuthorizationHelper;

backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java

@@ -22,12 +22,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
-
 import com.bakdata.conquery.apiv1.execution.ExecutionStatus;
 import com.bakdata.conquery.apiv1.execution.FullExecutionStatus;
 import com.bakdata.conquery.apiv1.execution.OverviewExecutionStatus;
@@ -89,6 +83,11 @@
 import com.bakdata.conquery.util.io.IdColumnUtil;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.MutableClassToInstanceMap;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

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;

backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordCredential.java

@@ -1,6 +1,6 @@
 package com.bakdata.conquery.apiv1.auth;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.models.auth.basic.LocalAuthenticationRealm;

backend/src/main/java/com/bakdata/conquery/apiv1/auth/PasswordHashCredential.java

@@ -1,8 +1,7 @@
 package com.bakdata.conquery.apiv1.auth;
 
-import javax.validation.constraints.NotEmpty;
-
 import com.bakdata.conquery.io.cps.CPSType;
+import jakarta.validation.constraints.NotEmpty;
 
 @CPSType(base = CredentialType.class, id = "PASSWORD_HASH")
 public record PasswordHashCredential(@NotEmpty String hash) implements CredentialType {

backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoRole.java

@@ -4,14 +4,13 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 import com.bakdata.conquery.io.storage.MetaStorage;
 import com.bakdata.conquery.models.auth.entities.Role;
 import com.bakdata.conquery.models.auth.permissions.WildcardPermission;
 import com.bakdata.conquery.models.identifiable.ids.specific.RoleId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NonNull;

backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java

@@ -3,10 +3,6 @@
 import java.util.Collections;
 import java.util.Set;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 import com.bakdata.conquery.io.storage.MetaStorage;
 import com.bakdata.conquery.models.auth.UserManageable;
 import com.bakdata.conquery.models.auth.basic.LocalAuthenticationRealm;
@@ -16,6 +12,9 @@
 import com.bakdata.conquery.models.identifiable.ids.specific.RoleId;
 import com.bakdata.conquery.models.identifiable.ids.specific.UserId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NonNull;

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;
 
 /**

backend/src/main/java/com/bakdata/conquery/apiv1/forms/FormConfigAPI.java

@@ -3,8 +3,8 @@
 import java.time.LocalDateTime;
 import java.util.UUID;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import com.bakdata.conquery.models.auth.entities.User;
 import com.bakdata.conquery.models.datasets.Dataset;

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;

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;

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java

@@ -8,10 +8,10 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
-import javax.validation.Valid;
-import javax.validation.ValidationException;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.ValidationException;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import c10n.C10N;
 import com.bakdata.conquery.ConqueryConstants;

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/FullExportForm.java

@@ -8,8 +8,8 @@
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 
 import c10n.C10N;
 import com.bakdata.conquery.ConqueryConstants;

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;

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendFilterConfiguration.java

@@ -5,9 +5,9 @@
 import java.util.Map;
 
 import javax.annotation.Nullable;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import com.bakdata.conquery.apiv1.FilterTemplate;
 import com.bakdata.conquery.models.identifiable.ids.specific.FilterId;

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendList.java

@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.ws.rs.core.EntityTag;
+import jakarta.ws.rs.core.EntityTag;
 
 import com.bakdata.conquery.models.identifiable.ids.specific.ConceptElementId;
 import com.fasterxml.jackson.core.JsonGenerator;

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendNode.java

@@ -3,8 +3,8 @@
 import java.time.LocalDate;
 import java.util.List;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 import com.bakdata.conquery.apiv1.KeyValue;
 import com.bakdata.conquery.models.common.Range;

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendRoot.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import com.bakdata.conquery.models.identifiable.ids.Id;
 import lombok.Getter;

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendTable.java

@@ -3,9 +3,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import com.bakdata.conquery.models.identifiable.ids.specific.ConnectorId;
 import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId;