search-server/spacewalk-search/build.xml
| 5 +
search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
| 12 +--
search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
| 31 +++++++---
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java
| 4 -
search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java
| 4 -
search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
| 4 -
search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java
| 6 -
search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java
| 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java
| 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java
| 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java
| 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java
| 2
12 files changed, 47 insertions(+), 29 deletions(-)
New commits:
commit 3702f261e2cb90fff66f9af9d62a2728529e6ebc
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Oct 24 14:23:12 2013 +0200
Unchecked conversion removed in rhnsearch
Also change in build so in future this will be enforced by compiler.
diff --git a/search-server/spacewalk-search/build.xml
b/search-server/spacewalk-search/build.xml
index 70c7717..b830a0d 100644
--- a/search-server/spacewalk-search/build.xml
+++ b/search-server/spacewalk-search/build.xml
@@ -157,7 +157,10 @@
destdir="${build.dir}"
deprecation="on"
excludesfile="buildconf/exclude"
- debug="on" />
+ debug="on">
+ <compilerarg value="-Xlint:unchecked" />
+ <compilerarg value="-Werror" />
+ </javac>
<copy todir="${build.dir}/com/redhat/satellite/search/db">
<fileset
dir="${config.src.dir}/com/redhat/satellite/search/db/">
<include name="*.xml" />
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
index 562ce09..9e1c2a1 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
@@ -96,18 +96,16 @@ public class Configuration {
private List<KeyTranslator> translators;
/** set of configuration file names */
- private TreeSet<File> fileList = new TreeSet<File>(new Comparator() {
+ private TreeSet<File> fileList = new TreeSet<File>(new
Comparator<File>() {
/** {inheritDoc} */
- public int compare(Object o1, Object o2) {
+ public int compare(File f1, File f2) {
// Need to make sure we read the child namespace before the base
// namespace. To do that, we sort the list in reverse order based
// on the length of the file name. If two filenames have the same
// length, then we need to do a lexigraphical comparison to make
// sure that the filenames themselves are different.
- File f1 = (File) o1;
- File f2 = (File) o2;
int lenDif = f2.getAbsolutePath().length() - f1.getAbsolutePath().length();
if (lenDif != 0) {
@@ -226,7 +224,7 @@ public class Configuration {
*/
public Map<String, String> getMap(String name) {
String value = getString(name);
- Map retval = null;
+ Map<String,String> retval = null;
if (value != null) {
retval = new HashMap<String, String>();
String[] pairs = value.split(",");
@@ -365,8 +363,8 @@ public class Configuration {
* @param name config entry name
* @return instance of java.util.List populated with config values
*/
- public List getList(String name) {
- List retval = new LinkedList();
+ public List<String> getList(String name) {
+ List<String> retval = new LinkedList<String>();
String[] vals = getStringArray(name);
if (vals != null) {
retval.addAll(Arrays.asList(vals));
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java
index 85bac6c..ce409bd 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java
@@ -36,7 +36,7 @@ public class MatchingField {
protected Document doc;
protected Object[] terms;
protected String query;
- protected Map needNumberToolsAdjust;
+ protected Map<String, Boolean> needNumberToolsAdjust;
/**
*
@@ -53,7 +53,7 @@ public class MatchingField {
else {
terms = new Term[0];
}
- needNumberToolsAdjust = new HashMap();
+ needNumberToolsAdjust = new HashMap<String, Boolean>();
needNumberToolsAdjust.put("cpuMHz", true);
needNumberToolsAdjust.put("cpuBogoMIPS", true);
needNumberToolsAdjust.put("cpuMHz", true);
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java
index 15a41be..376de7f 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java
@@ -145,7 +145,7 @@ public class DatabaseHandler {
index = index + delim.length() - 1; // We want to be pointed to end of location
of
// delim
String[] temps = queryIn.substring(index + delim.length() - 1,
indexB).split(",");
- Map params = new HashMap<String, String>();
+ Map<String, Object> params = new HashMap<String, Object>();
for (int i = 0; i < temps.length; i++) {
params.put("param" + new Integer(i).toString(), temps[i].trim());
}
@@ -164,7 +164,7 @@ public class DatabaseHandler {
throws SQLException, SqlMapException {
// Look up Query in DB
args.put("sessionId", sessionId);
- Query query = databaseManager.getQuery(queryName);
+ Query<Result> query = databaseManager.getQuery(queryName);
List<Result> retval;
try {
retval = query.loadList(args);
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
index 8f856ea..26c26f7 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
@@ -196,7 +196,7 @@ public class IndexHandler {
if (log.isDebugEnabled()) {
log.debug("NO HITS FOUND");
}
- return Collections.EMPTY_LIST;
+ return Collections.<Result>emptyList();
}
List<Long> ids = new ArrayList<Long>();
for (Result pr : hits) {
@@ -219,7 +219,7 @@ public class IndexHandler {
return hits;
}
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("session_id", sessionId);
params.put("id_list", ids);
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java
index 1c4d382..f997ed8 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java
@@ -105,7 +105,7 @@ public abstract class GenericIndexTask implements Job {
WriteQuery insertQuery =
databaseManager.getWriterQuery(getQueryCreateLastRecord());
try {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("id", sid);
params.put("last_modified", Calendar.getInstance().getTime());
@@ -180,7 +180,7 @@ public abstract class GenericIndexTask implements Job {
Query<GenericRecord> srvrQuery = databaseManager.getQuery(
getQueryRecordsToIndex());
try {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("id", sid);
params.put("last_modified", lastRun);
log.info("GenericIndexTask<" + super.getClass().toString() +
@@ -216,7 +216,7 @@ public abstract class GenericIndexTask implements Job {
log.info("Skipping the handleDeletedRecords() method");
return 0;
}
- idSet = new HashSet();
+ idSet = new HashSet<String>();
for (Long num : ids) {
idSet.add(num.toString());
}
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java
index 0eb2d47..69d8999 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexErrataTask.java
@@ -92,7 +92,7 @@ public class IndexErrataTask implements Job {
WriteQuery insertQuery =
databaseManager.getWriterQuery("createLastErrata");
try {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("id", eid);
params.put("last_modified", Calendar.getInstance().getTime());
if (updateQuery.update(params) == 0) {
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java
index 7d81691..6434c2d 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexPackagesTask.java
@@ -116,7 +116,7 @@ public class IndexPackagesTask implements Job {
WriteQuery updateQuery =
databaseManager.getWriterQuery("updateLastPackage");
WriteQuery insertQuery =
databaseManager.getWriterQuery("createLastPackage");
try {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("id", packageId);
params.put("last_modified", Calendar.getInstance().getTime());
if (updateQuery.update(params) == 0) {
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java
index f9236c2..32d7af8 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java
@@ -60,7 +60,7 @@ public class IndexServerCustomInfoTask extends GenericIndexTask {
log.info("Skipping the handleDeletedRecords() method");
return 0;
}
- idSet = new HashSet();
+ idSet = new HashSet<String>();
for (ServerCustomInfo scInfo : ids) {
idSet.add(scInfo.getUniqId());
}
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java
index ba27ac2..f729d7e 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexErrataTaskTest.java
@@ -53,7 +53,7 @@ public class IndexErrataTaskTest extends BaseTestCase {
DatabaseManager databaseManager = (DatabaseManager)
container.getComponentInstanceOfType(DatabaseManager.class);
WriteQuery updateQuery =
databaseManager.getWriterQuery("updateLastErrata");
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("id", 0L);
params.put("last_modified", new Date(0));
updateQuery.update(params);
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java
index b8e35dd..252b113 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/tests/IndexSystemsTaskTest.java
@@ -53,7 +53,7 @@ public class IndexSystemsTaskTest extends BaseTestCase {
DatabaseManager databaseManager = (DatabaseManager)
container.getComponentInstanceOfType(DatabaseManager.class);
WriteQuery updateQuery =
databaseManager.getWriterQuery("updateLastServer");
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("id", 0L);
params.put("last_modified", new Date(0));
updateQuery.update(params);
commit b59805075c45e0d03156b48d76c4e9fb9b4c46d9
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Oct 21 22:46:25 2013 +0200
1020952 - SSL for Postgresql: Java (rhn-search)
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
index e68d9c9..269b3ed 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
@@ -15,6 +15,7 @@
package com.redhat.satellite.search.db;
+import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +27,7 @@ import com.ibatis.sqlmap.client.SqlMapClient;
import com.ibatis.sqlmap.client.SqlMapClientBuilder;
import com.ibatis.sqlmap.client.SqlMapSession;
import com.redhat.satellite.search.config.Configuration;
+import com.redhat.satellite.search.config.ConfigException;
/**
* Manages DB activity - connections, running queries, etc
@@ -67,13 +69,28 @@ public class DatabaseManager {
if (config.getString("db_backend").equals("oracle")) {
overrides.setProperty("db_name", "@" +
overrides.getProperty("db_name"));
} else {
- String db_host = config.getString("db_host");
- String db_port = config.getString("db_port");
- if (db_host != null && db_host.length() > 0) {
- if (db_port != null && db_port.length() > 0) {
- overrides.setProperty("db_name", "//" + db_host +
":" + db_port + "/" + overrides.getProperty("db_name"));
- } else {
- overrides.setProperty("db_name", "//" + db_host +
"/" + overrides.getProperty("db_name"));
+ String dbHost = config.getString("db_host");
+ String dbPort = config.getString("db_port");
+ if (dbHost != null && dbHost.length() > 0) {
+ String connectionUrl = "//" + dbHost;
+ if (dbPort != null && dbPort.length() > 0) {
+ connectionUrl += ":" + dbPort;
+ }
+ connectionUrl += "/" +
overrides.getProperty("db_name");
+
+ String sslmode = config.getString("db_sslmode");
+ if (sslmode != null && sslmode.equals("verify-full"))
{
+ connectionUrl += "?ssl=true";
+ String trustStore =
config.getString("java.ssl_truststore");
+ if (trustStore == null || ! new File(trustStore).isFile()) {
+ throw new ConfigException("Can not find java truststore at
" +
+ trustStore + ". Path can be changed with
java.ssl_truststore option.");
+ }
+ System.setProperty("javax.net.ssl.trustStore",
trustStore);
+ }
+ else if (sslmode != null) {
+ throw new ConfigException(
+ "Unsuported value for db_sslmode. Only 'verify-full'
is supported.");
}
}
}