1 files changed, 2 insertions, 4 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogic.java
index 892536ffa7..687004a017 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeBusinessLogic.java
@@ -91,10 +91,8 @@ public class DataTypeBusinessLogic extends BaseBusinessLogic {
         }
         List<DataTypeDefinition> dataTypes = dataTypesResult.left().value();
         Optional<DataTypeDefinition> findResult = dataTypes.stream().filter(e -> e.getName().equals(dataTypeName)).findAny();
-        if (!findResult.isPresent()) {
-            return Either.right(StorageOperationStatus.NOT_FOUND);
-        }
-        return Either.left(findResult.get());
+        return findResult.<Either<DataTypeDefinition, StorageOperationStatus>>map(Either::left)
+            .orElseGet(() -> Either.right(StorageOperationStatus.NOT_FOUND));
     }
 
     /**