From: franciscovila <javier.paradela.vila@est.tech>
Date: Thu, 13 Jan 2022 10:03:44 +0000 (+0000)
Subject: Fix use of Optional in EntitlementPoolZusammenDaoImpl
X-Git-Tag: 1.10.1~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F126589%2F2;p=sdc.git

Fix use of Optional in EntitlementPoolZusammenDaoImpl

Checking the Optionals are present before getting
their values in the EntitlementPoolZusammenDaoImpl class

Issue-ID: SDC-3835
Signed-off-by: franciscovila <javier.paradela.vila@est.tech>
Change-Id: I9e2ead4b88510499ae6c8377c95bba3be21935a7
---

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 aa90df8389..2216519031 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
@@ -170,10 +170,13 @@ public class EntitlementPoolZusammenDaoImpl implements EntitlementPoolDao {
         ElementContext elementContext = new ElementContext(entitlementPoolEntity.getVendorLicenseModelId(),
             entitlementPoolEntity.getVersion().getId());
         Optional<ElementInfo> elementInfo1 = zusammenAdaptor.getElementInfo(context, elementContext, new Id(entitlementPoolEntity.getId()));
-        Map<String, Object> properties = elementInfo1.get().getInfo().getProperties();
         String manufacturerReferenceNumber = null;
-        if (properties != null && properties.containsKey("manufacturerReferenceNumber")) {
-            manufacturerReferenceNumber = (String) properties.get("manufacturerReferenceNumber");
+        if (elementInfo1.isPresent()) {
+            Map<String, Object> properties = elementInfo1.get().getInfo().getProperties();
+
+            if (properties != null && properties.containsKey("manufacturerReferenceNumber")) {
+                manufacturerReferenceNumber = (String) properties.get("manufacturerReferenceNumber");
+            }
         }
         return manufacturerReferenceNumber;
     }