Additional lombok annotations (hash code/equals) for UI components

vovietanh · May 2, 2016 · 5424d20 · 5424d20
1 parent 94e12f8
commit 5424d20
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/...plearning4j-ui-components/src/main/java/org/deeplearning4j/ui/components/chart/Chart.java b/...plearning4j-ui-components/src/main/java/org/deeplearning4j/ui/components/chart/Chart.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.deeplearning4j.ui.api.Component;
 import org.deeplearning4j.ui.components.chart.style.StyleChart;
@@ -28,7 +29,7 @@
  *
  * @author Alex BLack
  */
-@Data
+@Data @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public abstract class Chart extends Component {
 
@@ -65,7 +66,7 @@ public Chart(String componentType, Builder builder) {
     }
 
 
-    @Getter
+    @Getter @SuppressWarnings("unchecked")
     public static abstract class Builder<T extends Builder<T>> {
 
         private String title;

diff --git a/...rning4j-ui-components/src/main/java/org/deeplearning4j/ui/components/chart/ChartLine.java b/...rning4j-ui-components/src/main/java/org/deeplearning4j/ui/components/chart/ChartLine.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.deeplearning4j.ui.components.chart.style.StyleChart;
 
 import java.util.ArrayList;
@@ -30,7 +31,7 @@
  *
  * @author Alex Black
  */
-@Data
+@Data @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ChartLine extends Chart {
     public static final String COMPONENT_TYPE = "ChartLine";

diff --git a/...-ui-components/src/main/java/org/deeplearning4j/ui/components/chart/style/StyleChart.java b/...-ui-components/src/main/java/org/deeplearning4j/ui/components/chart/style/StyleChart.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.deeplearning4j.ui.api.Style;
 import org.deeplearning4j.ui.api.Utils;
@@ -33,7 +34,7 @@
  *
  * @author Alex Black
  */
-@AllArgsConstructor @Data @NoArgsConstructor
+@AllArgsConstructor @Data @NoArgsConstructor @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class StyleChart extends Style {
 

diff --git a/...-ui-components/src/main/java/org/deeplearning4j/ui/components/component/ComponentDiv.java b/...-ui-components/src/main/java/org/deeplearning4j/ui/components/component/ComponentDiv.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.deeplearning4j.ui.api.Component;
 import org.deeplearning4j.ui.api.Style;
 
@@ -28,7 +29,7 @@
  *
  * @author Alex Black
  */
-@Data
+@Data @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ComponentDiv extends Component {
     public static final String COMPONENT_TYPE = "ComponentDiv";

diff --git a/...i-components/src/main/java/org/deeplearning4j/ui/components/component/style/StyleDiv.java b/...i-components/src/main/java/org/deeplearning4j/ui/components/component/style/StyleDiv.java
@@ -19,14 +19,15 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.deeplearning4j.ui.api.Style;
 
 /** Style for Div components.
  *
  * @author Alex Black
  */
-@NoArgsConstructor @Data
+@NoArgsConstructor @Data @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class StyleDiv extends Style {
 

diff --git a/...onents/src/main/java/org/deeplearning4j/ui/components/decorator/style/StyleAccordion.java b/...onents/src/main/java/org/deeplearning4j/ui/components/decorator/style/StyleAccordion.java
@@ -19,11 +19,12 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.deeplearning4j.ui.api.Style;
 
 
-@NoArgsConstructor @Data
+@NoArgsConstructor @Data @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class StyleAccordion extends Style {
 

diff --git a/...-ui-components/src/main/java/org/deeplearning4j/ui/components/table/style/StyleTable.java b/...-ui-components/src/main/java/org/deeplearning4j/ui/components/table/style/StyleTable.java
@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.deeplearning4j.ui.api.LengthUnit;
 import org.deeplearning4j.ui.api.Style;
 import org.deeplearning4j.ui.api.Utils;
@@ -12,7 +13,7 @@
 /**
  * Created by Alex on 3/04/2016.
  */
-@Data
+@Data @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class StyleTable extends Style {
 

diff --git a/...4j-ui-components/src/main/java/org/deeplearning4j/ui/components/text/style/StyleText.java b/...4j-ui-components/src/main/java/org/deeplearning4j/ui/components/text/style/StyleText.java
@@ -20,6 +20,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.deeplearning4j.ui.api.Style;
 import org.deeplearning4j.ui.api.Utils;
@@ -29,7 +30,7 @@
 /**
  * Style for text
  */
-@Data @NoArgsConstructor
+@Data @NoArgsConstructor @EqualsAndHashCode(callSuper=true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class StyleText extends Style {