Merge pull request #2985 from ingef/fix/form_serdes_error

Fix/form serdes error
ingef · Mar 17, 2023 · 3ca6c78 · 3ca6c78
2 parents 6a8414c + 105463f
commit 3ca6c78
Show file tree

Hide file tree

Showing 30 changed files with 305 additions and 92 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/Form.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/Form.java
@@ -14,13 +14,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ClassToInstanceMap;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 
 /**
  * API representation of a form query.
  */
+@EqualsAndHashCode
 public abstract class Form implements QueryDescription {
 
 	/**
@@ -30,6 +32,7 @@ public abstract class Form implements QueryDescription {
 	@Nullable
 	@Getter
 	@Setter
+	@EqualsAndHashCode.Exclude
 	private JsonNode values;
 
 	@JsonIgnore

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java
@@ -18,12 +18,14 @@
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.fasterxml.jackson.annotation.JsonView;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 @CPSType(id = "ABSOLUTE", base = Mode.class)
+@EqualsAndHashCode(callSuper = true, doNotUseGetters = true)
 public class AbsoluteMode extends Mode {
 	@NotNull
 	@Valid
@@ -35,6 +37,7 @@ public class AbsoluteMode extends Mode {
 
 
 	@JsonView(View.InternalCommunication.class)
+	@EqualsAndHashCode.Exclude
 	private ArrayConceptQuery resolvedFeatures;
 
 	@Override

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java
@@ -19,6 +19,7 @@
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.fasterxml.jackson.annotation.JsonView;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -43,6 +44,7 @@ public void visit(Consumer<Visitable> visitor) {
 
 
 	@JsonView(View.InternalCommunication.class)
+	@EqualsAndHashCode.Exclude
 	private ArrayConceptQuery resolvedFeatures;
 
 	@Override

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java
@@ -39,20 +39,23 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
 @Getter
 @Setter
 @CPSType(id = "EXPORT_FORM", base = QueryDescription.class)
+@EqualsAndHashCode(callSuper = true)
 public class ExportForm extends Form implements InternalForm {
 
 	@NotNull
 	@JsonProperty("queryGroup")
 	private ManagedExecutionId queryGroupId;
 
 	@JsonIgnore
+	@EqualsAndHashCode.Exclude
 	private ManagedQuery queryGroup;
 
 	@NotNull
@@ -61,6 +64,7 @@ public class ExportForm extends Form implements InternalForm {
 	private Mode timeMode;
 
 	@NotEmpty
+	@Valid
 	private List<CQElement> features = ImmutableList.of();
 
 	@NotNull
@@ -70,8 +74,10 @@ public class ExportForm extends Form implements InternalForm {
 	private boolean alsoCreateCoarserSubdivisions = false;
 
 	@JsonIgnore
+	@EqualsAndHashCode.Exclude
 	private Query prerequisite;
 	@JsonIgnore
+	@EqualsAndHashCode.Exclude
 	private List<Resolution> resolvedResolutions;
 	@Override
 	public void visit(Consumer<Visitable> visitor) {

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/Mode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/Mode.java
@@ -6,16 +6,19 @@
 import com.bakdata.conquery.models.query.Visitable;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "value")
 @CPSBase
+@EqualsAndHashCode
 public abstract class Mode implements Visitable {
 
 	@Getter
 	@Setter
 	@JsonBackReference
+	@EqualsAndHashCode.Exclude
 	private ExportForm form;
 
 	public abstract void resolve(QueryResolveContext context);

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java b/backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java
@@ -17,11 +17,13 @@
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.fasterxml.jackson.annotation.JsonView;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter @Setter
-@CPSType(id="RELATIVE", base=Mode.class)
+@CPSType(id = "RELATIVE", base = Mode.class)
+@EqualsAndHashCode(callSuper = true)
 public class RelativeMode extends Mode {
 	@NotNull
 	private CalendarUnit timeUnit;
@@ -36,6 +38,7 @@ public class RelativeMode extends Mode {
 
 
 	@JsonView(View.InternalCommunication.class)
+	@EqualsAndHashCode.Exclude
 	private ArrayConceptQuery resolvedFeatures;
 
 	@Override

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/CQElement.java
@@ -23,11 +23,13 @@
 import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "type")
 @CPSBase
+@EqualsAndHashCode
 public abstract class CQElement implements Visitable {
 
 	/**

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java
@@ -18,13 +18,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.validation.ValidationMethod;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
 @ToString(exclude = "concept")
+@EqualsAndHashCode
 public class CQTable {
 	@Valid
 	@NotNull
@@ -35,6 +37,7 @@ public class CQTable {
 	private List<Select> selects = Collections.emptyList();
 
 	@JsonBackReference
+	@EqualsAndHashCode.Exclude
 	private CQConcept concept;
 
 	@NsIdRef

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java
@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -40,6 +41,7 @@
 @NoArgsConstructor
 @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "type")
 @CPSBase
+@EqualsAndHashCode
 @ToString(of = "value")
 public abstract class FilterValue<VALUE> {
 	@NotNull

diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQConcept.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/specific/CQConcept.java
@@ -49,6 +49,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
 import io.dropwizard.validation.ValidationMethod;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -59,6 +60,7 @@
 @CPSType(id = "CONCEPT", base = CQElement.class)
 @Slf4j
 @ToString
+@EqualsAndHashCode(callSuper = true, doNotUseGetters = true)
 public class CQConcept extends CQElement implements NamespacedIdentifiableHolding, ExportForm.DefaultSelectSettable {
 
 	/**

diff --git a/backend/src/main/java/com/bakdata/conquery/models/auth/entities/User.java b/backend/src/main/java/com/bakdata/conquery/models/auth/entities/User.java
@@ -43,7 +43,7 @@ public class User extends PermissionOwner<UserId> implements Principal, RoleOwne
 	private final transient ShiroUserAdapter shiroUserAdapter;
 
 	@JsonCreator
-	public User(String name, String label) {
+	protected User(String name, String label) {
 		this(name, label, null);
 	}
 

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/Column.java
@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Preconditions;
 import io.dropwizard.validation.ValidationMethod;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -42,6 +43,7 @@ public class Column extends Labeled<ColumnId> implements NamespacedIdentifiable<
 
 	@JsonBackReference
 	@NotNull
+	@EqualsAndHashCode.Exclude
 	private Table table;
 	@NotNull
 	private MajorTypeId type;

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/ImportColumn.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/ImportColumn.java
@@ -11,13 +11,16 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor(onConstructor_ = {@JsonCreator})
 public class ImportColumn extends NamedImpl<ImportColumnId> implements NamespacedIdentifiable<ImportColumnId> {
 	// TODO reduce usage of this class, it does nothing except hold a description
-	@JsonBackReference @NotNull
+	@JsonBackReference
+	@NotNull
+	@EqualsAndHashCode.Exclude
 	private final Import parent;
 
 	// Only used on ManagerNode for com.bakdata.conquery.models.datasets.concepts.filters.specific.AbstractSelectFilter.addImport

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Concept.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Concept.java
@@ -30,6 +30,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -42,6 +43,7 @@
 @ToString(of = {"connectors"})
 @Getter
 @Setter
+@EqualsAndHashCode(callSuper = true)
 public abstract class Concept<CONNECTOR extends Connector> extends ConceptElement<ConceptId> implements Authorized {
 
 	/**

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/ConceptElement.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/ConceptElement.java
@@ -12,9 +12,11 @@
 import com.bakdata.conquery.models.identifiable.ids.specific.ConceptElementId;
 import com.bakdata.conquery.models.identifiable.ids.specific.ConceptTreeChildId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
+@EqualsAndHashCode(callSuper = true)
 public abstract class ConceptElement<ID extends ConceptElementId<? extends ConceptElement<? extends ID>>> extends Labeled<ID> implements NamespacedIdentifiable<ID> {
 
 	@Getter
@@ -38,12 +40,12 @@ public abstract class ConceptElement<ID extends ConceptElementId<? extends Conce
 	public ConceptTreeChild getChildById(ConceptTreeChildId conceptTreeChildId) {
 		throw new UnsupportedOperationException("The concept "+this+" has no children. Was looking for "+conceptTreeChildId);
 	}
-	
+
 	@Override
 	public String toString() {
 		return String.format("%s[%s]", this.getClass().getSimpleName(), getLabel());
 	}
-	
+
 	@JsonIgnore
 	public abstract Concept<?> getConcept();
 

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Connector.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/Connector.java
@@ -29,6 +29,7 @@
 import com.google.common.collect.Multiset.Entry;
 import io.dropwizard.validation.ValidationMethod;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +53,7 @@ public abstract class Connector extends Labeled<ConnectorId> implements SelectHo
 	private List<ValidityDate> validityDates = new ArrayList<>();
 
 	@JsonBackReference
+	@EqualsAndHashCode.Exclude
 	private Concept<?> concept;
 
 	@JsonIgnore

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/StructureNode.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/StructureNode.java
@@ -7,15 +7,15 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
-import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.apiv1.KeyValue;
+import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.models.datasets.Dataset;
 import com.bakdata.conquery.models.identifiable.Labeled;
 import com.bakdata.conquery.models.identifiable.ids.specific.ConceptId;
 import com.bakdata.conquery.models.identifiable.ids.specific.StructureNodeId;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
-
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -32,6 +32,7 @@ public class StructureNode extends Labeled<StructureNodeId> {
 	@Valid @JsonManagedReference(MANAGED_STRUCTURE_STRUCTURE)
 	private List<StructureNode> children = Collections.emptyList();
 	@JsonBackReference(MANAGED_STRUCTURE_STRUCTURE)
+	@EqualsAndHashCode.Exclude
 	private StructureNode parent;
 	@Getter
 	private LinkedHashSet<ConceptId> containedRoots = new LinkedHashSet<>();

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/ValidityDate.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/ValidityDate.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dropwizard.validation.ValidationMethod;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -26,6 +27,7 @@ public class ValidityDate extends Labeled<ValidityDateId> implements NamespacedI
 	@NotNull
 	private Column column;
 	@JsonBackReference
+	@EqualsAndHashCode.Exclude
 	private Connector connector;
 
 	@Override

diff --git a/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java b/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.dropwizard.validation.ValidationMethod;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -31,12 +32,14 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, property = "type")
 @CPSBase
 @Slf4j
+@EqualsAndHashCode(callSuper = true)
 public abstract class Filter<FILTER_VALUE> extends Labeled<FilterId> implements NamespacedIdentifiable<FilterId> {
 
 	private String unit;
 	@JsonAlias("description")
 	private String tooltip;
 	@JsonBackReference
+	@EqualsAndHashCode.Exclude
 	private Connector connector;
 	private String pattern;
 	private Boolean allowDropFile;