Skip to content

Fix elide-model-config build warnings #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix elide-model-config build warnings #1971

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b95cd9f
Fix elide-model-config build warnings
rishi-aga Mar 29, 2021
4b1b6b5
Build Fixes
rishi-aga Mar 29, 2021
323d96a
Review Comments
Mar 30, 2021
0c93875
Merge branch 'master' into fixModelConfigBuildWarnings
aklish Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix elide-model-config build warnings
  • Loading branch information
@rishi-aga
rishi-aga authored and Rishi Agarwal committed Mar 30, 2021
commit b95cd9f60836d2e044799e944e2ee447f45725e4
1 change: 1 addition & 0 deletions elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 6 additions & 3 deletions elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.Singular;

import java.util.ArrayList;
import java.util.LinkedHashSet;
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down
1 change: 1 addition & 0 deletions elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 4 additions & 2 deletions elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.Singular;

import java.util.ArrayList;
import java.util.LinkedHashSet;
Expand Down Expand Up @@ -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")
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we replacing Singular?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

private List<Argument> arguments = new ArrayList<>();

/**
Expand Down
13 changes: 8 additions & 5 deletions elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.Singular;

import java.util.ArrayList;
import java.util.LinkedHashSet;
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down