Merge pull request #130 from dwasinge/attribute-fields

New attributes for Engagement Nested Objects

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/models/Artifact.java

@@ -1,17 +1,18 @@
 package com.redhat.labs.lodestar.models;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Artifact {
+@EqualsAndHashCode(callSuper = true)
+public class Artifact extends EngagementAttribute {
 
-    private String id;
     private String title;
     private String description;
     private String type;

src/main/java/com/redhat/labs/lodestar/models/Category.java

@@ -1,15 +1,17 @@
 package com.redhat.labs.lodestar.models;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Category {
+@EqualsAndHashCode(callSuper = true)
+public class Category extends EngagementAttribute {
 
     private String name;
     private Integer count;

src/main/java/com/redhat/labs/lodestar/models/Engagement.java

@@ -1,7 +1,6 @@
 package com.redhat.labs.lodestar.models;
 
 import java.util.List;
-import java.util.Map;
 
 import javax.json.bind.annotation.JsonbProperty;
 
@@ -55,6 +54,6 @@ public class Engagement {
     private List<Artifact> artifacts;
     private String commitMessage;
     private List<UseCase> useCases;
-    private Map<String, Double> scores;
+    private List<Score> scores;
 
 }

src/main/java/com/redhat/labs/lodestar/models/EngagementAttribute.java

@@ -0,0 +1,19 @@
+package com.redhat.labs.lodestar.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EngagementAttribute {
+
+    private String uuid;
+    private String created;
+    private String updated;
+    private String engagementUuid;
+
+}

src/main/java/com/redhat/labs/lodestar/models/HostingEnvironment.java

@@ -1,16 +1,17 @@
 package com.redhat.labs.lodestar.models;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class HostingEnvironment {
-    private String id;
+@EqualsAndHashCode(callSuper = true)
+public class HostingEnvironment extends EngagementAttribute {
 
     private String additionalDetails;
 

src/main/java/com/redhat/labs/lodestar/models/Score.java

@@ -0,0 +1,19 @@
+package com.redhat.labs.lodestar.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class Score extends EngagementAttribute {
+
+    private String name;
+    private Double value;
+
+}

src/main/java/com/redhat/labs/lodestar/models/UseCase.java

@@ -1,17 +1,18 @@
 package com.redhat.labs.lodestar.models;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class UseCase {
+@EqualsAndHashCode(callSuper = true)
+public class UseCase extends EngagementAttribute {
 
-    private String id;
     private String title;
     private String description;
     private Integer order;