2 files changed, 5 insertions, 41 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/Conflicts.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/Conflicts.java
index 396c4ee5d2..21aa2aecd7 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/Conflicts.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/Conflicts.java
@@ -10,13 +10,7 @@ import org.openecomp.sdcrests.conflict.types.ItemVersionConflictDto;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
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 83a0f52155..d86a2d94de 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
@@ -6,40 +6,10 @@ 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.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;
+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;