1 files changed, 103 insertions, 92 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDto.java
index 1a1f3296fa..a1615bfccf 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictToDto.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,108 +17,119 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.conflict.rest.mapping;
 
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.Map;
 import org.openecomp.conflicts.types.Conflict;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.sdc.datatypes.model.ElementType;
 import org.openecomp.sdcrests.conflict.types.ConflictDto;
 import org.openecomp.sdcrests.mapping.EchoMapMapping;
 import org.openecomp.sdcrests.mapping.MappingBase;
-import org.openecomp.sdcrests.vendorlicense.rest.mapping.*;
-import org.openecomp.sdcrests.vendorlicense.types.*;
-import org.openecomp.sdcrests.vendorsoftwareproducts.types.*;
-import org.openecomp.sdcrests.vsp.rest.mapping.*;
-
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.Map;
+import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapEntitlementPoolEntityToEntitlementPoolEntityDto;
+import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapFeatureGroupEntityToFeatureGroupDescriptorDto;
+import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapLicenseAgreementEntityToLicenseAgreementDescriptorDto;
+import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto;
+import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapLimitEntityToLimitDto;
+import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapVendorLicenseModelEntityToDto;
+import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.LimitEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelEntityDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentDependencyModel;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.DeploymentFlavorDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.FileDataStructureDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ImageDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.NetworkDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.NicDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ProcessEntityDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspComputeDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspDetailsDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComponentDependencyModelEntityToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComponentEntityToComponentDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComputeEntityToVspComputeDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapDeploymentFlavorEntityToDeploymentFlavorDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapFilesDataStructureToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapImageEntityToImageDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapNetworkEntityToNetworkDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapNicEntityToNicDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapProcessEntityToProcessEntityDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapQuestionnaireToQuestionnaireDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapVspDetailsToDto;
 
 public class MapConflictToDto extends MappingBase<Conflict, ConflictDto> {
 
-  @Override
-  public void doMapping(Conflict source, ConflictDto target) {
-    target.setId(source.getId());
-    target.setType(source.getType());
-    target.setName(source.getName());
-
-    Map.Entry<MappingBase, Class> mapperToTargetClass = getMapper(source.getType());
-    target.setTheirs(map(mapperToTargetClass, source.getTheirs()));
-    target.setYours(map(mapperToTargetClass, source.getYours()));
-  }
+    @Override
+    public void doMapping(Conflict source, ConflictDto target) {
+        target.setId(source.getId());
+        target.setType(source.getType());
+        target.setName(source.getName());
+        Map.Entry<MappingBase, Class> mapperToTargetClass = getMapper(source.getType());
+        target.setTheirs(map(mapperToTargetClass, source.getTheirs()));
+        target.setYours(map(mapperToTargetClass, source.getYours()));
+    }
 
-  private Map map(Map.Entry<MappingBase, Class> mapperToTargetClass, Object object) {
-    return JsonUtil
-        .json2Object(JsonUtil.object2Json(
-            mapperToTargetClass.getKey().applyMapping(object, mapperToTargetClass.getValue())),
-            Map.class);
-  }
+    private Map map(Map.Entry<MappingBase, Class> mapperToTargetClass, Object object) {
+        return JsonUtil
+            .json2Object(JsonUtil.object2Json(mapperToTargetClass.getKey().applyMapping(object, mapperToTargetClass.getValue())), Map.class);
+    }
 
-  private Map.Entry<MappingBase, Class> getMapper(ElementType type) {
-    switch (type) {
-      case VendorLicenseModel:
-        return new AbstractMap.SimpleEntry<>(new MapVendorLicenseModelEntityToDto(),
-            VendorLicenseModelEntityDto.class);
-      case LicenseAgreement:
-        return new AbstractMap.SimpleEntry<>(
-            new MapLicenseAgreementEntityToLicenseAgreementDescriptorDto(),
-            LicenseAgreementDescriptorDto.class);
-      case FeatureGroup:
-        return new AbstractMap.SimpleEntry<>(new MapFeatureGroupEntityToFeatureGroupDescriptorDto(),
-            FeatureGroupDescriptorDto.class);
-      case LicenseKeyGroup:
-        return new AbstractMap.SimpleEntry<>(
-            new MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto(), LicenseKeyGroupEntityDto
-            .class);
-      case EntitlementPool:
-        return new AbstractMap.SimpleEntry<>(
-            new MapEntitlementPoolEntityToEntitlementPoolEntityDto(), EntitlementPoolEntityDto
-            .class);
-      case Limit:
-        return new AbstractMap.SimpleEntry<>(new MapLimitEntityToLimitDto(), LimitEntityDto.class);
-      case VendorSoftwareProduct:
-        return new AbstractMap.SimpleEntry<>(new MapVspDetailsToDto(), VspDetailsDto.class);
-      case Network:
-        return new AbstractMap.SimpleEntry<>(new MapNetworkEntityToNetworkDto(), NetworkDto.class);
-      case Component:
-        return new AbstractMap.SimpleEntry<>(new MapComponentEntityToComponentDto(),
-            ComponentDto.class);
-      case ComponentDependencies:
-        return new AbstractMap.SimpleEntry<>(new MapComponentDependencyModelEntityToDto(),
-            ComponentDependencyModel.class);
-      case Nic:
-        return new AbstractMap.SimpleEntry<>(new MapNicEntityToNicDto(), NicDto.class);
-      case Process:
-        return new AbstractMap.SimpleEntry<>(new MapProcessEntityToProcessEntityDto(),
-            ProcessEntityDto.class);
-      case DeploymentFlavor:
-        return new AbstractMap.SimpleEntry<>(new MapDeploymentFlavorEntityToDeploymentFlavorDto(),
-            DeploymentFlavorDto.class);
-      case Compute:
-        return new AbstractMap.SimpleEntry<>(new MapComputeEntityToVspComputeDto(),
-            VspComputeDto.class);
-      case Image:
-        return new AbstractMap.SimpleEntry<>(new MapImageEntityToImageDto(), ImageDto.class);
-      case VSPQuestionnaire:
-      case NicQuestionnaire:
-      case ComponentQuestionnaire:
-      case ImageQuestionnaire:
-      case ComputeQuestionnaire:
-        return new AbstractMap.SimpleEntry<>(new MapQuestionnaireToQuestionnaireDto(),
-            QuestionnaireDto.class);
-      case SNMP_POLL:
-      case SNMP_TRAP:
-      case VES_EVENTS:
-      case OrchestrationTemplateCandidate:
-        return new AbstractMap.SimpleEntry<>(new MapFilesDataStructureToDto(),
-            FileDataStructureDto.class);
-      case ServiceModel:
-      case NetworkPackage:
-        return new AbstractMap.SimpleEntry<>(new EchoMapMapping(), HashMap.class);
-      case itemVersion:
-        return new AbstractMap.SimpleEntry<>(new EchoMapMapping(), HashMap.class);
+    private Map.Entry<MappingBase, Class> getMapper(ElementType type) {
+        switch (type) {
+            case VendorLicenseModel:
+                return new AbstractMap.SimpleEntry<>(new MapVendorLicenseModelEntityToDto(), VendorLicenseModelEntityDto.class);
+            case LicenseAgreement:
+                return new AbstractMap.SimpleEntry<>(new MapLicenseAgreementEntityToLicenseAgreementDescriptorDto(),
+                    LicenseAgreementDescriptorDto.class);
+            case FeatureGroup:
+                return new AbstractMap.SimpleEntry<>(new MapFeatureGroupEntityToFeatureGroupDescriptorDto(), FeatureGroupDescriptorDto.class);
+            case LicenseKeyGroup:
+                return new AbstractMap.SimpleEntry<>(new MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto(), LicenseKeyGroupEntityDto.class);
+            case EntitlementPool:
+                return new AbstractMap.SimpleEntry<>(new MapEntitlementPoolEntityToEntitlementPoolEntityDto(), EntitlementPoolEntityDto.class);
+            case Limit:
+                return new AbstractMap.SimpleEntry<>(new MapLimitEntityToLimitDto(), LimitEntityDto.class);
+            case VendorSoftwareProduct:
+                return new AbstractMap.SimpleEntry<>(new MapVspDetailsToDto(), VspDetailsDto.class);
+            case Network:
+                return new AbstractMap.SimpleEntry<>(new MapNetworkEntityToNetworkDto(), NetworkDto.class);
+            case Component:
+                return new AbstractMap.SimpleEntry<>(new MapComponentEntityToComponentDto(), ComponentDto.class);
+            case ComponentDependencies:
+                return new AbstractMap.SimpleEntry<>(new MapComponentDependencyModelEntityToDto(), ComponentDependencyModel.class);
+            case Nic:
+                return new AbstractMap.SimpleEntry<>(new MapNicEntityToNicDto(), NicDto.class);
+            case Process:
+                return new AbstractMap.SimpleEntry<>(new MapProcessEntityToProcessEntityDto(), ProcessEntityDto.class);
+            case DeploymentFlavor:
+                return new AbstractMap.SimpleEntry<>(new MapDeploymentFlavorEntityToDeploymentFlavorDto(), DeploymentFlavorDto.class);
+            case Compute:
+                return new AbstractMap.SimpleEntry<>(new MapComputeEntityToVspComputeDto(), VspComputeDto.class);
+            case Image:
+                return new AbstractMap.SimpleEntry<>(new MapImageEntityToImageDto(), ImageDto.class);
+            case VSPQuestionnaire:
+            case NicQuestionnaire:
+            case ComponentQuestionnaire:
+            case ImageQuestionnaire:
+            case ComputeQuestionnaire:
+                return new AbstractMap.SimpleEntry<>(new MapQuestionnaireToQuestionnaireDto(), QuestionnaireDto.class);
+            case SNMP_POLL:
+            case SNMP_TRAP:
+            case VES_EVENTS:
+            case OrchestrationTemplateCandidate:
+                return new AbstractMap.SimpleEntry<>(new MapFilesDataStructureToDto(), FileDataStructureDto.class);
+            case ServiceModel:
+            case NetworkPackage:
+                return new AbstractMap.SimpleEntry<>(new EchoMapMapping(), HashMap.class);
+            case itemVersion:
+                return new AbstractMap.SimpleEntry<>(new EchoMapMapping(), HashMap.class);
+        }
+        throw new RuntimeException("Get conflict does not support element type: " + type.name());
     }
-    throw new RuntimeException("Get conflict does not support element type: " + type.name());
-  }
 }