Fix elide-model-config build warnings

rishi-aga · rishi-aga · commit b72df48f6239 · 2021-03-28T19:59:38.000-04:00
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
@@ -48,6 +48,7 @@ public class Argument implements Named {
 
     @JsonProperty("values")
     @JsonDeserialize(as = LinkedHashSet.class)
+    @Builder.Default
     private Set<String> 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
@@ -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<Grain> grains = new ArrayList<>();
 
     @JsonProperty("tags")
     @JsonDeserialize(as = LinkedHashSet.class)
+    @Builder.Default
     private Set<String> tags = new LinkedHashSet<>();
 
     @JsonProperty("arguments")
-    @Singular
+    @Builder.Default
     private List<Argument> arguments = new ArrayList<>();
 
     @JsonProperty("values")
     @JsonDeserialize(as = LinkedHashSet.class)
+    @Builder.Default
     private Set<String> 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
@@ -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
@@ -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<String> tags = new LinkedHashSet<>();
 
     @JsonProperty("arguments")
-    @Singular
+    @Builder.Default
     private List<Argument> 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
@@ -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<Join> joins = new ArrayList<>();
 
     @JsonProperty("measures")
-    @Singular
+    @Builder.Default
     private List<Measure> measures = new ArrayList<>();
 
     @JsonProperty("dimensions")
-    @Singular
+    @Builder.Default
     private List<Dimension> dimensions = new ArrayList<>();
 
     @JsonProperty("tags")
     @JsonDeserialize(as = LinkedHashSet.class)
+    @Builder.Default
     private Set<String> tags = new LinkedHashSet<>();
 
     @JsonProperty("arguments")
-    @Singular
+    @Builder.Default
     private List<Argument> arguments = new ArrayList<>();
 
     @JsonProperty("extend")
