X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Fsearchdbabstraction%2Futil%2FSearchDbConstants.java;h=fd63741e21cea05ecb84ee47498a8b4225c4779c;hb=5ea47abeeb1713b56006fd69b1564cbd4c4220c7;hp=e4f62efb6620c7d84a2d1a7606488f9e3783b6fb;hpb=22c477621c40c4762cceb67a1d18749bff68fb87;p=aai%2Fsearch-data-service.git

diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
index e4f62ef..fd63741 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,38 +17,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.sa.searchdbabstraction.util;
 
 public class SearchDbConstants {
-  public static final String SDB_FILESEP = (System.getProperty("file.separator") == null) ? "/"
-      : System.getProperty("file.separator");
-  public static final String SDB_BUNDLECONFIG_NAME =
-      (System.getProperty("BUNDLECONFIG_DIR") == null)
-          ? "bundleconfig" : System.getProperty("BUNDLECONFIG_DIR");
-
-  public static final String SDB_HOME_BUNDLECONFIG = (System.getProperty("AJSC_HOME") == null)
-      ? SDB_FILESEP + "opt" + SDB_FILESEP + "app" + SDB_FILESEP + "searchdb"
-        + SDB_FILESEP + SDB_BUNDLECONFIG_NAME
-      : System.getProperty("AJSC_HOME") + SDB_FILESEP + SDB_BUNDLECONFIG_NAME;
-
-  public static final String SDB_HOME_ETC =
-      SDB_HOME_BUNDLECONFIG + SDB_FILESEP + "etc" + SDB_FILESEP;
-  public static final String SDB_CONFIG_APP_LOCATION = SDB_HOME_ETC + "appprops" + SDB_FILESEP;
-
-  // Elastic Search related
-  public static final String SDB_SPECIFIC_CONFIG = (System.getProperty("CONFIG_HOME") == null)
-      ? SDB_CONFIG_APP_LOCATION : System.getProperty("CONFIG_HOME") + SDB_FILESEP;
-  public static final String ES_CONFIG_FILE = SDB_SPECIFIC_CONFIG + SDB_FILESEP
-      + "elastic-search.properties";
-  public static final String SDB_AUTH = SDB_SPECIFIC_CONFIG + "auth" + SDB_FILESEP;
-  public static final String SDB_AUTH_CONFIG_FILENAME = SDB_AUTH + "search_policy.json";
-  public static final String SDB_FILTER_CONFIG_FILE = SDB_SPECIFIC_CONFIG + "filter-config.json";
-  public static final String SDB_ANALYSIS_CONFIG_FILE =
-      SDB_SPECIFIC_CONFIG + "analysis-config.json";
-
-  // Logging related
-  public static final String SDB_SERVICE_NAME = "SearchDataService";
+
+    public static final String SDB_FILESEP =
+            (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
+    public static final String SDB_BUNDLECONFIG_NAME =
+            (System.getProperty("BUNDLECONFIG_DIR") == null) ? "bundleconfig" : System.getProperty("BUNDLECONFIG_DIR");
+
+    public static final String SDB_HOME_BUNDLECONFIG = (System.getProperty("AJSC_HOME") == null)
+            ? SDB_FILESEP + "opt" + SDB_FILESEP + "app" + SDB_FILESEP + "searchdb" + SDB_FILESEP + SDB_BUNDLECONFIG_NAME
+            : System.getProperty("AJSC_HOME") + SDB_FILESEP + SDB_BUNDLECONFIG_NAME;
+
+    public static final String SDB_HOME_ETC = SDB_HOME_BUNDLECONFIG + SDB_FILESEP + "etc" + SDB_FILESEP;
+    public static final String SDB_CONFIG_APP_LOCATION = SDB_HOME_ETC + "appprops" + SDB_FILESEP;
+
+    // Elastic Search related
+    public static final String SDB_SPECIFIC_CONFIG = (System.getProperty("CONFIG_HOME") == null)
+            ? SDB_CONFIG_APP_LOCATION : System.getProperty("CONFIG_HOME") + SDB_FILESEP;
+    public static final String ES_CONFIG_FILE = SDB_SPECIFIC_CONFIG + SDB_FILESEP + "elastic-search.properties";
+    public static final String SDB_AUTH = SDB_SPECIFIC_CONFIG + "auth" + SDB_FILESEP;
+    public static final String SDB_AUTH_CONFIG_FILENAME = SDB_AUTH + "search_policy.json";
+    public static final String SDB_FILTER_CONFIG_FILE = SDB_SPECIFIC_CONFIG + "filter-config.json";
+    public static final String SDB_ANALYSIS_CONFIG_FILE = SDB_SPECIFIC_CONFIG + "analysis-config.json";
+    public static final String SDB_SETTINGS_CONFIG_FILE = SDB_SPECIFIC_CONFIG + "settings-config.json";
+
+    // Logging related
+    public static final String SDB_SERVICE_NAME = "SearchDataService";
+
+    private SearchDbConstants() { // Do not instantiate
+    }
+
 }