Controller Blueprints Microservice

[ccsdk/apps.git] / ms / controllerblueprints / modules / service / src / main / java / org / onap / ccsdk / apps / controllerblueprints / service / BluePrintRepoDBService.java

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintRepoDBService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintRepoDBService.java
index c4aebe5..5510e48 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintRepoDBService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintRepoDBService.java
@@ -17,6 +17,7 @@
 \r
 package org.onap.ccsdk.apps.controllerblueprints.service;\r
 \r
+import com.fasterxml.jackson.databind.JsonNode;\r
 import com.google.common.base.Preconditions;\r
 import org.apache.commons.lang3.StringUtils;\r
 import org.jetbrains.annotations.NotNull;\r
@@ -75,16 +76,16 @@ public class BluePrintRepoDBService implements BluePrintRepoService {
         Preconditions.checkArgument(StringUtils.isNotBlank(modelName),\r
                 "Failed to get model from repo, model name is missing");\r
 \r
-        return getModelDefinition(modelName).map(content -> {\r
-                    Preconditions.checkArgument(StringUtils.isNotBlank(content),\r
+        return getModelDefinition(modelName).map(modelDefinition -> {\r
+                    Preconditions.checkNotNull(modelDefinition,\r
                             String.format("Failed to get model content for model name (%s)", modelName));\r
-                    return JacksonUtils.readValue(content, valueClass);\r
+                    return JacksonUtils.readValue(modelDefinition, valueClass);\r
                 }\r
         );\r
     }\r
 \r
-    private Mono<String> getModelDefinition(String modelName) throws BluePrintException {\r
-        String modelDefinition;\r
+    private Mono<JsonNode> getModelDefinition(String modelName) throws BluePrintException {\r
+        JsonNode modelDefinition;\r
         Optional<ModelType> modelTypeDb = modelTypeRepository.findByModelName(modelName);\r
         if (modelTypeDb.isPresent()) {\r
             modelDefinition = modelTypeDb.get().getDefinition();\r