cleanup money

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

@@ -9,64 +9,104 @@
 import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.resultinfo.FixedLabelResultInfo;
 import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
-import com.bakdata.conquery.models.query.resultinfo.printers.ResultPrinters;
+import com.bakdata.conquery.models.query.resultinfo.printers.Printer;
+import com.bakdata.conquery.models.query.resultinfo.printers.common.LocalizedEnumPrinter;
 import com.bakdata.conquery.models.types.ResultType;
 import com.bakdata.conquery.models.types.SemanticType;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class ResultHeaders {
-	public static ResultInfo datesInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).dates();
+	public static ResultInfo datesInfo() {
 
 		final ResultType.ListT<Object> type = new ResultType.ListT<>(ResultType.Primitive.DATE_RANGE);
 
-		return new FixedLabelResultInfo(label, label, type, Set.of(new SemanticType.EventDateT()), settings, ResultPrinters.printerFor(type, settings));
+		return new FixedLabelResultInfo(type, Set.of(new SemanticType.EventDateT())){
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dates();
+			}
+		};
 	}
 
-	public static ResultInfo historyDatesInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).dates();
+	public static ResultInfo historyDatesInfo() {
 
 		final ResultType.ListT<Object> type = new ResultType.ListT<>(ResultType.Primitive.DATE_RANGE);
 
-		return new FixedLabelResultInfo(label, label, type, Set.of(new SemanticType.EventDateT(), new SemanticType.GroupT()), settings, ResultPrinters.printerFor(type, settings));
+		return new FixedLabelResultInfo(type, Set.of(new SemanticType.EventDateT(), new SemanticType.GroupT())) {
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dates();
+			}
+		};
 	}
 
-	public static ResultInfo sourceInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).source();
-
-		return new FixedLabelResultInfo(label, label, ResultType.Primitive.STRING, Set.of(new SemanticType.SourcesT(), new SemanticType.CategoricalT(), new SemanticType.GroupT()), settings, ResultPrinters.printerFor(ResultType.Primitive.STRING, settings));
+	public static ResultInfo sourceInfo() {
+		return new FixedLabelResultInfo(ResultType.Primitive.STRING, Set.of(new SemanticType.SourcesT(), new SemanticType.CategoricalT(), new SemanticType.GroupT())) {
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).source();
+			}
+		};
 	}
 
-	public static ResultInfo formContextInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).index();
+	public static ResultInfo formContextInfo() {
 
-		return new FixedLabelResultInfo(label, label, ResultType.Primitive.INTEGER, Set.of(), settings, ResultPrinters.printerFor(ResultType.Primitive.INTEGER, settings));
+		return new FixedLabelResultInfo(ResultType.Primitive.INTEGER, Set.of()) {
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).index();
+			}
+		};
 	}
 
-	public static ResultInfo formDateRangeInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale())
-									  .dateRange();
+	public static ResultInfo formDateRangeInfo() {
 
-		return new FixedLabelResultInfo(label, label, ResultType.Primitive.DATE_RANGE, Set.of(), settings, ResultPrinters.printerFor(ResultType.Primitive.DATE_RANGE, settings));
+		return new FixedLabelResultInfo(ResultType.Primitive.DATE_RANGE, Set.of()) {
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dateRange();
+			}
+		};
 	}
 
-	public static ResultInfo formResolutionInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).resolution();
+	public static ResultInfo formResolutionInfo() {
+
+		return new FixedLabelResultInfo(ResultType.Primitive.STRING, Set.of()) {
+			@Override
+			public Printer createPrinter(PrintSettings printSettings) {
+				return new LocalizedEnumPrinter<>(printSettings, Resolution.class);
+			}
 
-		return new FixedLabelResultInfo(label, label, ResultType.Primitive.STRING, Set.of(), settings, new ResultPrinters.LocalizedEnumPrinter<>(settings, Resolution.class));
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).resolution();
+			}
+		};
 	}
 
-	public static ResultInfo formEventDateInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale())
-									  .eventDate();
+	public static ResultInfo formEventDateInfo() {
 
-		return new FixedLabelResultInfo(label, label, ResultType.Primitive.DATE, Set.of(), settings, ResultPrinters.printerFor(ResultType.Primitive.DATE, settings));
+		return new FixedLabelResultInfo(ResultType.Primitive.DATE, Set.of()) {
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).eventDate();
+			}
+		};
 	}
 
