From: ayalaben <ayala.benzvi@amdocs.com>
Date: Mon, 13 Aug 2018 12:57:40 +0000 (+0300)
Subject: EP and LKG UUID bugfix
X-Git-Tag: 1.3.0~167
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c895a6bda3c85498907d77d0c09e55754b82b382;p=sdc.git

EP and LKG UUID bugfix

Change-Id: I00616bdd4e80a3131df709dbcca156cbe9d56a11
Issue-ID: SDC-1640
Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
---

diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
index ed310f163c..4c2435a3a5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
@@ -331,8 +331,7 @@ public class EntitlementPoolEntity implements VersionableEntity {
         && Objects.equals(description, that.description)
         && Objects.equals(thresholdUnit, that.thresholdUnit)
         && Objects.equals(increments, that.increments)
-        && Objects.equals(operationalScope, that.operationalScope)
-        && Objects.equals(referencingFeatureGroups, that.referencingFeatureGroups)
+        && Objects.equals(that.operationalScope, operationalScope)
         && Objects.equals(startDate, that.startDate)
         && Objects.equals(expiryDate, that.expiryDate)
         && Objects.equals(manufacturerReferenceNumber, that.manufacturerReferenceNumber)
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java
index 5d89a1bf5e..c84df9ca95 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java
@@ -306,8 +306,7 @@ public class LicenseKeyGroupEntity implements VersionableEntity {
         && Objects.equals(name, that.name)
         && Objects.equals(description, that.description)
         && type == that.type
-        && Objects.equals(operationalScope, that.operationalScope)
-        && Objects.equals(referencingFeatureGroups, that.referencingFeatureGroups)
+        && Objects.equals(that.operationalScope, operationalScope)
         && Objects.equals(startDate, that.startDate)
         && Objects.equals(expiryDate, that.expiryDate)
         && Objects.equals(thresholdValue, that.thresholdValue)
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java
index 01a4cac6b8..d70bc426e1 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java
@@ -155,6 +155,10 @@ public class MultiChoiceOrOther<E extends Enum<E>> {
     if (this == obj) {
       return true;
     }
+    if (obj == null && choices == null && other == null && results == null ) {
+      return true;
+    }
+
     if (obj == null || getClass() != obj.getClass()) {
       return false;
     }