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 ae4fed9..c4aebe5 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
@@ -19,6 +19,7 @@ package org.onap.ccsdk.apps.controllerblueprints.service;
 \r
 import com.google.common.base.Preconditions;\r
 import org.apache.commons.lang3.StringUtils;\r
+import org.jetbrains.annotations.NotNull;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.data.*;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService;\r
@@ -36,36 +37,37 @@ import java.util.Optional;
  * @author Brinda Santh\r
  */\r
 @Service\r
+@SuppressWarnings("unused")\r
 public class BluePrintRepoDBService implements BluePrintRepoService {\r
 \r
     private ModelTypeRepository modelTypeRepository;\r
-\r
+    @SuppressWarnings("unused")\r
     public BluePrintRepoDBService(ModelTypeRepository modelTypeRepository) {\r
         this.modelTypeRepository = modelTypeRepository;\r
     }\r
 \r
     @Override\r
-    public Mono<NodeType> getNodeType(String nodeTypeName) throws BluePrintException {\r
+    public Mono<NodeType> getNodeType(@NotNull String nodeTypeName) throws BluePrintException {\r
         return getModelType(nodeTypeName, NodeType.class);\r
     }\r
 \r
     @Override\r
-    public Mono<DataType> getDataType(String dataTypeName) throws BluePrintException {\r
+    public Mono<DataType> getDataType(@NotNull String dataTypeName) throws BluePrintException {\r
         return getModelType(dataTypeName, DataType.class);\r
     }\r
 \r
     @Override\r
-    public Mono<ArtifactType> getArtifactType(String artifactTypeName) throws BluePrintException {\r
+    public Mono<ArtifactType> getArtifactType(@NotNull String artifactTypeName) throws BluePrintException {\r
         return getModelType(artifactTypeName, ArtifactType.class);\r
     }\r
 \r
     @Override\r
-    public Mono<RelationshipType> getRelationshipType(String relationshipTypeName) throws BluePrintException {\r
+    public Mono<RelationshipType> getRelationshipType(@NotNull String relationshipTypeName) throws BluePrintException {\r
         return getModelType(relationshipTypeName, RelationshipType.class);\r
     }\r
 \r
     @Override\r
-    public Mono<CapabilityDefinition> getCapabilityDefinition(String capabilityDefinitionName) throws BluePrintException {\r
+    public Mono<CapabilityDefinition> getCapabilityDefinition(@NotNull String capabilityDefinitionName) throws BluePrintException {\r
         return getModelType(capabilityDefinitionName, CapabilityDefinition.class);\r
     }\r
 \r
@@ -73,15 +75,15 @@ public class BluePrintRepoDBService implements BluePrintRepoService {
         Preconditions.checkArgument(StringUtils.isNotBlank(modelName),\r
                 "Failed to get model from repo, model name is missing");\r
 \r
-        return getModelDefinitions(modelName).map(content -> {\r
-            Preconditions.checkArgument(StringUtils.isNotBlank(content),\r
-                    String.format("Failed to get model content for model name (%s)", modelName));\r
+        return getModelDefinition(modelName).map(content -> {\r
+                    Preconditions.checkArgument(StringUtils.isNotBlank(content),\r
+                            String.format("Failed to get model content for model name (%s)", modelName));\r
                     return JacksonUtils.readValue(content, valueClass);\r
                 }\r
         );\r
     }\r
 \r
-    private Mono<String> getModelDefinitions(String modelName) throws BluePrintException {\r
+    private Mono<String> getModelDefinition(String modelName) throws BluePrintException {\r
         String modelDefinition;\r
         Optional<ModelType> modelTypeDb = modelTypeRepository.findByModelName(modelName);\r
         if (modelTypeDb.isPresent()) {\r