-	public static ResultInfo formObservationScopeInfo(PrintSettings settings) {
-		final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).observationScope();
+	public static ResultInfo formObservationScopeInfo() {
+
+		return new FixedLabelResultInfo(ResultType.Primitive.STRING, Set.of()) {
+			@Override
+			public Printer createPrinter(PrintSettings printSettings) {
+				return new LocalizedEnumPrinter<>(printSettings, FeatureGroup.class);
+			}
 
-		return new FixedLabelResultInfo(label, label, ResultType.Primitive.STRING, Set.of(), settings, new ResultPrinters.LocalizedEnumPrinter<>(settings, FeatureGroup.class));
+			@Override
+			public String userColumnName(PrintSettings printSettings) {
+				return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).observationScope();
+			}
+		};
 	}
 }

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

@@ -21,12 +21,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.Validator;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriBuilder;
 
 import com.bakdata.conquery.apiv1.execution.ExecutionStatus;
 import com.bakdata.conquery.apiv1.execution.FullExecutionStatus;
@@ -81,6 +75,7 @@
 import com.bakdata.conquery.models.query.queryplan.DateAggregationAction;
 import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
 import com.bakdata.conquery.models.query.resultinfo.UniqueNamer;
+import com.bakdata.conquery.models.query.resultinfo.printers.JavaResultPrinters;
 import com.bakdata.conquery.models.query.statistics.ResultStatistics;
 import com.bakdata.conquery.models.query.visitor.QueryVisitor;
 import com.bakdata.conquery.models.types.SemanticType;
@@ -89,6 +84,12 @@
 import com.bakdata.conquery.util.QueryUtils;
 import com.bakdata.conquery.util.QueryUtils.NamespacedIdentifiableCollector;
 import com.bakdata.conquery.util.io.IdColumnUtil;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Validator;
