diff options
Diffstat (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/ImagesImpl.java')
-rw-r--r-- | 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/ImagesImpl.java | 85 |
1 files changed, 37 insertions, 48 deletions
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/ImagesImpl.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/ImagesImpl.java index fcaf038dc0..b8e0f64cf2 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/ImagesImpl.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/ImagesImpl.java @@ -14,7 +14,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.QuestionnaireResponse; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityValidationData; import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Image; import org.openecomp.sdc.versioning.dao.types.Version; -import org.openecomp.sdc.versioning.types.VersionableEntityAction; import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityValidationDataDto; import org.openecomp.sdcrests.vendorsoftwareproducts.types.ImageCreationDto; import org.openecomp.sdcrests.vendorsoftwareproducts.types.ImageDto; @@ -30,32 +29,31 @@ 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("images") @Scope(value = "prototype") -public class ImagesImpl implements Images - { +public class ImagesImpl implements Images { private ImageManager imageManager = ImageManagerFactory.getInstance().createInterface(); private ComponentManager componentManager = ComponentManagerFactory.getInstance().createInterface(); @Override - public Response create(ImageRequestDto request, String vspId, String versionId,String - componentId, String user) { + public Response create(ImageRequestDto request, String vspId, String versionId, + String componentId, String user) { MdcUtil.initMdc(LoggerServiceName.Create_Image.toString()); ImageEntity image = new MapImageRequestDtoToImageEntity().applyMapping(request, ImageEntity.class); image.setVspId(vspId); image.setComponentId(componentId); - image.setVersion(resolveVspVersion(vspId, null, user, VersionableEntityAction.Write)); - componentManager.validateComponentExistence(vspId, image.getVersion(), componentId, user); - ImageEntity createdImage = imageManager.createImage(image, user); + image.setVersion(new Version(versionId)); + componentManager.validateComponentExistence(vspId, image.getVersion(), componentId); + ImageEntity createdImage = imageManager.createImage(image); MapImageEntityToImageCreationDto mapping = new MapImageEntityToImageCreationDto(); ImageCreationDto createdImageDto = mapping.applyMapping(createdImage, ImageCreationDto.class); return Response @@ -66,19 +64,18 @@ public class ImagesImpl implements Images @Override public Response getImageSchema(String vspId, String versionId, String componentId, String user) { MdcUtil.initMdc(LoggerServiceName.GET_Image_Schema.toString()); - CompositionEntityResponse<Image> response = - imageManager.getImageSchema(vspId, user); + CompositionEntityResponse<Image> response = imageManager.getImageSchema(vspId); return Response.ok(response).build(); } @Override - public Response get(String vspId, String versionId, String componentId, String imageId, String - user) { + public Response get(String vspId, String versionId, String componentId, String imageId, + String user) { MdcUtil.initMdc(LoggerServiceName.GET_Image.toString()); - Version vspVersion = resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - CompositionEntityResponse<Image> response = imageManager.getImage(vspId, - vspVersion, componentId, imageId, user); + Version version = new Version(versionId); + componentManager.validateComponentExistence(vspId, version, componentId); + CompositionEntityResponse<Image> response = + imageManager.getImage(vspId, version, componentId, imageId); return Response.ok(response).build(); } @@ -86,10 +83,9 @@ public class ImagesImpl implements Images @Override public Response list(String vspId, String versionId, String componentId, String user) { MdcUtil.initMdc(LoggerServiceName.List_Images.toString()); - Version vspVersion = resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - Collection<ImageEntity> images = - imageManager.listImages(vspId, vspVersion, componentId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); + Collection<ImageEntity> images = imageManager.listImages(vspId, vspVersion, componentId); MapImageEntityToImageDto mapper = new MapImageEntityToImageDto(); GenericCollectionWrapper<ImageDto> results = new GenericCollectionWrapper<>(); @@ -104,28 +100,25 @@ public class ImagesImpl implements Images public Response delete(String vspId, String versionId, String componentId, String imageId, String user) { MdcUtil.initMdc(LoggerServiceName.Delete_Image.toString()); - Version vspVersion = resolveVspVersion(vspId, null, user, VersionableEntityAction.Write); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - imageManager.deleteImage(vspId, vspVersion, componentId, imageId, user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); + imageManager.deleteImage(vspId, vspVersion, componentId, imageId); return Response.ok().build(); } @Override - public Response update(ImageRequestDto request, String vspId, String versionId, String - componentId, - String imageId, - String user) { + public Response update(ImageRequestDto request, String vspId, String versionId, + String componentId, String imageId, String user) { MdcUtil.initMdc(LoggerServiceName.Update_Image.toString()); ImageEntity imageEntity = new MapImageRequestDtoToImageEntity().applyMapping(request, ImageEntity.class); imageEntity.setVspId(vspId); - imageEntity.setVersion(resolveVspVersion(vspId, null, user, VersionableEntityAction.Write)); + imageEntity.setVersion(new Version(versionId)); imageEntity.setComponentId(componentId); imageEntity.setId(imageId); - componentManager.validateComponentExistence(vspId, imageEntity.getVersion(), componentId, user); + componentManager.validateComponentExistence(vspId, imageEntity.getVersion(), componentId); - CompositionEntityValidationData validationData = - imageManager.updateImage(imageEntity, user); + CompositionEntityValidationData validationData = imageManager.updateImage(imageEntity); return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors()) ? Response.status(Response.Status.EXPECTATION_FAILED).entity( new MapCompositionEntityValidationDataToDto() @@ -134,14 +127,13 @@ public class ImagesImpl implements Images } @Override - public Response getQuestionnaire(String vspId, String versionId, String componentId, String - imageId, String user) { + public Response getQuestionnaire(String vspId, String versionId, String componentId, + String imageId, String user) { MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_Compute.toString()); - Version vspVersion = resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - QuestionnaireResponse questionnaireResponse = imageManager - .getImageQuestionnaire(vspId, vspVersion, componentId, imageId, - user); + Version vspVersion = new Version(versionId); + componentManager.validateComponentExistence(vspId, vspVersion, componentId); + QuestionnaireResponse questionnaireResponse = + imageManager.getImageQuestionnaire(vspId, vspVersion, componentId, imageId); QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto() .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class); @@ -150,15 +142,12 @@ public class ImagesImpl implements Images } @Override - public Response updateQuestionnaire(String questionnaireData, String vspId, String - versionId,String componentId,String imageId, String user) { - MdcUtil - .initMdc(LoggerServiceName.Update_Questionnaire_Compute.toString() - ); - Version vspVersion = resolveVspVersion(vspId, null, user, VersionableEntityAction.Write); - componentManager.validateComponentExistence(vspId, vspVersion, componentId, user); - imageManager.updateImageQuestionnaire(vspId, vspVersion, componentId, imageId, - questionnaireData, user); + public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId, + String componentId, String imageId, String user) { + MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_Compute.toString()); + Version version = new Version(versionId); + componentManager.validateComponentExistence(vspId, version, componentId); + imageManager.updateImageQuestionnaire(vspId, version, componentId, imageId, questionnaireData); return Response.ok().build(); } |