1 files changed, 44 insertions, 64 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToLicenseAgreementConvertor.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToLicenseAgreementConvertor.java
index 0623b10b04..f217c7c4c2 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToLicenseAgreementConvertor.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToLicenseAgreementConvertor.java
@@ -23,83 +23,63 @@ import com.amdocs.zusammen.adaptor.inbound.api.types.item.Element;
 import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo;
 import com.amdocs.zusammen.datatypes.item.Info;
 import com.amdocs.zusammen.datatypes.item.Relation;
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.openecomp.convertor.ElementConvertor;
 import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity;
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
 public class ElementToLicenseAgreementConvertor extends ElementConvertor {
-  @Override
-  public LicenseAgreementEntity convert(Element element) {
-    if (element == null) {
-      return null;
-    }
-    return mapElementToLicenseAgreementEntity(element);
-
-  }
 
-
-  @Override
-  public LicenseAgreementEntity convert(ElementInfo elementInfo) {
-    if (elementInfo == null) {
-      return null;
+    @Override
+    public LicenseAgreementEntity convert(Element element) {
+        if (element == null) {
+            return null;
+        }
+        return mapElementToLicenseAgreementEntity(element);
     }
-    return mapElementInfoToLicenseAgreementEntity(elementInfo);
-
-  }
-
 
-  private LicenseAgreementEntity mapElementToLicenseAgreementEntity(Element element) {
-    LicenseAgreementEntity licenseAgreement =
-        new LicenseAgreementEntity();
-    licenseAgreement.setId(element.getElementId().getValue());
-    mapInfoToLicenseAgreementEntity(licenseAgreement, element.getInfo());
-    mapRelationsToLicenseAgreementEntity(licenseAgreement, element.getRelations());
-    return licenseAgreement;
-  }
-
-
-  private LicenseAgreementEntity mapElementInfoToLicenseAgreementEntity(ElementInfo elementInfo) {
-    LicenseAgreementEntity licenseAgreement =
-        new LicenseAgreementEntity();
-    licenseAgreement.setId( elementInfo.getId().getValue());
-    mapInfoToLicenseAgreementEntity(licenseAgreement, elementInfo.getInfo());
-    mapRelationsToLicenseAgreementEntity(licenseAgreement, elementInfo.getRelations());
-    return licenseAgreement;
-  }
-
-  private void mapRelationsToLicenseAgreementEntity(LicenseAgreementEntity licenseAgreementEntity,
-                                                    Collection<Relation> relations) {
-    if (relations != null && relations.size() > 0) {
-      licenseAgreementEntity.setFeatureGroupIds(relations.stream()
-          .map(relation -> relation.getEdge2().getElementId().getValue())
-          .collect(Collectors.toSet()));
+    @Override
+    public LicenseAgreementEntity convert(ElementInfo elementInfo) {
+        if (elementInfo == null) {
+            return null;
+        }
+        return mapElementInfoToLicenseAgreementEntity(elementInfo);
     }
 
-  }
-
-  private void mapInfoToLicenseAgreementEntity(LicenseAgreementEntity licenseAgreement, Info info) {
-
-
-    licenseAgreement.setName(info.getName());
-    licenseAgreement.setDescription(info.getDescription());
-
-    licenseAgreement
-        .setLicenseTerm(getCoiceOrOther(info.getProperty("licenseTerm")));
-    licenseAgreement.setRequirementsAndConstrains(
-        info.getProperty("requirementsAndConstrains"));
+    private LicenseAgreementEntity mapElementToLicenseAgreementEntity(Element element) {
+        LicenseAgreementEntity licenseAgreement = new LicenseAgreementEntity();
+        licenseAgreement.setId(element.getElementId().getValue());
+        mapInfoToLicenseAgreementEntity(licenseAgreement, element.getInfo());
+        mapRelationsToLicenseAgreementEntity(licenseAgreement, element.getRelations());
+        return licenseAgreement;
+    }
 
-  }
+    private LicenseAgreementEntity mapElementInfoToLicenseAgreementEntity(ElementInfo elementInfo) {
+        LicenseAgreementEntity licenseAgreement = new LicenseAgreementEntity();
+        licenseAgreement.setId(elementInfo.getId().getValue());
+        mapInfoToLicenseAgreementEntity(licenseAgreement, elementInfo.getInfo());
+        mapRelationsToLicenseAgreementEntity(licenseAgreement, elementInfo.getRelations());
+        return licenseAgreement;
+    }
 
-  private ChoiceOrOther<LicenseTerm> getCoiceOrOther(Map licenseTerm) {
-    return new ChoiceOrOther<>(LicenseTerm.valueOf((String) licenseTerm.get("choice")),
-        (String) licenseTerm.get("other"));
-  }
+    private void mapRelationsToLicenseAgreementEntity(LicenseAgreementEntity licenseAgreementEntity, Collection<Relation> relations) {
+        if (relations != null && relations.size() > 0) {
+            licenseAgreementEntity
+                .setFeatureGroupIds(relations.stream().map(relation -> relation.getEdge2().getElementId().getValue()).collect(Collectors.toSet()));
+        }
+    }
 
+    private void mapInfoToLicenseAgreementEntity(LicenseAgreementEntity licenseAgreement, Info info) {
+        licenseAgreement.setName(info.getName());
+        licenseAgreement.setDescription(info.getDescription());
+        licenseAgreement.setLicenseTerm(getCoiceOrOther(info.getProperty("licenseTerm")));
+        licenseAgreement.setRequirementsAndConstrains(info.getProperty("requirementsAndConstrains"));
+    }
 
+    private ChoiceOrOther<LicenseTerm> getCoiceOrOther(Map licenseTerm) {
+        return new ChoiceOrOther<>(LicenseTerm.valueOf((String) licenseTerm.get("choice")), (String) licenseTerm.get("other"));
+    }
 }