+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;
@@ -578,10 +579,10 @@ public ResultStatistics getResultStatistics(SingleTableResult managedQuery) {
 
 
 		final PrintSettings printSettings =
-				new PrintSettings(true, locale, managedQuery.getNamespace(), config, null, null, decimalFormat, integerFormat);
+				new PrintSettings(true, locale, managedQuery.getNamespace(), config, null, null, decimalFormat, integerFormat, new JavaResultPrinters());
 		final UniqueNamer uniqueNamer = new UniqueNamer(printSettings);
 
-		final List<ResultInfo> resultInfos = managedQuery.getResultInfos(printSettings);
+		final List<ResultInfo> resultInfos = managedQuery.getResultInfos();
 
 		final Optional<ResultInfo>
 				dateInfo =

backend/src/main/java/com/bakdata/conquery/apiv1/query/ArrayConceptQuery.java

@@ -11,7 +11,6 @@
 import com.bakdata.conquery.io.jackson.View;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
 import com.bakdata.conquery.models.query.DateAggregationMode;
-import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.QueryPlanContext;
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
@@ -93,17 +92,17 @@ public void collectRequiredQueries(Set<ManagedExecutionId> requiredQueries) {
 	}
 
 	@Override
-	public List<ResultInfo> getResultInfos(PrintSettings printSettings) {
+	public List<ResultInfo> getResultInfos() {
 		final List<ResultInfo> resultInfos = new ArrayList<>();
-		ResultInfo dateInfo = ResultHeaders.datesInfo(printSettings);
+		ResultInfo dateInfo = ResultHeaders.datesInfo();
 
 		if(getResolvedDateAggregationMode() != DateAggregationMode.NONE){
 			// Add one DateInfo for the whole Query
 			resultInfos.add(0, dateInfo);
 		}
 		int lastIndex = resultInfos.size();
 
-		childQueries.forEach(q -> resultInfos.addAll(q.getResultInfos(printSettings)));
+		childQueries.forEach(q -> resultInfos.addAll(q.getResultInfos()));
 
 		if(!resultInfos.isEmpty()) {
 			// Remove DateInfo from each childQuery			

backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java

@@ -11,7 +11,6 @@
 import com.bakdata.conquery.io.cps.CPSBase;
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
-import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.QueryExecutionContext;
 import com.bakdata.conquery.models.query.QueryPlanContext;
 import com.bakdata.conquery.models.query.QueryResolveContext;
@@ -79,7 +78,7 @@ public final Set<ManagedExecutionId> collectRequiredQueries() {
 	public abstract void collectRequiredQueries(Set<ManagedExecutionId> requiredQueries) ;
 
 	@JsonIgnore
-	public abstract List<ResultInfo> getResultInfos(PrintSettings settings);
+	public abstract List<ResultInfo> getResultInfos();
 
 	public void visit(Consumer<Visitable> visitor) {
 		visitor.accept(this);

backend/src/main/java/com/bakdata/conquery/apiv1/query/CQYes.java

@@ -6,7 +6,6 @@
 
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
-import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.QueryPlanContext;
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.queryplan.ConceptQueryPlan;
@@ -33,7 +32,7 @@ public void collectRequiredQueries(Set<ManagedExecutionId> requiredQueries) {
 	}
 
 	@Override
-	public List<ResultInfo> getResultInfos(PrintSettings settings) {
+	public List<ResultInfo> getResultInfos() {
 		return Collections.emptyList();
 	}
 }

backend/src/main/java/com/bakdata/conquery/apiv1/query/ConceptQuery.java

@@ -10,7 +10,6 @@
 import com.bakdata.conquery.io.jackson.View;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
 import com.bakdata.conquery.models.query.DateAggregationMode;
-import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.QueryExecutionContext;
 import com.bakdata.conquery.models.query.QueryPlanContext;
 import com.bakdata.conquery.models.query.QueryResolveContext;
@@ -80,16 +79,16 @@ public void resolve(QueryResolveContext context) {
 	}
 
 	@Override
-	public List<ResultInfo> getResultInfos(PrintSettings printSettings) {
+	public List<ResultInfo> getResultInfos() {
 		Preconditions.checkNotNull(resolvedDateAggregationMode);
 
 		final List<ResultInfo> resultInfos = new ArrayList<>();
 
 		if (resolvedDateAggregationMode != DateAggregationMode.NONE) {
-			resultInfos.add(ResultHeaders.datesInfo(printSettings));
+			resultInfos.add(ResultHeaders.datesInfo());
 		}
 
-		resultInfos.addAll(root.getResultInfos(printSettings));
+		resultInfos.addAll(root.getResultInfos());
 
 		return resultInfos;
 	}

backend/src/main/java/com/bakdata/conquery/apiv1/query/Query.java

@@ -12,7 +12,6 @@
 import com.bakdata.conquery.models.execution.ManagedExecution;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
 import com.bakdata.conquery.models.query.ManagedQuery;
-import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.QueryPlanContext;
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.queryplan.QueryPlan;
@@ -38,7 +37,7 @@ public Set<ManagedExecutionId> collectRequiredQueries() {
 	}
 
 	@JsonIgnore
-	public abstract List<ResultInfo> getResultInfos(PrintSettings printSettings);
+	public abstract List<ResultInfo> getResultInfos();
 
 	@Override
 	public ManagedQuery toManagedExecution(User user, Dataset submittedDataset, MetaStorage storage) {

backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java

@@ -18,7 +18,6 @@
 import com.bakdata.conquery.models.error.ConqueryError;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
 import com.bakdata.conquery.models.query.DateAggregationMode;
-import com.bakdata.conquery.models.query.PrintSettings;
 import com.bakdata.conquery.models.query.QueryExecutionContext;
 import com.bakdata.conquery.models.query.QueryPlanContext;
 import com.bakdata.conquery.models.query.QueryResolveContext;
@@ -27,7 +26,7 @@
 import com.bakdata.conquery.models.query.queryplan.ConceptQueryPlan;
 import com.bakdata.conquery.models.query.queryplan.SecondaryIdQueryPlan;
 import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
-import com.bakdata.conquery.models.query.resultinfo.printers.SecondaryIdResultInfo;
+import com.bakdata.conquery.models.query.resultinfo.SecondaryIdResultInfo;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
@@ -125,12 +124,12 @@ public void resolve(final QueryResolveContext context) {
 	}
 
 	@Override
-	public List<ResultInfo> getResultInfos(PrintSettings printSettings) {
+	public List<ResultInfo> getResultInfos() {
 		final List<ResultInfo> resultInfos = new ArrayList<>();
 
-		resultInfos.add(new SecondaryIdResultInfo(secondaryId, printSettings));
+		resultInfos.add(new SecondaryIdResultInfo(secondaryId));
 
-		resultInfos.addAll(query.getResultInfos(printSettings));
+		resultInfos.addAll(query.getResultInfos());
 
 		return resultInfos;
 	}