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=1171895b177eac55c80b2e2448cd54a6fdd97ffc;hb=15af66b115f3e8046b2d0f2634fb77b3d835f730;hp=bd7d58b3f5dbdc0787aed26e4adb232d4035863b;hpb=71393bb2bf9fb10962723e61cf0e70d9aa202645;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 bd7d58b..1171895 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
@@ -21,37 +21,32 @@
 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;
+    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";
+    // 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_HOME_SEARCHCONFIG = (System.getProperty("app.config") == null)
-//          ?  System.getProperty("user.dir") + SDB_FILESEP + "config" + SDB_FILESEP + "searchdb"
-//          + SDB_FILESEP + "elastic-search.properties"
-//          : System.getProperty("app.config") + SDB_FILESEP + "searchdb" + SDB_FILESEP + "elastic-search.properties";
+    // public static final String SDB_HOME_SEARCHCONFIG = (System.getProperty("app.config") == null)
+    // ? System.getProperty("user.dir") + SDB_FILESEP + "config" + SDB_FILESEP + "searchdb"
+    // + SDB_FILESEP + "elastic-search.properties"
+    // : System.getProperty("app.config") + SDB_FILESEP + "searchdb" + SDB_FILESEP + "elastic-search.properties";
 
-  // Logging related
-  public static final String SDB_SERVICE_NAME = "SearchDataService";
+    // Logging related
+    public static final String SDB_SERVICE_NAME = "SearchDataService";
 }