From 8e9c0653dd6c6862123c9609ae34e1206d86456e Mon Sep 17 00:00:00 2001 From: talig Date: Wed, 20 Dec 2017 14:30:43 +0200 Subject: Add collaboration feature Issue-ID: SDC-767 Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795 Signed-off-by: talig --- .../sdcrests/vsp/rest/services/NicsImpl.java | 60 ++++++++++++---------- 1 file changed, 32 insertions(+), 28 deletions(-) (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NicsImpl.java') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NicsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NicsImpl.java index 73ca82ada3..738609acba 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NicsImpl.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NicsImpl.java @@ -33,7 +33,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.QuestionnaireResponse; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityValidationData; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic; import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityAction; import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityResponseDto; import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityValidationDataDto; import org.openecomp.sdcrests.vendorsoftwareproducts.types.NicCreationResponseDto; @@ -52,9 +51,9 @@ import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; -import java.util.Collection; import javax.inject.Named; import javax.ws.rs.core.Response; +import java.util.Collection; @Named @Service("nics") @@ -67,9 +66,9 @@ public class NicsImpl implements Nics { @Override public Response list(String vspId, String versionId, String componentId, String user) { MdcUtil.initMdc(LoggerServiceName.List_nics.toString()); - Version vspVersion = resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - Collection nics = nicManager.listNics(vspId, vspVersion, componentId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); + Collection nics = nicManager.listNics(vspId, vspVersion, componentId); MapNicEntityToNicDto mapper = new MapNicEntityToNicDto(); GenericCollectionWrapper results = new GenericCollectionWrapper<>(); @@ -81,15 +80,16 @@ public class NicsImpl implements Nics { } @Override - public Response create(NicRequestDto request, String vspId, String versionId, String componentId, String user) { + public Response create(NicRequestDto request, String vspId, String versionId, String componentId, + String user) { MdcUtil.initMdc(LoggerServiceName.Create_nic.toString()); NicEntity nic = new MapNicRequestDtoToNicEntity().applyMapping(request, NicEntity.class); nic.setVspId(vspId); - nic.setVersion(resolveVspVersion(vspId, null, user, VersionableEntityAction.Write)); + nic.setVersion(new Version(versionId)); nic.setComponentId(componentId); - componentManager.validateComponentExistence(vspId, nic.getVersion(), componentId, user); + componentManager.validateComponentExistence(vspId, nic.getVersion(), componentId); - NicEntity createdNic = nicManager.createNic(nic, user); + NicEntity createdNic = nicManager.createNic(nic); MapNicEntityToNicCreationResponseDto mapping = new MapNicEntityToNicCreationResponseDto(); NicCreationResponseDto createdNicDto = mapping.applyMapping(createdNic, @@ -99,12 +99,13 @@ public class NicsImpl implements Nics { } @Override - public Response get(String vspId, String versionId, String componentId, String nicId, String user) { + public Response get(String vspId, String versionId, String componentId, String nicId, + String user) { MdcUtil.initMdc(LoggerServiceName.Get_nic.toString()); - Version vspVersion = resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); CompositionEntityResponse response = - nicManager.getNic(vspId, vspVersion, componentId, nicId, user); + nicManager.getNic(vspId, vspVersion, componentId, nicId); CompositionEntityResponseDto responseDto = new CompositionEntityResponseDto<>(); new MapCompositionEntityResponseToDto<>(new MapNicToNicDto(), NicDto.class) @@ -113,27 +114,29 @@ public class NicsImpl implements Nics { } @Override - public Response delete(String vspId, String versionId, String componentId, String nicId, String user) { + public Response delete(String vspId, String versionId, String componentId, String nicId, + String user) { MdcUtil.initMdc(LoggerServiceName.Delete_nic.toString()); - Version vspVersion = resolveVspVersion(vspId, null, user, VersionableEntityAction.Write); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - nicManager.deleteNic(vspId, vspVersion, componentId, nicId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); + nicManager.deleteNic(vspId, vspVersion, componentId, nicId); return Response.ok().build(); } @Override - public Response update(NicRequestDto request, String vspId, String versionId, String componentId, String nicId, + public Response update(NicRequestDto request, String vspId, String versionId, String componentId, + String nicId, String user) { MdcUtil.initMdc(LoggerServiceName.Update_nic.toString()); NicEntity nicEntity = new MapNicRequestDtoToNicEntity().applyMapping(request, NicEntity.class); nicEntity.setVspId(vspId); - nicEntity.setVersion(resolveVspVersion(vspId, null, user, VersionableEntityAction.Write)); + nicEntity.setVersion(new Version(versionId)); nicEntity.setComponentId(componentId); nicEntity.setId(nicId); - componentManager.validateComponentExistence(vspId, nicEntity.getVersion(), componentId, user); + componentManager.validateComponentExistence(vspId, nicEntity.getVersion(), componentId); CompositionEntityValidationData validationData = - nicManager.updateNic(nicEntity, user); + nicManager.updateNic(nicEntity); return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors()) ? Response.status(Response.Status.EXPECTATION_FAILED).entity( new MapCompositionEntityValidationDataToDto() @@ -145,10 +148,10 @@ public class NicsImpl implements Nics { public Response getQuestionnaire(String vspId, String versionId, String componentId, String nicId, String user) { MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_nic.toString()); - Version vspVersion = resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); QuestionnaireResponse questionnaireResponse = - nicManager.getNicQuestionnaire(vspId, vspVersion, componentId, nicId, user); + nicManager.getNicQuestionnaire(vspId, vspVersion, componentId, nicId); QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto() .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class); @@ -156,13 +159,14 @@ public class NicsImpl implements Nics { } @Override - public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId, String componentId, + public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId, + String componentId, String nicId, String user) { MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_nic.toString()); - Version vspVersion = resolveVspVersion(vspId, null, user, VersionableEntityAction.Write); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); nicManager - .updateNicQuestionnaire(vspId, vspVersion, componentId, nicId, questionnaireData, user); + .updateNicQuestionnaire(vspId, vspVersion, componentId, nicId, questionnaireData); return Response.ok().build(); } } -- cgit 1.2.3-korg