From: Chris André <chris.andre@yoppworks.com>
Date: Mon, 4 May 2020 21:00:03 +0000 (-0400)
Subject: UnifiedCompositionService - Refactor code to handle Optional value
X-Git-Tag: 1.7.0~170
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=efec7c5f7abb24da6d8ab93a71ee725e1c1f438f;p=sdc.git

UnifiedCompositionService - Refactor code to handle Optional value

Issue-ID: SDC-3015
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I1d15d20e9c603ff894c7c4be46b26d60745cb7e5
---

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index 81a5a199c2..69e74542da 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -3641,12 +3641,9 @@ public class UnifiedCompositionService {
                                                     List<String> identicalValuePropertyList) {
     switch (unifiedCompositionEntity) {
       case COMPUTE:
-        return identicalValuePropertyList.contains(getIdenticalValuePropertyName(inputName,
-                unifiedCompositionEntity).get());
-
       case OTHER:
-        return identicalValuePropertyList.contains(getIdenticalValuePropertyName(inputName,
-                unifiedCompositionEntity).get());
+        Optional<String> identicalValueProperty = getIdenticalValuePropertyName(inputName, unifiedCompositionEntity);
+        return identicalValueProperty.filter(identicalValuePropertyList::contains).isPresent();
 
       case PORT:
         return getPortPropertyNameFromInput(inputName, identicalValuePropertyList).isPresent();