2 files changed, 11 insertions, 27 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java
index 638e2361d6..75d8f69eb7 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UIConstraint.java
@@ -19,11 +19,15 @@ package org.openecomp.sdc.be.ui.model;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import java.io.Serializable;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@EqualsAndHashCode
+@ToString
 public class UIConstraint implements Serializable {
 
     private String servicePropertyName;
@@ -51,30 +55,4 @@ public class UIConstraint implements Serializable {
         this.value = value;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof UIConstraint)) {
-            return false;
-        }
-        UIConstraint that = (UIConstraint) o;
-        return Objects.equal(getServicePropertyName(), that.getServicePropertyName()) && Objects.equal(
-            getConstraintOperator(), that.getConstraintOperator()) && Objects.equal(getSourceType(),
-            that.getSourceType()) && Objects.equal(getSourceName(), that.getSourceName()) && Objects.equal(
-            getValue(), that.getValue());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(servicePropertyName, constraintOperator, sourceType, sourceName, value);
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this).add("servicePropertyName", servicePropertyName)
-            .add("constraintOperator", constraintOperator).add("sourceType", sourceType)
-            .add("sourceName", sourceName).add("value", value).toString();
-    }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java
index d51298b8bc..bea1e1790c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/ui/model/UiLeftPaletteComponent.java
@@ -22,11 +22,15 @@ package org.openecomp.sdc.be.ui.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.common.util.ICategorizedElement;
 
+@Getter
+@Setter
 public class UiLeftPaletteComponent implements ICategorizedElement {
 
     private final String uniqueId;
@@ -65,7 +69,9 @@ public class UiLeftPaletteComponent implements ICategorizedElement {
 
     private String convertListResultToString(final List<String> tags) {
         final StringBuilder sb = new StringBuilder();
-        tags.forEach(t -> sb.append(t + " "));
+        if (tags != null) {
+            tags.forEach(t -> sb.append(t + " "));
+        }
         return sb.toString().toLowerCase();
     }