diff options
author | ayalaben <ayala.benzvi@amdocs.com> | 2018-10-04 14:24:58 +0300 |
---|---|---|
committer | ayalaben <ayala.benzvi@amdocs.com> | 2018-10-07 13:15:53 +0300 |
commit | 453831564d4af7eb7603a50a2d75505ad858db2b (patch) | |
tree | 1a06c433d2d9b458c4e47531fb39abc9db1fb66a /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 | |
parent | 454cfef267e87a2e0fba46964106c6fe03c220fd (diff) |
Entities are not ordered by Name user feedback
Change-Id: I937b744c13d3cdf08a2ba23e365c7138494ac491
Issue-ID: SDC-1818
Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
Diffstat (limited to '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')
-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.java | 32 |
1 files changed, 19 insertions, 13 deletions
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 05da9646b1..7c0539931b 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 @@ -20,12 +20,11 @@ package org.openecomp.sdcrests.vendorlicense.rest.services; -import java.util.Collection; +import java.util.Comparator; import java.util.HashSet; - +import java.util.stream.Collectors; 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; @@ -64,22 +63,20 @@ public class LicenseAgreementsImpl implements LicenseAgreements { * @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); - } + + GenericCollectionWrapper<LicenseAgreementEntityDto> results = new GenericCollectionWrapper<>( + vendorLicenseManager.listLicenseAgreements(vlmId, new Version(versionId)).stream() + .sorted(Comparator.comparing(LicenseAgreementEntity::getName)) + .map(lae -> getLicenseAgreementEntityDto(outputMapper, lae)) + .collect(Collectors.toList())); + return Response.ok(results).build(); } + /** * Create license agreement response. * @@ -184,4 +181,13 @@ public class LicenseAgreementsImpl implements LicenseAgreements { vendorLicenseManager.deleteLicenseAgreement(vlmId, new Version(versionId), licenseAgreementId); return Response.ok().build(); } + + private LicenseAgreementEntityDto getLicenseAgreementEntityDto( + MapLicenseAgreementEntityToLicenseAgreementDescriptorDto mapper, LicenseAgreementEntity lae) { + LicenseAgreementEntityDto laeDto = new LicenseAgreementEntityDto(); + laeDto.setId(lae.getId()); + laeDto.setFeatureGroupsIds(lae.getFeatureGroupIds()); + mapper.doMapping(lae, laeDto); + return laeDto; + } } |