aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp
diff options
context:
space:
mode:
authorsiddharth0905 <siddharth.singh4@amdocs.com>2018-08-21 17:55:30 +0530
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>2018-09-13 11:00:08 +0000
commitc58f445fcef56a6440f3b21d54b390700623c48c (patch)
tree9540ba4f1c7c2ec92c07ce2abcd04d02e06033cc /openecomp-be/api/openecomp-sdc-rest-webapp
parent7678396a1df3122d80d838c958d857f03e2aefbb (diff)
Test coverage
Increase test coverage Change-Id: I43e3149d0d4b07dc8e260f3d5fac025197882f3a Issue-ID: SDC-1673 Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java16
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/FeatureGroupsImpl.java235
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/LicenseAgreementsImpl.java280
3 files changed, 275 insertions, 256 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
index 34ede43d1e..618ac59fa4 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
@@ -28,12 +28,18 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
+import org.apache.commons.collections4.CollectionUtils;
import org.codehaus.jackson.map.JsonMappingException;
import org.hibernate.validator.internal.engine.path.PathImpl;
-import org.openecomp.core.utilities.CommonMethods;
import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.core.utilities.json.JsonUtil;
-import org.openecomp.sdc.common.errors.*;
+import org.openecomp.sdc.common.errors.CoreException;
+import org.openecomp.sdc.common.errors.ErrorCategory;
+import org.openecomp.sdc.common.errors.ErrorCode;
+import org.openecomp.sdc.common.errors.ErrorCodeAndMessage;
+import org.openecomp.sdc.common.errors.GeneralErrorBuilder;
+import org.openecomp.sdc.common.errors.JsonMappingErrorBuilder;
+import org.openecomp.sdc.common.errors.ValidationErrorBuilder;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
@@ -98,14 +104,14 @@ public class DefaultExceptionMapper implements ExceptionMapper<Exception> {
String message;
String fieldName = null;
- if (!CommonMethods.isEmpty(constraintViolationSet)) {
+ if (CollectionUtils.isEmpty(constraintViolationSet)) {
+ message = validationException.getMessage();
+ } else {
// getting the first violation message for the output response.
ConstraintViolation<?> constraintViolation = constraintViolationSet.iterator().next();
message = constraintViolation.getMessage();
fieldName = getFieldName(constraintViolation.getPropertyPath());
- } else {
- message = validationException.getMessage();
}
ErrorCode validationErrorCode = new ValidationErrorBuilder(message, fieldName).build();
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/FeatureGroupsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/FeatureGroupsImpl.java
index 8b62dc1843..b2f7e88996 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/FeatureGroupsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/FeatureGroupsImpl.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.
@@ -20,7 +20,13 @@
package org.openecomp.sdcrests.vendorlicense.rest.services;
-import org.openecomp.core.utilities.CommonMethods;
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.collections4.CollectionUtils;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
@@ -33,132 +39,133 @@ import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapEntitlementPoolEntit
import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapFeatureGroupDescriptorDtoToFeatureGroupEntity;
import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapFeatureGroupEntityToFeatureGroupDescriptorDto;
import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto;
-import org.openecomp.sdcrests.vendorlicense.types.*;
+import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupModelDto;
+import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupRequestDto;
+import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupUpdateRequestDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupEntityDto;
import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
import org.openecomp.sdcrests.wrappers.StringWrapperResponse;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.util.Collection;
-import java.util.HashSet;
-
@Named
@Service("featureGroups")
@Scope(value = "prototype")
public class FeatureGroupsImpl implements FeatureGroups {
- private VendorLicenseManager vendorLicenseManager =
- VendorLicenseManagerFactory.getInstance().createInterface();
-
- @Override
- public Response listFeatureGroups(String vlmId, String versionId, String user) {
- Collection<FeatureGroupEntity> featureGroupEntities =
- vendorLicenseManager.listFeatureGroups(vlmId, new Version(versionId));
-
- MapFeatureGroupEntityToFeatureGroupDescriptorDto outputMapper =
- new MapFeatureGroupEntityToFeatureGroupDescriptorDto();
- GenericCollectionWrapper<FeatureGroupEntityDto> results = new GenericCollectionWrapper<>();
-
- for (FeatureGroupEntity fg : featureGroupEntities) {
- FeatureGroupEntityDto fgDto = new FeatureGroupEntityDto();
- fgDto.setId(fg.getId());
- fgDto.setLicenseKeyGroupsIds(fg.getLicenseKeyGroupIds());
- fgDto.setEntitlementPoolsIds(fg.getEntitlementPoolIds());
- fgDto.setReferencingLicenseAgreements(fg.getReferencingLicenseAgreements());
- outputMapper.doMapping(fg, fgDto);
- results.add(fgDto);
- }
- return Response.ok(results).build();
- }
-
- @Override
- public Response createFeatureGroup(FeatureGroupRequestDto request, String vlmId, String versionId,
- String user) {
- FeatureGroupEntity featureGroupEntity = new MapFeatureGroupDescriptorDtoToFeatureGroupEntity()
- .applyMapping(request, FeatureGroupEntity.class);
- featureGroupEntity.setVendorLicenseModelId(vlmId);
- featureGroupEntity.setVersion(new Version(versionId));
- featureGroupEntity.setLicenseKeyGroupIds(request.getAddedLicenseKeyGroupsIds());
- featureGroupEntity.setEntitlementPoolIds(request.getAddedEntitlementPoolsIds());
-
- FeatureGroupEntity createdFeatureGroup =
- vendorLicenseManager.createFeatureGroup(featureGroupEntity);
-
- StringWrapperResponse result =
- createdFeatureGroup != null ? new StringWrapperResponse(createdFeatureGroup.getId()) : null;
- return Response.ok(result).build();
- }
-
- @Override
- public Response updateFeatureGroup(FeatureGroupUpdateRequestDto request, String vlmId,
- String versionId, String featureGroupId, String user) {
- FeatureGroupEntity featureGroupEntity = new MapFeatureGroupDescriptorDtoToFeatureGroupEntity()
- .applyMapping(request, FeatureGroupEntity.class);
- featureGroupEntity.setVendorLicenseModelId(vlmId);
- featureGroupEntity.setVersion(new Version(versionId));
- featureGroupEntity.setId(featureGroupId);
-
- vendorLicenseManager
- .updateFeatureGroup(featureGroupEntity, request.getAddedLicenseKeyGroupsIds(),
- request.getRemovedLicenseKeyGroupsIds(), request.getAddedEntitlementPoolsIds(),
- request.getRemovedEntitlementPoolsIds());
- return Response.ok().build();
- }
-
- @Override
- public Response getFeatureGroup(String vlmId, String versionId, String featureGroupId,
- String user) {
- FeatureGroupEntity fgInput = new FeatureGroupEntity();
- fgInput.setVendorLicenseModelId(vlmId);
- fgInput.setVersion(new Version(versionId));
- fgInput.setId(featureGroupId);
- FeatureGroupModel featureGroupModel = vendorLicenseManager.getFeatureGroupModel(fgInput);
-
- if (featureGroupModel == null) {
- return Response.ok().build();
+
+ private VendorLicenseManager vendorLicenseManager =
+ VendorLicenseManagerFactory.getInstance().createInterface();
+
+ @Override
+ public Response listFeatureGroups(String vlmId, String versionId, String user) {
+ Collection<FeatureGroupEntity> featureGroupEntities =
+ vendorLicenseManager.listFeatureGroups(vlmId, new Version(versionId));
+
+ MapFeatureGroupEntityToFeatureGroupDescriptorDto outputMapper =
+ new MapFeatureGroupEntityToFeatureGroupDescriptorDto();
+ GenericCollectionWrapper<FeatureGroupEntityDto> results = new GenericCollectionWrapper<>();
+
+ for (FeatureGroupEntity fg : featureGroupEntities) {
+ FeatureGroupEntityDto fgDto = new FeatureGroupEntityDto();
+ fgDto.setId(fg.getId());
+ fgDto.setLicenseKeyGroupsIds(fg.getLicenseKeyGroupIds());
+ fgDto.setEntitlementPoolsIds(fg.getEntitlementPoolIds());
+ fgDto.setReferencingLicenseAgreements(fg.getReferencingLicenseAgreements());
+ outputMapper.doMapping(fg, fgDto);
+ results.add(fgDto);
+ }
+ return Response.ok(results).build();
}
- FeatureGroupModelDto fgmDto = new FeatureGroupModelDto();
- fgmDto.setId(featureGroupModel.getFeatureGroup().getId());
- fgmDto.setReferencingLicenseAgreements(
- featureGroupModel.getFeatureGroup().getReferencingLicenseAgreements());
- new MapFeatureGroupEntityToFeatureGroupDescriptorDto()
- .doMapping(featureGroupModel.getFeatureGroup(), fgmDto);
-
- if (!CommonMethods.isEmpty(featureGroupModel.getLicenseKeyGroups())) {
- fgmDto.setLicenseKeyGroups(new HashSet<>());
-
- MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto lkgMapper =
- new MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto();
- for (LicenseKeyGroupEntity lkg : featureGroupModel.getLicenseKeyGroups()) {
- fgmDto.getLicenseKeyGroups()
- .add(lkgMapper.applyMapping(lkg, LicenseKeyGroupEntityDto.class));
- }
+ @Override
+ public Response createFeatureGroup(FeatureGroupRequestDto request, String vlmId, String versionId,
+ String user) {
+ FeatureGroupEntity featureGroupEntity = new MapFeatureGroupDescriptorDtoToFeatureGroupEntity()
+ .applyMapping(request, FeatureGroupEntity.class);
+ featureGroupEntity.setVendorLicenseModelId(vlmId);
+ featureGroupEntity.setVersion(new Version(versionId));
+ featureGroupEntity.setLicenseKeyGroupIds(request.getAddedLicenseKeyGroupsIds());
+ featureGroupEntity.setEntitlementPoolIds(request.getAddedEntitlementPoolsIds());
+
+ FeatureGroupEntity createdFeatureGroup =
+ vendorLicenseManager.createFeatureGroup(featureGroupEntity);
+
+ StringWrapperResponse result =
+ createdFeatureGroup != null ? new StringWrapperResponse(createdFeatureGroup.getId()) : null;
+ return Response.ok(result).build();
}
- if (!CommonMethods.isEmpty(featureGroupModel.getEntitlementPools())) {
- fgmDto.setEntitlementPools(new HashSet<>());
+ @Override
+ public Response updateFeatureGroup(FeatureGroupUpdateRequestDto request, String vlmId,
+ String versionId, String featureGroupId, String user) {
+ FeatureGroupEntity featureGroupEntity = new MapFeatureGroupDescriptorDtoToFeatureGroupEntity()
+ .applyMapping(request, FeatureGroupEntity.class);
+ featureGroupEntity.setVendorLicenseModelId(vlmId);
+ featureGroupEntity.setVersion(new Version(versionId));
+ featureGroupEntity.setId(featureGroupId);
+
+ vendorLicenseManager
+ .updateFeatureGroup(featureGroupEntity, request.getAddedLicenseKeyGroupsIds(),
+ request.getRemovedLicenseKeyGroupsIds(), request.getAddedEntitlementPoolsIds(),
+ request.getRemovedEntitlementPoolsIds());
+ return Response.ok().build();
+ }
- MapEntitlementPoolEntityToEntitlementPoolEntityDto epMapper =
- new MapEntitlementPoolEntityToEntitlementPoolEntityDto();
- for (EntitlementPoolEntity ep : featureGroupModel.getEntitlementPools()) {
- fgmDto.getEntitlementPools().add(epMapper.applyMapping(ep, EntitlementPoolEntityDto.class));
+ @Override
+ public Response getFeatureGroup(String vlmId, String versionId, String featureGroupId,
+ String user) {
+ FeatureGroupEntity fgInput = new FeatureGroupEntity();
+ fgInput.setVendorLicenseModelId(vlmId);
+ fgInput.setVersion(new Version(versionId));
+ fgInput.setId(featureGroupId);
+ FeatureGroupModel featureGroupModel = vendorLicenseManager.getFeatureGroupModel(fgInput);
+
+ if (featureGroupModel == null) {
+ return Response.ok().build();
+ }
+
+ FeatureGroupModelDto fgmDto = new FeatureGroupModelDto();
+ fgmDto.setId(featureGroupModel.getFeatureGroup().getId());
+ fgmDto.setReferencingLicenseAgreements(
+ featureGroupModel.getFeatureGroup().getReferencingLicenseAgreements());
+ new MapFeatureGroupEntityToFeatureGroupDescriptorDto()
+ .doMapping(featureGroupModel.getFeatureGroup(), fgmDto);
+
+ if (!CollectionUtils.isEmpty(featureGroupModel.getLicenseKeyGroups())) {
+ fgmDto.setLicenseKeyGroups(new HashSet<>());
+
+ MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto lkgMapper =
+ new MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto();
+ for (LicenseKeyGroupEntity lkg : featureGroupModel.getLicenseKeyGroups()) {
+ fgmDto.getLicenseKeyGroups()
+ .add(lkgMapper.applyMapping(lkg, LicenseKeyGroupEntityDto.class));
+ }
+ }
+
+ if (!CollectionUtils.isEmpty(featureGroupModel.getEntitlementPools())) {
+ fgmDto.setEntitlementPools(new HashSet<>());
+
+ MapEntitlementPoolEntityToEntitlementPoolEntityDto epMapper =
+ new MapEntitlementPoolEntityToEntitlementPoolEntityDto();
+ for (EntitlementPoolEntity ep : featureGroupModel.getEntitlementPools()) {
+ fgmDto.getEntitlementPools().add(epMapper.applyMapping(ep, EntitlementPoolEntityDto.class));
+
+ }
+ }
+ return Response.ok(fgmDto).build();
+ }
- }
+ @Override
+ public Response deleteFeatureGroup(String vlmId, String versionId, String featureGroupId,
+ String user) {
+ FeatureGroupEntity fgInput = new FeatureGroupEntity();
+ fgInput.setVendorLicenseModelId(vlmId);
+ fgInput.setVersion(new Version(versionId));
+ fgInput.setId(featureGroupId);
+ vendorLicenseManager.deleteFeatureGroup(fgInput);
+ return Response.ok().build();
}
- return Response.ok(fgmDto).build();
- }
-
- @Override
- public Response deleteFeatureGroup(String vlmId, String versionId, String featureGroupId,
- String user) {
- FeatureGroupEntity fgInput = new FeatureGroupEntity();
- fgInput.setVendorLicenseModelId(vlmId);
- fgInput.setVersion(new Version(versionId));
- fgInput.setId(featureGroupId);
- vendorLicenseManager.deleteFeatureGroup(fgInput);
- return Response.ok().build();
- }
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/LicenseAgreementsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/LicenseAgreementsImpl.java
index 00d13f7983..05da9646b1 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/LicenseAgreementsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/LicenseAgreementsImpl.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.
@@ -20,7 +20,13 @@
package org.openecomp.sdcrests.vendorlicense.rest.services;
-import org.openecomp.core.utilities.CommonMethods;
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.collections4.CollectionUtils;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
@@ -31,151 +37,151 @@ import org.openecomp.sdcrests.vendorlicense.rest.LicenseAgreements;
import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapFeatureGroupEntityToFeatureGroupDescriptorDto;
import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity;
import org.openecomp.sdcrests.vendorlicense.rest.mapping.MapLicenseAgreementEntityToLicenseAgreementDescriptorDto;
-import org.openecomp.sdcrests.vendorlicense.types.*;
+import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementEntityDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementModelDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementRequestDto;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementUpdateRequestDto;
import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
import org.openecomp.sdcrests.wrappers.StringWrapperResponse;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.util.Collection;
-import java.util.HashSet;
-
@Named
@Service("licenseAgreements")
@Scope(value = "prototype")
public class LicenseAgreementsImpl implements LicenseAgreements {
- private VendorLicenseManager vendorLicenseManager =
- VendorLicenseManagerFactory.getInstance().createInterface();
-
- /**
- * List license agreements response.
- *
- * @param vlmId the vlm id
- * @param versionId the version
- * @param user the user
- * @return the response
- */
- public Response listLicenseAgreements(String vlmId, String versionId, String user) {
- Collection<LicenseAgreementEntity> licenseAgreements =
- vendorLicenseManager.listLicenseAgreements(vlmId, new Version(versionId));
-
- GenericCollectionWrapper<LicenseAgreementEntityDto> results = new GenericCollectionWrapper<>();
- MapLicenseAgreementEntityToLicenseAgreementDescriptorDto outputMapper =
- new MapLicenseAgreementEntityToLicenseAgreementDescriptorDto();
- for (LicenseAgreementEntity lae : licenseAgreements) {
- LicenseAgreementEntityDto laeDto = new LicenseAgreementEntityDto();
- laeDto.setId(lae.getId());
- laeDto.setFeatureGroupsIds(lae.getFeatureGroupIds());
- outputMapper.doMapping(lae, laeDto);
- results.add(laeDto);
+
+ private VendorLicenseManager vendorLicenseManager =
+ VendorLicenseManagerFactory.getInstance().createInterface();
+
+ /**
+ * List license agreements response.
+ *
+ * @param vlmId the vlm id
+ * @param versionId the version
+ * @param user the user
+ * @return the response
+ */
+ public Response listLicenseAgreements(String vlmId, String versionId, String user) {
+ Collection<LicenseAgreementEntity> licenseAgreements =
+ vendorLicenseManager.listLicenseAgreements(vlmId, new Version(versionId));
+
+ GenericCollectionWrapper<LicenseAgreementEntityDto> results = new GenericCollectionWrapper<>();
+ MapLicenseAgreementEntityToLicenseAgreementDescriptorDto outputMapper =
+ new MapLicenseAgreementEntityToLicenseAgreementDescriptorDto();
+ for (LicenseAgreementEntity lae : licenseAgreements) {
+ LicenseAgreementEntityDto laeDto = new LicenseAgreementEntityDto();
+ laeDto.setId(lae.getId());
+ laeDto.setFeatureGroupsIds(lae.getFeatureGroupIds());
+ outputMapper.doMapping(lae, laeDto);
+ results.add(laeDto);
+ }
+ return Response.ok(results).build();
+ }
+
+ /**
+ * Create license agreement response.
+ *
+ * @param request the request
+ * @param vlmId the vlm id
+ * @param user the user
+ * @return the response
+ */
+ public Response createLicenseAgreement(LicenseAgreementRequestDto request, String vlmId,
+ String versionId, String user) {
+ LicenseAgreementEntity licenseAgreementEntity =
+ new MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity()
+ .applyMapping(request, LicenseAgreementEntity.class);
+ licenseAgreementEntity.setVendorLicenseModelId(vlmId);
+ licenseAgreementEntity.setVersion(new Version(versionId));
+ licenseAgreementEntity.setFeatureGroupIds(request.getAddedFeatureGroupsIds());
+
+ LicenseAgreementEntity createdLicenseAgreement =
+ vendorLicenseManager.createLicenseAgreement(licenseAgreementEntity);
+ StringWrapperResponse result =
+ createdLicenseAgreement != null ? new StringWrapperResponse(createdLicenseAgreement.getId())
+ : null;
+ return Response.ok(result).build();
+ }
+
+ /**
+ * Update license agreement response.
+ *
+ * @param request the request
+ * @param vlmId the vlm id
+ * @param licenseAgreementId the license agreement id
+ * @param user the user
+ * @return the response
+ */
+ public Response updateLicenseAgreement(LicenseAgreementUpdateRequestDto request, String vlmId,
+ String versionId, String licenseAgreementId, String user) {
+ LicenseAgreementEntity licenseAgreementEntity =
+ new MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity()
+ .applyMapping(request, LicenseAgreementEntity.class);
+ licenseAgreementEntity.setVendorLicenseModelId(vlmId);
+ licenseAgreementEntity.setVersion(new Version(versionId));
+ licenseAgreementEntity.setId(licenseAgreementId);
+
+ vendorLicenseManager
+ .updateLicenseAgreement(licenseAgreementEntity, request.getAddedFeatureGroupsIds(),
+ request.getRemovedFeatureGroupsIds());
+ return Response.ok().build();
}
- return Response.ok(results).build();
- }
-
- /**
- * Create license agreement response.
- *
- * @param request the request
- * @param vlmId the vlm id
- * @param user the user
- * @return the response
- */
- public Response createLicenseAgreement(LicenseAgreementRequestDto request, String vlmId,
- String versionId, String user) {
- LicenseAgreementEntity licenseAgreementEntity =
- new MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity()
- .applyMapping(request, LicenseAgreementEntity.class);
- licenseAgreementEntity.setVendorLicenseModelId(vlmId);
- licenseAgreementEntity.setVersion(new Version(versionId));
- licenseAgreementEntity.setFeatureGroupIds(request.getAddedFeatureGroupsIds());
-
- LicenseAgreementEntity createdLicenseAgreement =
- vendorLicenseManager.createLicenseAgreement(licenseAgreementEntity);
- StringWrapperResponse result =
- createdLicenseAgreement != null ? new StringWrapperResponse(createdLicenseAgreement.getId())
- : null;
- return Response.ok(result).build();
- }
-
- /**
- * Update license agreement response.
- *
- * @param request the request
- * @param vlmId the vlm id
- * @param licenseAgreementId the license agreement id
- * @param user the user
- * @return the response
- */
- public Response updateLicenseAgreement(LicenseAgreementUpdateRequestDto request, String vlmId,
- String versionId, String licenseAgreementId, String user) {
- LicenseAgreementEntity licenseAgreementEntity =
- new MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity()
- .applyMapping(request, LicenseAgreementEntity.class);
- licenseAgreementEntity.setVendorLicenseModelId(vlmId);
- licenseAgreementEntity.setVersion(new Version(versionId));
- licenseAgreementEntity.setId(licenseAgreementId);
-
- vendorLicenseManager
- .updateLicenseAgreement(licenseAgreementEntity, request.getAddedFeatureGroupsIds(),
- request.getRemovedFeatureGroupsIds());
- return Response.ok().build();
- }
-
- /**
- * Gets license agreement.
- *
- * @param vlmId the vlm id
- * @param versionId the version
- * @param licenseAgreementId the license agreement id
- * @param user the user
- * @return the license agreement
- */
- public Response getLicenseAgreement(String vlmId, String versionId, String licenseAgreementId,
- String user) {
- LicenseAgreementModel licenseAgreementModel = vendorLicenseManager
- .getLicenseAgreementModel(vlmId, new Version(versionId), licenseAgreementId);
-
- if (licenseAgreementModel == null) {
- return Response.ok().build();
+
+ /**
+ * Gets license agreement.
+ *
+ * @param vlmId the vlm id
+ * @param versionId the version
+ * @param licenseAgreementId the license agreement id
+ * @param user the user
+ * @return the license agreement
+ */
+ public Response getLicenseAgreement(String vlmId, String versionId, String licenseAgreementId,
+ String user) {
+ LicenseAgreementModel licenseAgreementModel = vendorLicenseManager
+ .getLicenseAgreementModel(vlmId, new Version(versionId), licenseAgreementId);
+
+ if (licenseAgreementModel == null) {
+ return Response.ok().build();
+ }
+
+ LicenseAgreementModelDto lamDto = new LicenseAgreementModelDto();
+ lamDto.setId(licenseAgreementModel.getLicenseAgreement().getId());
+ new MapLicenseAgreementEntityToLicenseAgreementDescriptorDto()
+ .doMapping(licenseAgreementModel.getLicenseAgreement(), lamDto);
+
+ if (!CollectionUtils.isEmpty(licenseAgreementModel.getFeatureGroups())) {
+ lamDto.setFeatureGroups(new HashSet<>());
+
+ MapFeatureGroupEntityToFeatureGroupDescriptorDto fgMapper =
+ new MapFeatureGroupEntityToFeatureGroupDescriptorDto();
+ for (FeatureGroupEntity fg : licenseAgreementModel.getFeatureGroups()) {
+ FeatureGroupEntityDto fgeDto = new FeatureGroupEntityDto();
+ fgeDto.setId(fg.getId());
+ fgeDto.setEntitlementPoolsIds(fg.getEntitlementPoolIds());
+ fgeDto.setLicenseKeyGroupsIds(fg.getLicenseKeyGroupIds());
+ fgMapper.doMapping(fg, fgeDto);
+
+ lamDto.getFeatureGroups().add(fgeDto);
+ }
+ }
+ return Response.ok(lamDto).build();
}
- LicenseAgreementModelDto lamDto = new LicenseAgreementModelDto();
- lamDto.setId(licenseAgreementModel.getLicenseAgreement().getId());
- new MapLicenseAgreementEntityToLicenseAgreementDescriptorDto()
- .doMapping(licenseAgreementModel.getLicenseAgreement(), lamDto);
-
- if (!CommonMethods.isEmpty(licenseAgreementModel.getFeatureGroups())) {
- lamDto.setFeatureGroups(new HashSet<>());
-
- MapFeatureGroupEntityToFeatureGroupDescriptorDto fgMapper =
- new MapFeatureGroupEntityToFeatureGroupDescriptorDto();
- for (FeatureGroupEntity fg : licenseAgreementModel.getFeatureGroups()) {
- FeatureGroupEntityDto fgeDto = new FeatureGroupEntityDto();
- fgeDto.setId(fg.getId());
- fgeDto.setEntitlementPoolsIds(fg.getEntitlementPoolIds());
- fgeDto.setLicenseKeyGroupsIds(fg.getLicenseKeyGroupIds());
- fgMapper.doMapping(fg, fgeDto);
-
- lamDto.getFeatureGroups().add(fgeDto);
- }
+ /**
+ * Delete license agreement response.
+ *
+ * @param vlmId the vlm id
+ * @param versionId the version id
+ * @param licenseAgreementId the license agreement id
+ * @param user the user
+ * @return the response
+ */
+ public Response deleteLicenseAgreement(String vlmId, String versionId, String licenseAgreementId,
+ String user) {
+ vendorLicenseManager.deleteLicenseAgreement(vlmId, new Version(versionId), licenseAgreementId);
+ return Response.ok().build();
}
- return Response.ok(lamDto).build();
- }
-
- /**
- * Delete license agreement response.
- *
- * @param vlmId the vlm id
- * @param versionId the version id
- * @param licenseAgreementId the license agreement id
- * @param user the user
- * @return the response
- */
- public Response deleteLicenseAgreement(String vlmId, String versionId, String licenseAgreementId,
- String user) {
- vendorLicenseManager.deleteLicenseAgreement(vlmId, new Version(versionId), licenseAgreementId);
- return Response.ok().build();
- }
}