Skip to content

Commit 323d96a

Browse files
author
Rishi Agarwal
committed
Review Comments
1 parent 4b1b6b5 commit 323d96a

File tree

6 files changed

+92
-76
lines changed

6 files changed

+92
-76
lines changed

‎elide-datastore/elide-datastore-aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/dynamic/TableTypeTest.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public class TableTypeTest {
4747
@Test
4848
void testGetAndSetField() throws Exception {
4949
Table testTable = Table.builder()
50-
.dimensions(Arrays.asList(Dimension.builder()
50+
.dimension(Dimension.builder()
5151
.name("dim1")
5252
.type(Type.BOOLEAN)
53-
.build()))
53+
.build())
5454
.build();
5555

5656
TableType testType = new TableType(testTable);
@@ -177,7 +177,7 @@ void testMeasureAnnotations() throws Exception {
177177
Table testTable = Table.builder()
178178
.table("table1")
179179
.name("Table")
180-
.measures(Arrays.asList(Measure.builder()
180+
.measure(Measure.builder()
181181
.type(Type.MONEY)
182182
.category("category1")
183183
.definition("SUM{{ price}}")
@@ -187,7 +187,7 @@ void testMeasureAnnotations() throws Exception {
187187
.readAccess("Admin")
188188
.description("A measure")
189189
.tags(tags)
190-
.build()))
190+
.build())
191191
.build();
192192

193193
TableType testType = new TableType(testTable);
@@ -217,7 +217,7 @@ void testDimensionAnnotations() throws Exception {
217217
Table testTable = Table.builder()
218218
.table("table1")
219219
.name("Table")
220-
.dimensions(Arrays.asList(Dimension.builder()
220+
.dimension(Dimension.builder()
221221
.type(Type.TEXT)
222222
.category("category1")
223223
.definition("{{region}}")
@@ -229,7 +229,7 @@ void testDimensionAnnotations() throws Exception {
229229
.tags(tags)
230230
.cardinality("small")
231231
.tableSource("region.id")
232-
.build()))
232+
.build())
233233
.build();
234234

235235
TableType testType = new TableType(testTable);
@@ -258,11 +258,11 @@ void testDimensionTableValues() throws Exception {
258258
Table testTable = Table.builder()
259259
.table("table1")
260260
.name("Table")
261-
.dimensions(Arrays.asList(Dimension.builder()
261+
.dimension(Dimension.builder()
262262
.type(Type.COORDINATE)
263263
.name("location")
264264
.values(values)
265-
.build()))
265+
.build())
266266
.build();
267267

268268
TableType testType = new TableType(testTable);
@@ -281,7 +281,7 @@ void testTimeDimensionAnnotations() throws Exception {
281281
Table testTable = Table.builder()
282282
.table("table1")
283283
.name("Table")
284-
.dimensions(Arrays.asList(Dimension.builder()
284+
.dimension(Dimension.builder()
285285
.type(Type.TIME)
286286
.category("category1")
287287
.definition("{{createdOn }}")
@@ -291,7 +291,7 @@ void testTimeDimensionAnnotations() throws Exception {
291291
.readAccess("Admin")
292292
.description("A time dimension")
293293
.tags(tags)
294-
.build()))
294+
.build())
295295
.build();
296296

297297
TableType testType = new TableType(testTable);
@@ -323,19 +323,19 @@ void testMultipleTimeDimensionGrains() throws Exception {
323323
Table testTable = Table.builder()
324324
.table("table1")
325325
.name("Table")
326-
.dimensions(Arrays.asList(Dimension.builder()
326+
.dimension(Dimension.builder()
327327
.type(Type.TIME)
328328
.definition("{{createdOn}}")
329329
.name("createdOn")
330-
.grains(Arrays.asList(Grain.builder()
330+
.grain(Grain.builder()
331331
.sql("some sql")
332332
.type(Grain.GrainType.DAY)
333-
.build(),
334-
Grain.builder()
333+
.build())
334+
.grain(Grain.builder()
335335
.sql("some other sql")
336336
.type(Grain.GrainType.YEAR)
337-
.build()))
338-
.build()))
337+
.build())
338+
.build())
339339
.build();
340340

341341
TableType testType = new TableType(testTable);
@@ -356,21 +356,21 @@ void testMultipleTimeDimensionGrains() throws Exception {
356356
void testJoinField() throws Exception {
357357
Table testTable1 = Table.builder()
358358
.name("table1")
359-
.joins(Arrays.asList(Join.builder()
359+
.join(Join.builder()
360360
.definition("{{id }} = {{ table2.id}}")
361361
.kind(Join.Kind.TOONE)
362362
.type(Join.Type.INNER)
363363
.name("join1")
364364
.to("table2.dim2")
365-
.build()))
365+
.build())
366366
.build();
367367

368368
Table testTable2 = Table.builder()
369369
.name("table2")
370-
.dimensions(Arrays.asList(Dimension.builder()
370+
.dimension(Dimension.builder()
371371
.name("dim2")
372372
.type(Type.BOOLEAN)
373-
.build()))
373+
.build())
374374
.build();
375375

376376
TableType testType1 = new TableType(testTable1);
@@ -397,11 +397,11 @@ void testHiddenDimension() throws Exception {
397397
Table testTable = Table.builder()
398398
.table("table1")
399399
.name("Table")
400-
.dimensions(Arrays.asList(Dimension.builder()
400+
.dimension(Dimension.builder()
401401
.name("dim1")
402402
.type(Type.BOOLEAN)
403403
.hidden(true)
404-
.build()))
404+
.build())
405405
.build();
406406

407407
TableType testType = new TableType(testTable);
@@ -420,11 +420,11 @@ void testHiddenMeasure() throws Exception {
420420
Table testTable = Table.builder()
421421
.table("table1")
422422
.name("Table")
423-
.measures(Arrays.asList(Measure.builder()
423+
.measure(Measure.builder()
424424
.name("measure1")
425425
.type(Type.BOOLEAN)
426426
.hidden(true)
427-
.build()))
427+
.build())
428428
.build();
429429

430430
TableType testType = new TableType(testTable);
@@ -443,11 +443,11 @@ void testInvalidResolver() throws Exception {
443443
Table testTable = Table.builder()
444444
.table("table1")
445445
.name("Table")
446-
.measures(Arrays.asList(Measure.builder()
446+
.measure(Measure.builder()
447447
.name("measure1")
448448
.type(Type.BOOLEAN)
449449
.queryPlanResolver("does.not.exist.class")
450-
.build()))
450+
.build())
451451
.build();
452452

453453
TableType testType = new TableType(testTable);

‎elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Argument.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import lombok.Builder;
1414
import lombok.Data;
1515
import lombok.EqualsAndHashCode;
16-
import lombok.NoArgsConstructor;
1716

1817
import java.util.LinkedHashSet;
1918
import java.util.Set;
@@ -33,7 +32,6 @@
3332
@Data
3433
@EqualsAndHashCode()
3534
@AllArgsConstructor
36-
@NoArgsConstructor
3735
@Builder
3836
public class Argument implements Named {
3937

@@ -48,15 +46,18 @@ public class Argument implements Named {
4846

4947
@JsonProperty("values")
5048
@JsonDeserialize(as = LinkedHashSet.class)
51-
@Builder.Default
52-
private Set<String> values = new LinkedHashSet<>();
49+
private Set<String> values;
5350

5451
@JsonProperty("tableSource")
5552
private String tableSource;
5653

5754
@JsonProperty("default")
5855
private Object defaultValue;
5956

57+
public Argument() {
58+
this.values = new LinkedHashSet<>();
59+
}
60+
6061
/**
6162
* Returns description of the argument.
6263
* If null, returns the name

‎elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Dimension.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import lombok.Builder;
1414
import lombok.Data;
1515
import lombok.EqualsAndHashCode;
16-
import lombok.NoArgsConstructor;
16+
import lombok.Singular;
1717

1818
import java.util.ArrayList;
1919
import java.util.LinkedHashSet;
@@ -44,7 +44,6 @@
4444
@Data
4545
@EqualsAndHashCode()
4646
@AllArgsConstructor
47-
@NoArgsConstructor
4847
@Builder
4948
public class Dimension implements Named {
5049

@@ -61,12 +60,10 @@ public class Dimension implements Named {
6160
private String category;
6261

6362
@JsonProperty("hidden")
64-
@Builder.Default
65-
private Boolean hidden = false;
63+
private Boolean hidden;
6664

6765
@JsonProperty("readAccess")
68-
@Builder.Default
69-
private String readAccess = "Prefab.Role.All";
66+
private String readAccess;
7067

7168
@JsonProperty("definition")
7269
private String definition;
@@ -78,26 +75,33 @@ public class Dimension implements Named {
7875
private Type type;
7976

8077
@JsonProperty("grains")
81-
@Builder.Default
82-
private List<Grain> grains = new ArrayList<>();
78+
@Singular
79+
private List<Grain> grains;
8380

8481
@JsonProperty("tags")
8582
@JsonDeserialize(as = LinkedHashSet.class)
86-
@Builder.Default
87-
private Set<String> tags = new LinkedHashSet<>();
83+
private Set<String> tags;
8884

8985
@JsonProperty("arguments")
90-
@Builder.Default
91-
private List<Argument> arguments = new ArrayList<>();
86+
@Singular
87+
private List<Argument> arguments;
9288

9389
@JsonProperty("values")
9490
@JsonDeserialize(as = LinkedHashSet.class)
95-
@Builder.Default
96-
private Set<String> values = new LinkedHashSet<>();
91+
private Set<String> values;
9792

9893
@JsonProperty("tableSource")
9994
private String tableSource;
10095

96+
public Dimension() {
97+
this.hidden = false;
98+
this.readAccess = "Prefab.Role.All";
99+
this.grains = new ArrayList<>();
100+
this.tags = new LinkedHashSet<>();
101+
this.values = new LinkedHashSet<>();
102+
this.arguments = new ArrayList<>();
103+
}
104+
101105
/**
102106
* Returns description of the dimension.
103107
* If null, returns the name.

‎elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Join.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import com.fasterxml.jackson.annotation.JsonInclude;
99
import com.fasterxml.jackson.annotation.JsonProperty;
1010
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
11+
1112
import lombok.AllArgsConstructor;
1213
import lombok.Builder;
1314
import lombok.Data;
1415
import lombok.EqualsAndHashCode;
15-
import lombok.NoArgsConstructor;
1616

1717
/**
1818
* Joins describe the SQL expression necessary to join two physical tables.
@@ -29,7 +29,6 @@
2929
@Data
3030
@EqualsAndHashCode()
3131
@AllArgsConstructor
32-
@NoArgsConstructor
3332
@Builder
3433
public class Join implements Named {
3534

@@ -43,12 +42,15 @@ public class Join implements Named {
4342
private Join.Type type;
4443

4544
@JsonProperty("kind")
46-
@Builder.Default
47-
private Join.Kind kind = Join.Kind.TOONE;
45+
private Join.Kind kind;
4846

4947
@JsonProperty("definition")
5048
private String definition;
5149

50+
public Join() {
51+
this.kind = Join.Kind.TOONE;
52+
}
53+
5254
public enum Kind {
5355

5456
TOONE("toOne"),

‎elide-model-config/src/main/java/com/yahoo/elide/modelconfig/model/Measure.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import lombok.Builder;
1414
import lombok.Data;
1515
import lombok.EqualsAndHashCode;
16-
import lombok.NoArgsConstructor;
16+
import lombok.Singular;
1717

1818
import java.util.ArrayList;
1919
import java.util.LinkedHashSet;
@@ -40,7 +40,6 @@
4040
@Data
4141
@EqualsAndHashCode()
4242
@AllArgsConstructor
43-
@NoArgsConstructor
4443
@Builder
4544
public class Measure implements Named {
4645

@@ -57,12 +56,10 @@ public class Measure implements Named {
5756
private String category;
5857

5958
@JsonProperty("hidden")
60-
@Builder.Default
61-
private Boolean hidden = false;
59+
private Boolean hidden;
6260

6361
@JsonProperty("readAccess")
64-
@Builder.Default
65-
private String readAccess = "Prefab.Role.All";
62+
private String readAccess;
6663

6764
@JsonProperty("definition")
6865
private String definition;
@@ -75,12 +72,18 @@ public class Measure implements Named {
7572

7673
@JsonProperty("tags")
7774
@JsonDeserialize(as = LinkedHashSet.class)
78-
@Builder.Default
79-
private Set<String> tags = new LinkedHashSet<>();
75+
private Set<String> tags;
8076

8177
@JsonProperty("arguments")
82-
@Builder.Default
83-
private List<Argument> arguments = new ArrayList<>();
78+
@Singular
79+
private List<Argument> arguments;
80+
81+
public Measure() {
82+
this.hidden = false;
83+
this.readAccess = "Prefab.Role.All";
84+
this.tags = new LinkedHashSet<>();
85+
this.arguments = new ArrayList<>();
86+
}
8487

8588
/**
8689
* Returns description of the measure.

0 commit comments

Comments
 (0)