From 08e100185603620b455d8e0e421de0b66d97fbee Mon Sep 17 00:00:00 2001 From: franciscovila Date: Thu, 13 Jan 2022 10:03:44 +0000 Subject: 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 Change-Id: I9e2ead4b88510499ae6c8377c95bba3be21935a7 --- .../dao/impl/zusammen/EntitlementPoolZusammenDaoImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-vendor-license-lib') 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 elementInfo1 = zusammenAdaptor.getElementInfo(context, elementContext, new Id(entitlementPoolEntity.getId())); - Map properties = elementInfo1.get().getInfo().getProperties(); String manufacturerReferenceNumber = null; - if (properties != null && properties.containsKey("manufacturerReferenceNumber")) { - manufacturerReferenceNumber = (String) properties.get("manufacturerReferenceNumber"); + if (elementInfo1.isPresent()) { + Map properties = elementInfo1.get().getInfo().getProperties(); + + if (properties != null && properties.containsKey("manufacturerReferenceNumber")) { + manufacturerReferenceNumber = (String) properties.get("manufacturerReferenceNumber"); + } } return manufacturerReferenceNumber; } -- cgit 1.2.3-korg