renames class DBConn -> DbConnArgs

data-discovery/src/main/java/common/DBConn.java → data-discovery/src/main/java/search/DbConnArgs.java

 
-class DBConn
+class DbConnArgs
 {
    public String uri;
    public String schema;

data-discovery/src/main/java/search/DbPSearch.java

@@ -24,12 +24,12 @@ import vo.parameter.*;
 public class DbPSearch
 {
    private static final Logger LOGGER = Logger.getLogger(DbPSearch.class.getName());
-   private DBConn dbConn;
+   private DbConnArgs dbConnArgs;
 
 
-   DbPSearch(DBConn dbConn)
+   DbPSearch(DbConnArgs dbConnArgs)
    {
-      this.dbConn = dbConn;
+      this.dbConnArgs = dbConnArgs;
    }
 
 
@@ -143,11 +143,11 @@ public class DbPSearch
 
       List<String> pubdidList = new ArrayList<>();
 
-      LOGGER.fine("Connecting to: " + dbConn.uri()
-            + " with optional user/pwd: " + dbConn.userName() +" / "+ dbConn.password() );
+      LOGGER.fine("Connecting to: " + dbConnArgs.uri()
+            + " with optional user/pwd: " + dbConnArgs.userName() +" / "+ dbConnArgs.password() );
 
       try( 
-            Connection conn = DriverManager.getConnection(dbConn.uri(), dbConn.userName(), dbConn.password());
+            Connection conn = DriverManager.getConnection(dbConnArgs.uri(), dbConnArgs.userName(), dbConnArgs.password());
             Statement  st   = conn.createStatement();
             ResultSet  res  = st.executeQuery(theQuery);)
       {
@@ -222,10 +222,10 @@ public class DbPSearch
 
       List<ObsCore> obsCoreList = new ArrayList<>();
 
-      LOGGER.fine("Connecting to: " + dbConn.uri()
-            + " with optional user/pwd: " + dbConn.userName() +" / "+ dbConn.password() );
+      LOGGER.fine("Connecting to: " + dbConnArgs.uri()
+            + " with optional user/pwd: " + dbConnArgs.userName() +" / "+ dbConnArgs.password() );
       try( 
-            Connection conn = DriverManager.getConnection(dbConn.uri(), dbConn.userName(), dbConn.password());
+            Connection conn = DriverManager.getConnection(dbConnArgs.uri(), dbConnArgs.userName(), dbConnArgs.password());
             Statement  st   = conn.createStatement();
             ResultSet  res  = st.executeQuery(theQuery);)
       {

data-discovery/src/main/java/webapi/SearchServlet.java

@@ -31,7 +31,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
 
    public void init() throws ServletException
    {
-      LOGGER.config("DB: " + settings.dbConn.toString());
+      LOGGER.config("DB: " + settings.dbConnArgs.toString());
    }
 
    protected void doGet(HttpServletRequest request, HttpServletResponse response)
@@ -81,7 +81,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
          DbPSearch dbps;
          synchronized(DbPSearch.class)
          {
-            dbps = new DbPSearch(settings.dbConn);
+            dbps = new DbPSearch(settings.dbConnArgs);
          }
          String[] pubdidArr = dbps.queryOverlapingPubdid(qArgs);
 
@@ -100,7 +100,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
 
             FormatResponseWrapper responseWrapper = (FormatResponseWrapper) response;
             responseWrapper.setPubdidArr(pubdidArr);
-            responseWrapper.setDBConn(settings.dbConn);
+            responseWrapper.setDbConnArgs(settings.dbConnArgs);
          }
          else
          {

data-discovery/src/main/java/webapi/SearchSettings.java

@@ -17,9 +17,9 @@ class SearchSettings
             Properties properties = new Properties();
             properties.load(ins);
 
-            DBConn dbConn = loadDBConn(properties);
+            DbConnArgs dbConnArgs = loadDbConnArgs(properties);
 
-            return new SearchSettings(dbConn);
+            return new SearchSettings(dbConnArgs);
          }
          else
          {
@@ -33,26 +33,26 @@ class SearchSettings
       }
    }
 
-   private static DBConn loadDBConn(Properties properties)
+   private static DbConnArgs loadDbConnArgs(Properties properties)
    {
-      DBConn dbConn = new DBConn();
-      dbConn.uri       = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip();
-      dbConn.schema    = properties.getProperty("db_schema","ivoa").strip();
-      dbConn.user_name = properties.getProperty("db_user_name","").strip();
-      dbConn.password  = properties.getProperty("db_password","").strip();
+      DbConnArgs dbConnArgs = new DbConnArgs();
+      dbConnArgs.uri       = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip();
+      dbConnArgs.schema    = properties.getProperty("db_schema","ivoa").strip();
+      dbConnArgs.user_name = properties.getProperty("db_user_name","").strip();
+      dbConnArgs.password  = properties.getProperty("db_password","").strip();
 
-      return dbConn;
+      return dbConnArgs;
    }
 
 
    // instance; separate classes allow grouping of settings
-   // DBConn - db_*
+   // DbConnArgs - db_*
 
-   public DBConn dbConn;
+   public DbConnArgs dbConnArgs;
 
-   private SearchSettings(DBConn dbConn)
+   private SearchSettings(DbConnArgs dbConnArgs)
    {
-      this.dbConn = dbConn;
+      this.dbConnArgs = dbConnArgs;
    }
 
 }

data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java

@@ -64,7 +64,7 @@ public class FormatResponseFilter implements Filter
             Pos  pos  = Pos.parsePos(params, DEFAULT_SKY_SYSTEM);
             Band band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM);
 
-            DbPSearch.ObsCore[] obsCoreArr = queryObsCore(responseWrapper.getDBConn(), pubdidArr, pos, band);
+            DbPSearch.ObsCore[] obsCoreArr = queryObsCore(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);
 
             String respFormat;
             String respFormatReq[] = params.get("RESPONSEFORMAT");
@@ -150,7 +150,7 @@ public class FormatResponseFilter implements Filter
    }
 
 
-   private DbPSearch.ObsCore[] queryObsCore(DBConn dbConn, String[] pubdidArr, Pos pos, Band band)
+   private DbPSearch.ObsCore[] queryObsCore(DbConnArgs dbConnArgs, String[] pubdidArr, Pos pos, Band band)
          throws Exception
       {
 
@@ -159,7 +159,7 @@ public class FormatResponseFilter implements Filter
          DbPSearch dbps;
          synchronized(DbPSearch.class)
          {
-            dbps = new DbPSearch(dbConn);
+            dbps = new DbPSearch(dbConnArgs);
          }
 
          return dbps.queryOutputData(pubdidArr, pos, band);

data-discovery/src/main/java/webapi/formatfilter/FormatResponseWrapper.java

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
 class FormatResponseWrapper extends HttpServletResponseWrapper
 {
    private String[]   pubdidArr;
-   private DBConn   dbConn;
+   private DbConnArgs dbConnArgs;
 
    public FormatResponseWrapper(HttpServletResponse response)
    {
@@ -16,7 +16,7 @@ class FormatResponseWrapper extends HttpServletResponseWrapper
    public void     setPubdidArr(String[] pubdidArr) { this.pubdidArr = pubdidArr; }
    public String[] getPubdidArr() { return this.pubdidArr; }
 
-   public void   setDBConn(DBConn dbConn) { this.dbConn = dbConn; }
-   public DBConn getDBConn() { return this.dbConn; }
+   public void   setDbConnArgs(DbConnArgs dbConnArgs) { this.dbConnArgs = dbConnArgs; }
+   public DbConnArgs getDbConnArgs() { return this.dbConnArgs; }
 }