From d52bc4fff5b2f66e1616bf4c320d7dc9a9bf5702 Mon Sep 17 00:00:00 2001 From: franciscovila Date: Wed, 12 Jan 2022 12:57:15 +0000 Subject: [PATCH 1/1] Fix use of Optional in ModelOperation Checking the Optionals are present before getting their values in the ModelOperation class Issue-ID: SDC-3832 Signed-off-by: franciscovila Change-Id: Ia28c3ebbd32db83b54b4f8d5b5fa35dfa2c4af50 --- .../org/openecomp/sdc/be/model/operations/impl/ModelOperation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ModelOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ModelOperation.java index b5cb9d98c0..b73f40f8f1 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ModelOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ModelOperation.java @@ -246,7 +246,8 @@ public class ModelOperation { private Model convertToModel(final GraphVertex modelGraphVertex) { final String modelName = (String) modelGraphVertex.getMetadataProperty(GraphPropertyEnum.NAME); final String modelTypeProperty = (String) modelGraphVertex.getMetadataProperty(GraphPropertyEnum.MODEL_TYPE); - final ModelTypeEnum modelType = StringUtils.isEmpty(modelTypeProperty) ? ModelTypeEnum.NORMATIVE : ModelTypeEnum.findByValue(modelTypeProperty).get(); + final ModelTypeEnum modelType = StringUtils.isEmpty(modelTypeProperty) ? ModelTypeEnum.NORMATIVE : + ModelTypeEnum.findByValue(modelTypeProperty).isPresent() ? ModelTypeEnum.findByValue(modelTypeProperty).get() : ModelTypeEnum.NORMATIVE; final Either, JanusGraphOperationStatus> parentNode = janusGraphGenericDao.getChild(UniqueIdBuilder.getKeyByNodeType(NodeTypeEnum.Model), UniqueIdBuilder.buildModelUid(modelName), -- 2.16.6