diff --git a/data-discovery/src/main/java/common/DBConn.java b/data-discovery/src/main/java/search/DbConnArgs.java
similarity index 95%
rename from data-discovery/src/main/java/common/DBConn.java
rename to data-discovery/src/main/java/search/DbConnArgs.java
index 6175bf2125011a8df66d141a5b1c7ce4e2ad86e0..2063db26af89fc2bceda9fd89504311a146af0f3 100644
--- a/data-discovery/src/main/java/common/DBConn.java
+++ b/data-discovery/src/main/java/search/DbConnArgs.java
@@ -1,5 +1,5 @@
-class DBConn
+class DbConnArgs
{
public String uri;
public String schema;
diff --git a/data-discovery/src/main/java/search/DbPSearch.java b/data-discovery/src/main/java/search/DbPSearch.java
index 429e833ed3e7fe55917bd8e499879c5783393ce4..681835e1eae2a7a8225a18b25bf50abd612e520e 100644
--- a/data-discovery/src/main/java/search/DbPSearch.java
+++ b/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);)
{
diff --git a/data-discovery/src/main/java/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java
index e4e83c516bf586d1b23acfcb41bba2afc4dfa1f0..7b0b49c55c0f0a3fd7dfaf6af544241d8311b03b 100644
--- a/data-discovery/src/main/java/webapi/SearchServlet.java
+++ b/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
{
diff --git a/data-discovery/src/main/java/webapi/SearchSettings.java b/data-discovery/src/main/java/webapi/SearchSettings.java
index 16a73c2660adc2d2f48df334c61b67153bdcaf77..cff18dc2786fa56fbb6a48d11525d3201f0285a9 100644
--- a/data-discovery/src/main/java/webapi/SearchSettings.java
+++ b/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;
}
}
diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
index 64199e6a92eef9202002f829d40f78564136e33f..c6b5dfc3e054f56dc9856ac4cf750805a5ebe1ed 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
+++ b/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);
diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseWrapper.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseWrapper.java
index 1104ded1e34b5965216412baa42c6d316d77f22f..396f4cef2d635071fdeb2762f09739c6b9033ca5 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseWrapper.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseWrapper.java
@@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletResponseWrapper;
class FormatResponseWrapper extends HttpServletResponseWrapper
{
- private String[] pubdidArr;
- private DBConn dbConn;
+ private String[] pubdidArr;
+ 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; }
}