diff options
| author |   Michael Lando <ml636r@att.com> | 2017-07-16 16:45:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-07-16 16:45:58 +0000 |
| commit | cc31a0d5101787cf7556924b7d3e9bcd99278d96 (patch) | |
| tree | 84772b9754470fcdfbf49764835b80d10d20d76d | |
| parent | f50a791a8483df54f4e89e3e9b9df35fce590846 (diff) | |
| parent | 11c43843cc8da467e1c43fc2dc0e88a6667168af (diff) | |
Merge "[SDC] OnBoarding rebase."
3 files changed, 9 insertions, 6 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java index ffaf7809c8..a31210a81a 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java @@ -83,7 +83,9 @@ public class EntitlementPoolZusammenDaoImpl implements EntitlementPoolDao { if (entitlmentpoolElement.getRelations() == null) { entitlmentpoolElement.setRelations(new ArrayList<>()); } - entitlmentpoolElement.getRelations().addAll(epFromDb.get().getRelations()); + if (epFromDb.get().getRelations() != null) { + entitlmentpoolElement.getRelations().addAll(epFromDb.get().getRelations()); + } } zusammenAdaptor.saveElement(context,elementContext, entitlmentpoolElement, diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java index 03537a287b..f5d905cf35 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseKeyGroupZusammenDaoImpl.java @@ -74,14 +74,15 @@ public class LicenseKeyGroupZusammenDaoImpl implements LicenseKeyGroupDao { Optional<ElementInfo> lkgFromDb = zusammenAdaptor.getElementInfo(context, elementContext, new Id(licenseKeyGroup.getId())); - if(lkgFromDb.isPresent()) { + if (lkgFromDb.isPresent()) { - if( licenseKeyGroupElement.getRelations() == null) { + if (licenseKeyGroupElement.getRelations() == null) { licenseKeyGroupElement.setRelations(new ArrayList<>()); } - lkgFromDb.get().getRelations().forEach(relation -> - licenseKeyGroupElement.getRelations().add(relation)); + if (lkgFromDb.get().getRelations() != null) { + licenseKeyGroupElement.getRelations().addAll(lkgFromDb.get().getRelations()); + } } zusammenAdaptor.saveElement(context, elementContext, @@ -30,7 +30,7 @@ <artifact-generator-api.version>1.1.0-SNAPSHOT</artifact-generator-api.version> <artifact-generator-core.version>1.1.0-SNAPSHOT</artifact-generator-core.version> - <ecomp.version>1.1.0-SNAPSHOT</ecomp.version> + <ecomp.version>1.1.0</ecomp.version> <dox-common-lib.version>1.1.0-SNAPSHOT</dox-common-lib.version> <!-- Elastic Search mapper (reference the elastic search version actually). --> |