cleanup

Author: awildturtok

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/MatchingStats.java

@@ -54,7 +54,6 @@ public synchronized CDateRange spanEvents() {
 	}
 
 	public synchronized void putEntry(String source, Entry entry) {
-
 		entries.put(source, entry);
 		span = null;
 		numberOfEntities = -1L;
@@ -66,8 +65,6 @@ public synchronized void putEntry(String source, Entry entry) {
 	@NoArgsConstructor
 	@AllArgsConstructor
 	public static class Entry {
-
-
 		@JsonIgnore
 		private final Set<String> foundEntities = new HashSet<>();
 		private long numberOfEvents;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/ColumnEqualCondition.java

@@ -1,5 +1,6 @@
 package com.bakdata.conquery.models.datasets.concepts.conditions;
 
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.SQLDataType.VARCHAR;
 
@@ -51,13 +52,13 @@ public boolean matches(String value, CalculatedValue<Map<String, Object>> rowMap
 
 	@Override
 	public WhereCondition convertToSqlCondition(CTConditionContext context) {
-		Field<String> field = (Field<String>) (Field<?>) field(DSL.name(column));
+		Field<String> field = field(name(column), String.class);
 		return new MultiSelectCondition(field, values.toArray(String[]::new), context.getFunctionProvider());
 	}
 
 	@Override
 	public Expression buildExpression(CTConditionContext context, ConceptElement<?> id) {
-		return new Expression(id, Map.of(field(DSL.name(getColumn()), VARCHAR).as("%s_equal".formatted(column)), values.stream().map(DSL::val).collect(Collectors.toSet())));
+		return new Expression(id, Map.of(field(name(getColumn()), VARCHAR).as("%s_equal".formatted(column)), values.stream().map(DSL::val).collect(Collectors.toSet())));
 
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/IsEmptyCondition.java

@@ -36,12 +36,12 @@ public boolean matches(String value, CalculatedValue<Map<String, Object>> rowMap
 
 	@Override
 	public WhereCondition convertToSqlCondition(CTConditionContext context) {
-		Condition condition = DSL.field(DSL.name(column)).isNull();
+		Condition condition = field(name(column)).isNull();
 		return new ConditionWrappingWhereCondition(condition);
 	}
 
 	@Override
 	public Expression buildExpression(CTConditionContext context, ConceptElement<?> id) {
-		return new Expression(id, Map.of(DSL.field(DSL.name(column), BOOLEAN).isNull().as("%s_is_empty".formatted(column)), Set.of(val(true))));
+		return new Expression(id, Map.of(field(name(column), BOOLEAN).isNull().as("%s_is_empty".formatted(column)), Set.of(val(true))));
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/IsPresentCondition.java

@@ -34,12 +34,12 @@ public boolean matches(String value, CalculatedValue<Map<String, Object>> rowMap
 
 	@Override
 	public WhereCondition convertToSqlCondition(CTConditionContext context) {
-		Condition condition = DSL.field(DSL.name(column)).isNotNull();
+		Condition condition = field(name(column)).isNotNull();
 		return new ConditionWrappingWhereCondition(condition);
 	}
 
 	@Override
 	public Expression buildExpression(CTConditionContext context, ConceptElement<?> id) {
-		return new Expression(id, Map.of(DSL.field(DSL.name(column)).isNull().as("%s_is_empty".formatted(column)), Set.of(val(false))));
+		return new Expression(id, Map.of(field(name(column)).isNull().as("%s_is_empty".formatted(column)), Set.of(val(false))));
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/conditions/PrefixRangeCondition.java

@@ -57,9 +57,9 @@ public boolean matches(String value, CalculatedValue<Map<String, Object>> rowMap
 
 	@Override
 	public WhereCondition convertToSqlCondition(CTConditionContext context) {
-		Field<?> field = context.getConnectorColumn();
+		Field<String> field = context.getConnectorColumn();
 		String pattern = buildSqlRegexPattern(context.getFunctionProvider());
-		Condition regexCondition = context.getFunctionProvider().likeRegex((Field<String>) field, pattern);
+		Condition regexCondition = context.getFunctionProvider().likeRegex(field, pattern);
 		return new ConditionWrappingWhereCondition(regexCondition);
 	}