UnifiedCompositionService - Refactor code to handle Optional value 74/107074/2
authorChris André <chris.andre@yoppworks.com>
Mon, 4 May 2020 21:00:03 +0000 (17:00 -0400)
committerOjas Dubey <Ojas.Dubey@amdocs.com>
Tue, 5 May 2020 10:56:47 +0000 (10:56 +0000)
Issue-ID: SDC-3015
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I1d15d20e9c603ff894c7c4be46b26d60745cb7e5

openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java

index 81a5a19..69e7454 100644 (file)
@@ -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();