From b72df48f6239c598fcdd5169b6b8f161319ba0f2 Mon Sep 17 00:00:00 2001 From: rishi-aga Date: Sun, 28 Mar 2021 19:59:12 -0400 Subject: [PATCH] Fix elide-model-config build warnings --- .../com/yahoo/elide/modelconfig/model/Argument.java | 1 + .../yahoo/elide/modelconfig/model/Dimension.java | 9 ++++++--- .../com/yahoo/elide/modelconfig/model/Join.java | 1 + .../com/yahoo/elide/modelconfig/model/Measure.java | 6 ++++-- .../com/yahoo/elide/modelconfig/model/Table.java | 13 ++++++++----- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java index 6979a22888..34a17bea7d 100644 --- a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java +++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java @@ -48,6 +48,7 @@ public class Argument implements Named { @JsonProperty("values") @JsonDeserialize(as = LinkedHashSet.class) + @Builder.Default private Set values = new LinkedHashSet<>(); @JsonProperty("tableSource") diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java index 3e6260073a..0c1704f33e 100644 --- a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java +++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java @@ -14,7 +14,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.Singular; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -62,9 +61,11 @@ public class Dimension implements Named { private String category; @JsonProperty("hidden") + @Builder.Default private Boolean hidden = false; @JsonProperty("readAccess") + @Builder.Default private String readAccess = "Prefab.Role.All"; @JsonProperty("definition") @@ -77,19 +78,21 @@ public class Dimension implements Named { private Type type; @JsonProperty("grains") - @Singular + @Builder.Default private List grains = new ArrayList<>(); @JsonProperty("tags") @JsonDeserialize(as = LinkedHashSet.class) + @Builder.Default private Set tags = new LinkedHashSet<>(); @JsonProperty("arguments") - @Singular + @Builder.Default private List arguments = new ArrayList<>(); @JsonProperty("values") @JsonDeserialize(as = LinkedHashSet.class) + @Builder.Default private Set values = new LinkedHashSet<>(); @JsonProperty("tableSource") diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java index 61851b3e50..80a0c053a5 100644 --- a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java +++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java @@ -43,6 +43,7 @@ public class Join implements Named { private Join.Type type; @JsonProperty("kind") + @Builder.Default private Join.Kind kind = Join.Kind.TOONE; @JsonProperty("definition") diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java index 950d5bc690..06537d1ae7 100644 --- a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java +++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java @@ -14,7 +14,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.Singular; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -58,9 +57,11 @@ public class Measure implements Named { private String category; @JsonProperty("hidden") + @Builder.Default private Boolean hidden = false; @JsonProperty("readAccess") + @Builder.Default private String readAccess = "Prefab.Role.All"; @JsonProperty("definition") @@ -74,10 +75,11 @@ public class Measure implements Named { @JsonProperty("tags") @JsonDeserialize(as = LinkedHashSet.class) + @Builder.Default private Set tags = new LinkedHashSet<>(); @JsonProperty("arguments") - @Singular + @Builder.Default private List arguments = new ArrayList<>(); /** diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java index 6acc362b36..32dfcb68e3 100644 --- a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java +++ b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java @@ -17,7 +17,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.Singular; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -68,9 +67,11 @@ public class Table implements Named { private String dbConnectionName; @JsonProperty("isFact") + @Builder.Default private Boolean isFact = true; @JsonProperty("hidden") + @Builder.Default private Boolean hidden = false; @JsonProperty("description") @@ -86,26 +87,28 @@ public class Table implements Named { private String cardinality; @JsonProperty("readAccess") + @Builder.Default private String readAccess = "Prefab.Role.All"; @JsonProperty("joins") - @Singular + @Builder.Default private List joins = new ArrayList<>(); @JsonProperty("measures") - @Singular + @Builder.Default private List measures = new ArrayList<>(); @JsonProperty("dimensions") - @Singular + @Builder.Default private List dimensions = new ArrayList<>(); @JsonProperty("tags") @JsonDeserialize(as = LinkedHashSet.class) + @Builder.Default private Set tags = new LinkedHashSet<>(); @JsonProperty("arguments") - @Singular + @Builder.Default private List arguments = new ArrayList<>(); @JsonProperty("extend")