Upgrade sonar plugin

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

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
index 6d5f952..232023b 100755 (executable)
--- a/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
@@ -24,31 +24,36 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;\r
 import org.springframework.context.annotation.Configuration;\r
 import org.springframework.context.annotation.PropertySource;\r
+import org.springframework.context.annotation.PropertySources;\r
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;\r
 \r
 /**\r
  * The Class AsdcClientConfiguration.\r
  */\r
 @Configuration\r
-@PropertySource(value="${container.classpath:}/WEB-INF/conf/asdc.properties")\r
+\r
+@PropertySources({\r
+               @PropertySource(value="asdc.properties",  ignoreResourceNotFound = true),\r
+               @PropertySource(value="${container.classpath:}/WEB-INF/conf/asdc.properties", ignoreResourceNotFound = true)\r
+})\r
 public class AsdcClientConfiguration {\r
-       \r
-    @Bean \r
-    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { \r
-        return new PropertySourcesPlaceholderConfigurer(); \r
+\r
+    @Bean\r
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {\r
+        return new PropertySourcesPlaceholderConfigurer();\r
     }\r
 \r
        @Value("${asdc.client.type}")\r
        private AsdcClientType asdcClientType;\r
-       \r
+\r
        /** The asdc client host. */\r
        @Value("${asdc.client.rest.host}")\r
        private String asdcClientHost;\r
-       \r
+\r
        /** The asdc client port. */\r
        @Value("${asdc.client.rest.port}")\r
        private int asdcClientPort;\r
-       \r
+\r
        /** The asdc client auth. */\r
        @Value("${asdc.client.rest.auth}")\r
        public String asdcClientAuth;\r
@@ -56,7 +61,7 @@ public class AsdcClientConfiguration {
        /** The asdc client protocol. */\r
        @Value("${asdc.client.rest.protocol}")\r
        public String asdcClientProtocol;\r
-       \r
+\r
        /**\r
         * Gets the asdc client type.\r
         *\r
@@ -101,16 +106,19 @@ public class AsdcClientConfiguration {
        public String getAsdcClientProtocol() {\r
                return asdcClientProtocol;\r
        }\r
-       \r
+\r
        /**\r
         * The Enum AsdcClientType.\r
         */\r
        public enum AsdcClientType {\r
-               \r
+\r
                /** The in memory. */\r
                IN_MEMORY,\r
-               \r
+\r
                /** The rest. */\r
-               REST\r
+               REST,\r
+\r
+               /** The local. */\r
+               LOCAL\r
        }\r
 }\r