Merge pull request #3765 from ingef/release

Merge Release

Author: thoniTUB

.github/CODEOWNERS

@@ -1,2 +1,3 @@
-frontend/*    @kadrian
-backend/*     @awildturtok @thoniTUB
+# From patterns in https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#example-of-a-codeowners-file
+*     @awildturtok @thoniTUB
+/frontend/    @kadrian

.github/dependabot.yml

@@ -6,9 +6,6 @@ updates:
       interval: daily
       time: "04:00"
     open-pull-requests-limit: 10
-    reviewers:
-      - awildturtok
-      - thoniTUB
     assignees:
       - awildturtok
       - thoniTUB
@@ -82,8 +79,6 @@ updates:
       interval: daily
       time: "04:00"
     open-pull-requests-limit: 0
-    reviewers:
-      - Kadrian
     assignees:
       - Kadrian
     labels:

backend/pom.xml

@@ -186,6 +186,7 @@
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-multipart</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-http2</artifactId>

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

@@ -2,8 +2,7 @@
 
 import com.bakdata.conquery.commands.ManagerNode;
 import com.bakdata.conquery.io.cps.CPSType;
-import com.bakdata.conquery.io.jackson.IdRefPathParamConverterProvider;
-import com.bakdata.conquery.io.jersey.IdParamConverter;
+import com.bakdata.conquery.io.jersey.IdPathParamConverterProvider;
 import com.bakdata.conquery.io.jetty.CORSPreflightRequestFilter;
 import com.bakdata.conquery.io.jetty.CORSResponseFilter;
 import com.bakdata.conquery.io.result.ResultRender.ResultRendererProvider;
@@ -53,7 +52,6 @@ protected void configure() {
 
 		jersey.register(CORSPreflightRequestFilter.class);
 		jersey.register(CORSResponseFilter.class);
-		jersey.register(IdRefPathParamConverterProvider.class);
 
 		jersey.register(ActiveUsersFilter.class);
 
@@ -66,8 +64,7 @@ protected void configure() {
 		jersey.register(AuthFilter.class);
 		AuthFilter.registerTokenExtractor(JWTokenHandler.JWTokenExtractor.class, jersey.getResourceConfig());
 
-
-		jersey.register(IdParamConverter.Provider.INSTANCE);
+		jersey.register(IdPathParamConverterProvider.class);
 
 		jersey.register(QueryResource.class);
 		jersey.register(DatasetQueryResource.class);

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

@@ -8,9 +8,6 @@
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.models.config.IndexConfig;
 import com.bakdata.conquery.models.datasets.concepts.Searchable;
-import com.bakdata.conquery.models.identifiable.IdentifiableImpl;
-import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId;
-import com.bakdata.conquery.models.identifiable.ids.specific.SearchIndexId;
 import com.bakdata.conquery.models.index.FrontendValueIndex;
 import com.bakdata.conquery.models.index.FrontendValueIndexKey;
 import com.bakdata.conquery.models.index.IndexCreationException;
@@ -38,13 +35,7 @@
 @ToString
 @Slf4j
 @CPSType(id = "CSV_TEMPLATE", base = SearchIndex.class)
-public class FilterTemplate extends IdentifiableImpl<SearchIndexId> implements Searchable, SearchIndex {
-
-	@NotNull
-	private DatasetId dataset;
-
-	@NotEmpty
-	private final String name;
+public class FilterTemplate extends SearchIndex implements Searchable {
 
 	/**
 	 * Path to CSV File.
@@ -102,8 +93,5 @@ public TrieSearch<FrontendValue> createTrieSearch(IndexConfig config) throws Ind
 		return search.getDelegate();
 	}
 
-	@Override
-	public SearchIndexId createId() {
-		return new SearchIndexId(dataset, name);
-	}
+
 }

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

@@ -16,7 +16,7 @@
 @Getter
 @RequiredArgsConstructor
 @ToString
-public class IdLabel<I extends Id<?>> implements Comparable<IdLabel<I>> {
+public class IdLabel<I extends Id<?, ?>> implements Comparable<IdLabel<I>> {
 	@NotEmpty
 	private final I id;
 	@NotEmpty

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

@@ -4,14 +4,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import jakarta.inject.Inject;
 
 import com.bakdata.conquery.io.storage.MetaStorage;
 import com.bakdata.conquery.models.auth.AuthorizationHelper;
 import com.bakdata.conquery.models.auth.entities.User;
 import com.bakdata.conquery.models.auth.permissions.Ability;
-import com.bakdata.conquery.models.datasets.Dataset;
 import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId;
 import com.bakdata.conquery.models.identifiable.ids.specific.GroupId;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
@@ -46,15 +44,15 @@ public class MeProcessor {
 	public FrontendMeInformation getUserInformation(@NonNull User user) {
 		// Compute dataset ablilities
 		Map<DatasetId, FrontendDatasetAbility> datasetAblilites = new HashMap<>();
-		for (Dataset dataset : datasetRegistry.getAllDatasets()) {
+		for (DatasetId dataset : datasetRegistry.getAllDatasets().toList()) {
 			if (!user.isPermitted(dataset, Ability.READ)) {
 				// User is not allowed to use dataset
 				continue;
 			}
 
 			// User can use the dataset and can possibly upload ids for resolving
 			datasetAblilites.put(
-					dataset.getId(),
+					dataset,
 					new FrontendDatasetAbility(
 							user.isPermitted(dataset, Ability.PRESERVE_ID),
 							user.isPermitted(dataset, Ability.ENTITY_PREVIEW) && user.isPermitted(dataset, Ability.PRESERVE_ID),

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

@@ -1,16 +1,13 @@
 package com.bakdata.conquery.apiv1;
 
 import java.util.List;
-import java.util.Set;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 
 import com.bakdata.conquery.io.storage.MetaStorage;
 import com.bakdata.conquery.models.auth.entities.Group;
 import com.bakdata.conquery.models.auth.entities.Subject;
 import com.bakdata.conquery.models.auth.permissions.Ability;
 import com.bakdata.conquery.models.auth.permissions.Authorized;
-import com.bakdata.conquery.models.auth.permissions.ConqueryPermission;
 import com.bakdata.conquery.models.execution.Labelable;
 import com.bakdata.conquery.models.execution.Owned;
 import com.bakdata.conquery.models.execution.Shareable;
@@ -46,11 +43,18 @@ public class MetaDataPatch implements Taggable, Labelable, ShareInformation {
 	 * @param subject  The subject on whose behalf the patch is executed
 	 * @param <INST>   Type of the instance that is patched
 	 */
