Upgrade sonar plugin

[vid.git] / vid-app-common / src / main / java / org / openecomp / vid / mso / MsoRestInterfaceFactory.java

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
index 8bb3093..ab12c7b 100755 (executable)
--- a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
@@ -21,28 +21,24 @@
 package org.openecomp.vid.mso;\r
 \r
 import org.openecomp.portalsdk.core.util.SystemProperties;\r
+import org.openecomp.vid.mso.rest.MsoRestClientNew;\r
 \r
 /**\r
  * A factory for creating MsoRestInterface objects.\r
  */\r
 public class MsoRestInterfaceFactory {\r
-       \r
-       /**\r
-        * Gets the single instance of MsoRestInterfaceFactory.\r
-        *\r
-        * @return single instance of MsoRestInterfaceFactory\r
-        */\r
-       public static MsoRestInterfaceIfc getInstance () {\r
-               MsoRestInterfaceIfc obj = null;\r
-               \r
-//             String mso_dme2_enabled = SystemProperties.getProperty(MsoProperties.MSO_DME2_ENABLED);\r
-//             if ( (mso_dme2_enabled != null) && (mso_dme2_enabled.equalsIgnoreCase("true") ) ) {\r
-//                     obj = new MsoDme2RestInterface();\r
-//             }\r
-//             else {\r
-                       obj = new MsoRestInterface();\r
-//             }\r
-               return ( obj );\r
-       }\r
 \r
+    /**\r
+     * Gets the single instance of MsoRestInterfaceFactory.\r
+     *\r
+     * @return single instance of MsoRestInterfaceFactory\r
+     */\r
+    public static MsoInterface getInstance() {\r
+        String msoPropertyName = "mso.client.type";\r
+        if (SystemProperties.containsProperty(msoPropertyName) &&\r
+                SystemProperties.getProperty(msoPropertyName).equals("LOCAL")) {\r
+            return new MsoLocalClientNew();\r
+        } else\r
+            return new MsoRestClientNew();\r
+    }\r
 }\r