Merge the POMBA code to ONAP AAI data router

[aai/data-router.git] / src / main / java / org / onap / aai / datarouter / util / DataRouterProperties.java

diff --git a/src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java b/src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java
index 36e4a10..b24f5bd 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java
+++ b/src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java
@@ -1,58 +1,62 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.aai.datarouter.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DataRouterProperties {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DataRouterProperties.class);
-
-    private static Properties properties;
-
-    static {
-        File file = new File(DataRouterConstants.DR_CONFIG_FILE);
-        loadProperties(file);
-    }
-
-    static void loadProperties(File file) {
-        properties = new Properties();
-        try (InputStream props = new FileInputStream(file)) {
-            properties.load(props);
-        } catch (FileNotFoundException e) {
-            LOGGER.error("FileNotFoundException: ", e);
-        } catch (IOException e) {
-            LOGGER.error("IOException: ", e);
-        }
-    }
-
-    public static String get(String key) {
-        return properties.getProperty(key);
-    }
-
-}
+/**\r
+ * ============LICENSE_START=======================================================\r
+ * org.onap.aai\r
+ * ================================================================================\r
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright © 2017-2018 Amdocs\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ */\r
+package org.onap.aai.datarouter.util;\r
+\r
+import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.FileNotFoundException;\r
+import java.io.IOException;\r
+import java.io.InputStream;\r
+import java.util.Properties;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
+public class DataRouterProperties {\r
+\r
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataRouterProperties.class);\r
+\r
+    private static Properties properties;\r
+\r
+    static {\r
+        File file = new File(DataRouterConstants.DR_CONFIG_FILE);\r
+        loadProperties(file);\r
+    }\r
+\r
+    static void loadProperties(File file) {\r
+        properties = new Properties();\r
+        try (InputStream props = new FileInputStream(file)) {\r
+            properties.load(props);\r
+        } catch (FileNotFoundException e) {\r
+            LOGGER.error("FileNotFoundException: ", e);\r
+        } catch (IOException e) {\r
+            LOGGER.error("IOException: ", e);\r
+        }\r
+    }\r
+\r
+    public static String get(String key) {\r
+        return properties.getProperty(key);\r
+    }\r
+\r
+    public static String get(String key, String defaultValue) {\r
+        return properties.getProperty(key, defaultValue);\r
+    }\r
+\r
+}\r