Merge branch 'develop' into dependabot/npm_and_yarn/frontend/ws-6.2.3

ingef · Aug 1, 2024 · 5aabfc7 · 5aabfc7
2 parents c5d1b7d + 3a918f6
commit 5aabfc7
Show file tree

Hide file tree

Showing 162 changed files with 2,429 additions and 1,082 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/Conquery.java b/backend/src/main/java/com/bakdata/conquery/Conquery.java
@@ -1,12 +1,9 @@
 package com.bakdata.conquery;
 
+import jakarta.validation.Validator;
+
 import ch.qos.logback.classic.Level;
-import com.bakdata.conquery.commands.DistributedStandaloneCommand;
-import com.bakdata.conquery.commands.ManagerNode;
-import com.bakdata.conquery.commands.MigrateCommand;
-import com.bakdata.conquery.commands.PreprocessorCommand;
-import com.bakdata.conquery.commands.RecodeStoreCommand;
-import com.bakdata.conquery.commands.ShardNode;
+import com.bakdata.conquery.commands.*;
 import com.bakdata.conquery.io.jackson.Jackson;
 import com.bakdata.conquery.io.jackson.MutableInjectableValues;
 import com.bakdata.conquery.metrics.prometheus.PrometheusBundle;
@@ -22,7 +19,6 @@
 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;
@@ -51,7 +47,7 @@ public void initialize(Bootstrap<ConqueryConfig> bootstrap) {
 		// main config file is json
 		bootstrap.setConfigurationFactoryFactory(JsonConfigurationFactory::new);
 
-		bootstrap.addCommand(new ShardNode());
+		bootstrap.addCommand(new ShardCommand());
 		bootstrap.addCommand(new PreprocessorCommand());
 		bootstrap.addCommand(new DistributedStandaloneCommand(this));
 		bootstrap.addCommand(new RecodeStoreCommand());

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java
@@ -39,6 +39,7 @@
 import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept;
 import com.bakdata.conquery.apiv1.query.concept.specific.CQOr;
 import com.bakdata.conquery.apiv1.query.concept.specific.external.CQExternal;
+import com.bakdata.conquery.apiv1.query.concept.specific.external.EntityResolver;
 import com.bakdata.conquery.io.result.ResultRender.ResultRendererProvider;
 import com.bakdata.conquery.io.storage.MetaStorage;
 import com.bakdata.conquery.metrics.ExecutionMetrics;
@@ -108,7 +109,6 @@ public class QueryProcessor {
 	private Validator validator;
 
 
-
 	public Stream<ExecutionStatus> getAllQueries(Dataset dataset, HttpServletRequest req, Subject subject, boolean allProviders) {
 		final Collection<ManagedExecution> allQueries = storage.getAllExecutions();
 
@@ -294,14 +294,13 @@ public FullExecutionStatus getQueryFullStatus(ManagedExecution query, Subject su
 	public ExternalUploadResult uploadEntities(Subject subject, Dataset dataset, ExternalUpload upload) {
 
 		final Namespace namespace = datasetRegistry.get(dataset.getId());
-		final CQExternal.ResolveStatistic statistic = CQExternal.resolveEntities(
+		final EntityResolver.ResolveStatistic statistic = namespace.getEntityResolver().resolveEntities(
 				upload.getValues(),
 				upload.getFormat(),
 				namespace.getStorage().getIdMapping(),
 				config.getIdColumns(),
 				config.getLocale().getDateReader(),
-				upload.isOneRowPerEntity(),
-				true
+				upload.isOneRowPerEntity()
 		);
 
 		// Resolving nothing is a problem thus we fail.

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendSelect.java b/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendSelect.java
@@ -1,7 +1,6 @@
 package com.bakdata.conquery.apiv1.frontend;
 
 import com.bakdata.conquery.models.identifiable.ids.specific.SelectId;
-import com.bakdata.conquery.models.types.ResultType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 import lombok.Data;
@@ -15,7 +14,7 @@ public class FrontendSelect {
 	private SelectId id;
 	private String label;
 	private String description;
-	private ResultType resultType;
+	private String resultType;
 	@JsonProperty("default")
 	private Boolean isDefault;
 }