-	public <T extends MetaDataPatch, ID extends Id<?>, INST extends Taggable & Shareable & Labelable & Identifiable<? extends ID> & Owned & Authorized> void applyTo(INST instance, MetaStorage storage, Subject subject) {
+	public <INST extends Taggable & Shareable & Labelable & Identifiable<? extends Id<?, ?>, ?> & Owned & Authorized> void applyTo(
+			INST instance,
+			MetaStorage storage,
+			Subject subject) {
 		buildChain(QueryUtils.getNoOpEntryPoint(), storage, subject, instance).accept(this);
 	}
 
-	protected <T extends MetaDataPatch, ID extends Id<?>, INST extends Taggable & Shareable & Labelable & Identifiable<? extends ID> & Owned & Authorized> Consumer<T> buildChain(Consumer<T> patchConsumerChain, MetaStorage storage, Subject subject, INST instance) {
+	protected <T extends MetaDataPatch, INST extends Taggable & Shareable & Labelable & Identifiable<? extends Id<?, ?>, ?> & Owned & Authorized> Consumer<T> buildChain(
+			Consumer<T> patchConsumerChain,
+			MetaStorage storage,
+			Subject subject,
+			INST instance) {
 		if (getTags() != null && subject.isPermitted(instance, Ability.TAG)) {
 			patchConsumerChain = patchConsumerChain.andThen(instance.tagger());
 		}
@@ -62,10 +66,4 @@ protected <T extends MetaDataPatch, ID extends Id<?>, INST extends Taggable & Sh
 		}
 		return patchConsumerChain;
 	}
-
-
-	@FunctionalInterface
-	public interface PermissionCreator<ID extends Id<?>> extends BiFunction<Set<Ability>, ID, ConqueryPermission> {
-
-	}
 }