[VID-55] Upgrade Tosca Parser (merge)

[vid.git] / vid-app-common / src / main / java / org / openecomp / vid / properties / VidProperties.java

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
index 38062df..141b9b2 100755 (executable)
--- a/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
@@ -53,27 +53,21 @@ public class VidProperties extends SystemProperties {
         * \r
         * @return the property value or a default value\r
         */\r
-       public static String[] getAsdcModelNamespace() {\r
+       public static String getAsdcModelNamespace() {\r
                String methodName = "getAsdcModelNamespace ";\r
-               String[] asdcModelNamespaces = null;\r
-               String value = null;\r
+               String asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;\r
            try {\r
-               value = SystemProperties.getProperty(ModelConstants.ASDC_MODEL_NAMESPACE);\r
-               if ( value == null || value.isEmpty()) {\r
-                       asdcModelNamespaces = new String[1];\r
-                       asdcModelNamespaces[0] = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;\r
+               asdcModelNamespace = SystemProperties.getProperty(ModelConstants.ASDC_MODEL_NAMESPACE);\r
+               if ( asdcModelNamespace == null || asdcModelNamespace.isEmpty()) {\r
+                       asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;\r
                    }\r
-               else {\r
-                       asdcModelNamespaces = value.split(",");\r
-               }\r
            }\r
            catch ( Exception e ) {\r
                LOG.error (EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + methodName + "unable to find the value, using the default "\r
                                + ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE);\r
-               asdcModelNamespaces = new String[1];\r
-               asdcModelNamespaces[0] = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;\r
+               asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;\r
            }\r
-           return (asdcModelNamespaces);\r
+           return (asdcModelNamespace);\r
        }\r
        /**\r
         * Gets the specified property value. If the property is not defined, returns a default value.\r
@@ -96,5 +90,4 @@ public class VidProperties extends SystemProperties {
            }\r
            return (propValue);\r
        }\r
-       \r
 }\r