Sonar Fix: DataBaseInitService.java

Fixed sonar issues/code-smells across this file

Issue-ID: CCSDK-751
Change-Id: Id23ba470761de5470b37a5b52830b064fbbf934b
Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
index a4eb2ae..a1a9b9c 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
@@ -63,6 +63,7 @@ public class DataBaseInitService {
     private ModelTypeService modelTypeService;\r
     private ResourceDictionaryService resourceDictionaryService;\r
     private ConfigModelService configModelService;\r
+    private String updateBySystem = "System";\r
 \r
     @Value("${load.dataTypePath}")\r
     private String dataTypePath;\r
@@ -105,8 +106,6 @@ public class DataBaseInitService {
 \r
         loadModelType();\r
         loadResourceDictionary();\r
-        // TODO("Enable after Multi file Service Template Repository implementation in place")\r
-        //loadBlueprints();\r
     }\r
 \r
     private void loadModelType() {\r
@@ -188,6 +187,7 @@ public class DataBaseInitService {
                             throw new BluePrintException("couldn't get dictionary from content information");\r
                         }\r
                     } catch (Exception e) {\r
+                        log.error("Exception", e);\r
                         errorBuilder.appendln("Dictionary loading Errors : " + file.getFilename() + ":" + e.getMessage());\r
                     }\r
                 }\r
@@ -223,6 +223,7 @@ public class DataBaseInitService {
                         log.info("Loaded service template successfully: {}", fileName);\r
 \r
                     } catch (Exception e) {\r
+                        log.error("Exception", e);\r
                         errorBuilder.appendln("load config model " + fileName + " error : " + e.getMessage());\r
                     }\r
                 }\r
@@ -250,12 +251,13 @@ public class DataBaseInitService {
             modelType.setDefinition(JacksonUtils.jsonNode(definitionContent));\r
             modelType.setModelName(nodeKey);\r
             modelType.setVersion(nodeType.getVersion());\r
-            modelType.setUpdatedBy("System");\r
+            modelType.setUpdatedBy(updateBySystem);\r
             modelType.setTags(nodeKey + "," + BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TYPE + ","\r
                     + nodeType.getDerivedFrom());\r
             modelTypeService.saveModel(modelType);\r
             log.trace("Loaded Node Type successfully : {}", file.getFilename());\r
         } catch (Exception e) {\r
+            log.error("Exception", e);\r
             errorBuilder.appendln("Node type loading error : " + file.getFilename() + ":" + e.getMessage());\r
         }\r
     }\r
@@ -274,12 +276,13 @@ public class DataBaseInitService {
             modelType.setDefinition(JacksonUtils.jsonNode(definitionContent));\r
             modelType.setModelName(dataKey);\r
             modelType.setVersion(dataType.getVersion());\r
-            modelType.setUpdatedBy("System");\r
+            modelType.setUpdatedBy(updateBySystem);\r
             modelType.setTags(dataKey + "," + dataType.getDerivedFrom() + ","\r
                     + BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE);\r
             modelTypeService.saveModel(modelType);\r
             log.trace(" Loaded Data Type successfully : {}", file.getFilename());\r
         } catch (Exception e) {\r
+            log.error("Exception", e);\r
             errorBuilder.appendln("Data type loading error : " + file.getFilename() + ":" + e.getMessage());\r
         }\r
     }\r
@@ -298,12 +301,13 @@ public class DataBaseInitService {
             modelType.setDefinition(JacksonUtils.jsonNode(definitionContent));\r
             modelType.setModelName(dataKey);\r
             modelType.setVersion(artifactType.getVersion());\r
-            modelType.setUpdatedBy("System");\r
+            modelType.setUpdatedBy(updateBySystem);\r
             modelType.setTags(dataKey + "," + artifactType.getDerivedFrom() + ","\r
                     + BluePrintConstants.MODEL_DEFINITION_TYPE_ARTIFACT_TYPE);\r
             modelTypeService.saveModel(modelType);\r
             log.trace("Loaded Artifact Type successfully : {}", file.getFilename());\r
         } catch (Exception e) {\r
+            log.error("Exception", e);\r
             errorBuilder.appendln("Artifact type loading error : " + file.getFilename() + ":" + e.getMessage());\r
         }\r
     }\r