java/code/src/com/redhat/rhn/common/db/NamedPreparedStatement.java | 51 +
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 261 +++++-----
java/code/src/com/redhat/rhn/common/db/datasource/CallableMode.java | 3
java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java | 28 -
java/code/src/com/redhat/rhn/common/db/datasource/RestartData.java | 105 ++++
java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java | 26
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 14
java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 122 ++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java | 19
9 files changed, 379 insertions(+), 250 deletions(-)
New commits:
commit a88943f36f68303a924dc62780f8631d1b8db600
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Nov 28 15:28:32 2012 -0500
Fixing a bunch of type-safety and checkstyle warnings
diff --git a/java/code/src/com/redhat/rhn/common/db/NamedPreparedStatement.java b/java/code/src/com/redhat/rhn/common/db/NamedPreparedStatement.java
index 6eb1a0c..e21b393 100644
--- a/java/code/src/com/redhat/rhn/common/db/NamedPreparedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/NamedPreparedStatement.java
@@ -73,7 +73,7 @@ public final class NamedPreparedStatement {
* @return a SQL statement that can be used with JDBC
*/
public static String replaceBindParams(String rawSQL,
- Map parameterMap) {
+ Map<String, List<Integer>> parameterMap) {
StringBuffer sql = new StringBuffer(rawSQL);
int idx = findColon(0, sql);
@@ -83,9 +83,9 @@ public final class NamedPreparedStatement {
String name = sql.substring(idx + 1, end).toLowerCase();
sql = sql.replace(idx, end, "?");
- List lst = (List)parameterMap.get(name);
+ List<Integer> lst = parameterMap.get(name);
if (lst == null) {
- lst = new ArrayList();
+ lst = new ArrayList<Integer>();
}
lst.add(new Integer(variableNumber));
parameterMap.put(name, lst);
@@ -107,8 +107,10 @@ public final class NamedPreparedStatement {
* @return true if CallableStatement executed without error, false otherwise.
* @throws RuntimeException in case of SQLException
*/
- public static boolean execute(CallableStatement cs, Map parameterMap,
- Map inParams, Map outParams) throws RuntimeException {
+ public static boolean execute(CallableStatement cs,
+ Map<String, List<Integer>> parameterMap,
+ Map<String, Object> inParams, Map<String, Integer> outParams)
+ throws RuntimeException {
try {
setVars(cs, parameterMap, inParams);
setOutputVars(cs, parameterMap, outParams);
@@ -131,8 +133,8 @@ public final class NamedPreparedStatement {
* @throws RuntimeException in case of SQLException
*/
public static boolean execute(PreparedStatement ps,
- Map parameterMap,
- Map parameters) {
+ Map<String, List<Integer>> parameterMap,
+ Map<String, Object> parameters) {
try {
setVars(ps, parameterMap, parameters);
return ps.execute();
@@ -162,26 +164,27 @@ public final class NamedPreparedStatement {
* @return The iterator for the list of data returned.
* @throws BindVariableNotFoundException couldn't find bind variable
*/
- public static Iterator getPositions(String name, Map parameterMap)
- throws BindVariableNotFoundException {
+ public static Iterator<Integer> getPositions(String name,
+ Map<String, List<Integer>> parameterMap)
+ throws BindVariableNotFoundException {
- List lst = (List)parameterMap.get(name.toLowerCase());
+ List<Integer> lst = parameterMap.get(name.toLowerCase());
if (lst == null) {
throw new BindVariableNotFoundException("Can't find variable: " +
- name);
+ name);
}
return lst.iterator();
}
- private static void setVars(PreparedStatement ps, Map parameterMap,
- Map map) {
- Iterator i = map.keySet().iterator();
+ private static void setVars(PreparedStatement ps,
+ Map<String, List<Integer>> parameterMap, Map<String, Object> map) {
+ Iterator<String> i = map.keySet().iterator();
while (i.hasNext()) {
- String name = (String)i.next();
- Iterator positions = getPositions(name, parameterMap);
+ String name = i.next();
+ Iterator<Integer> positions = getPositions(name, parameterMap);
while (positions.hasNext()) {
- Integer pos = (Integer)positions.next();
+ Integer pos = positions.next();
try {
Object value = map.get(name);
ps.setObject(pos.intValue(), value);
@@ -193,21 +196,21 @@ public final class NamedPreparedStatement {
}
}
- private static void setOutputVars(CallableStatement cs, Map parameterMap,
- Map map) {
- Iterator i = map.keySet().iterator();
+ private static void setOutputVars(CallableStatement cs,
+ Map<String, List<Integer>> parameterMap, Map<String, Integer> map) {
+ Iterator<String> i = map.keySet().iterator();
while (i.hasNext()) {
- String name = (String)i.next();
- Iterator positions = getPositions(name, parameterMap);
+ String name = i.next();
+ Iterator<Integer> positions = getPositions(name, parameterMap);
while (positions.hasNext()) {
- Integer pos = (Integer)positions.next();
+ Integer pos = positions.next();
try {
// JDBC sucks. It uses static int's instead of Integers
// to represent SQL types. So, we treat the values as
// Integers, and the caller is responsible for inserting
// the Integer object.
- Integer type = (Integer)map.get(name);
+ Integer type = map.get(name);
cs.registerOutParameter(pos.intValue(), type.intValue());
}
catch (SQLException e) {
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 0b49f62..714868e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -61,22 +61,22 @@ public class CachedStatement {
private static Logger log = Logger
.getLogger(CachedStatement.class);
static final int BATCH_SIZE = 500;
- private String alias;
- private String name;
+ private final String alias;
+ private final String name;
/** the original query, before the named bind parameters were removed. */
private String origQuery;
private String query;
private String column;
- private Map qMap;
- private List params;
- private List sortOptions;
+ private Map<String, List<Integer>> qMap;
+ private List<String> params;
+ private List<String> sortOptions;
private String defaultSort;
private String sortOrder;
private boolean multiple;
// This is only set if the current CachedStatement is a duplicate of an
// existing one with the %s expanded out.
private CachedStatement parentStatement;
- private List restartData = null;
+ private RestartData restartData = null;
// We could (and probably should) cache the ResultSet metadata here as
// well. There is no reason that the first call to each statement
@@ -90,8 +90,8 @@ public class CachedStatement {
public CachedStatement(String n, String a) {
name = n;
alias = a;
- params = new ArrayList();
- sortOptions = new ArrayList();
+ params = new ArrayList<String>();
+ sortOptions = new ArrayList<String>();
}
/**
@@ -125,8 +125,8 @@ public class CachedStatement {
this.column = new String(orig.column);
}
- this.params = new ArrayList(orig.params);
- this.sortOptions = new ArrayList(orig.sortOptions);
+ this.params = new ArrayList<String>(orig.params);
+ this.sortOptions = new ArrayList<String>(orig.sortOptions);
if (orig.defaultSort != null) {
this.defaultSort = new String(orig.defaultSort);
@@ -177,7 +177,7 @@ public class CachedStatement {
* @param q the query to set.
*/
public void setQuery(String q) {
- qMap = new HashMap();
+ qMap = new HashMap<String, List<Integer>>();
origQuery = q;
query = NamedPreparedStatement.replaceBindParams(q, qMap);
}
@@ -217,7 +217,7 @@ public class CachedStatement {
* Set the parameters.
* @param p the parameters to set.
*/
- public void setParams(List p) {
+ public void setParams(List<String> p) {
params.addAll(p);
}
@@ -239,7 +239,7 @@ public class CachedStatement {
* Set the parameters.
* @param p the parameters to set.
*/
- public void setSortOptions(List p) {
+ public void setSortOptions(List<String> p) {
sortOptions.addAll(p);
}
@@ -269,37 +269,40 @@ public class CachedStatement {
multiple = m;
}
- int executeUpdate(Map parameters) {
+ int executeUpdate(Map<String, Object> parameters) {
Integer res = (Integer)execute(query, qMap, parameters, null);
return res.intValue();
}
- int executeUpdate(Map parameters, List inClause) {
+ int executeUpdate(Map<String, Object> parameters, List<Object> inClause) {
Integer res = (Integer)execute(parameters, inClause, "", "", null);
return res.intValue();
}
- DataResult execute(Map parameters, Mode mode) {
+ DataResult<Object> execute(Map<String, Object> parameters, Mode mode) {
return execute(parameters, defaultSort, sortOrder, mode);
}
- DataResult execute(List parameters, Mode mode) {
- return (DataResult) execute(null, parameters, "", "", mode);
+ DataResult<Object> execute(List<Object> parameters, Mode mode) {
+ return (DataResult<Object>) execute(null, parameters, "", "", mode);
}
- DataResult execute(Map parameters, List inClause, Mode mode) {
- return (DataResult) execute(parameters, inClause, "", "", mode);
+ DataResult<Object> execute(Map<String, Object> parameters,
+ List<Object> inClause,
+ Mode mode) {
+ return (DataResult<Object>) execute(parameters, inClause, "", "", mode);
}
- Object execute(Map parameters, List inClause, String sortColumn,
- String order, Mode mode) {
+ Object execute(Map<String, Object> parameters, List<Object> inClause,
+ String sortColumn,
+ String order, Mode mode) {
if (query.indexOf("%o") > 0 && !sortOptions.contains(sortColumn)) {
throw new IllegalArgumentException("Sort Column, " + sortColumn +
- " invalid for query " + this);
+ " invalid for query " + this);
}
String finalQuery = query.replaceFirst("%o",
- sortColumn + " " + order);
+ sortColumn + " " + order);
if (query.indexOf("%s") > 0 &&
(inClause != null && !inClause.isEmpty())) {
@@ -339,14 +342,16 @@ public class CachedStatement {
return execute(finalQuery, qMap, parameters, mode);
}
- DataResult execute(Map parameters, String sortColumn,
- String order, Mode mode) {
- return (DataResult) execute(parameters, null, sortColumn, order, mode);
+ DataResult<Object> execute(Map<String, Object> parameters,
+ String sortColumn,
+ String order, Mode mode) {
+ return (DataResult<Object>) execute(parameters, null, sortColumn,
+ order, mode);
}
- Collection executeElaborator(List resultList, Mode mode,
- Map parametersIn) {
- List elaborated = new LinkedList();
+ Collection<Object> executeElaborator(List<Object> resultList, Mode mode,
+ Map<String, Object> parametersIn) {
+ List<Object> elaborated = new LinkedList<Object>();
for (int batch = 0; batch < resultList.size(); batch = batch + BATCH_SIZE) {
int toIndex = batch + BATCH_SIZE;
if (toIndex > resultList.size()) {
@@ -354,15 +359,17 @@ public class CachedStatement {
}
elaborated.addAll(
executeElaboratorBatch(resultList.subList(batch, toIndex),
- mode, parametersIn));
+ mode, parametersIn));
}
return elaborated;
}
- private Collection executeElaboratorBatch(List resultList, Mode mode,
- Map parametersIn) {
+ private Collection<Object> executeElaboratorBatch(List<Object> resultList,
+ Mode mode,
+ Map<String, Object> parametersIn) {
int len = resultList.size();
- Map parameters = new HashMap(parametersIn);
+ Map<String, Object> parameters = new HashMap<String, Object>(
+ parametersIn);
if (len == 0) {
// Nothing to elaborate, just return;
@@ -371,16 +378,16 @@ public class CachedStatement {
// If we aren't actually operating on a list, just elaborate.
if (origQuery.indexOf("%s") == -1) {
- return (DataResult)execute(query, qMap, parameters,
- mode, resultList);
+ return (DataResult<Object>) execute(query, qMap, parameters,
+ mode, resultList);
}
StringBuffer bindParams = new StringBuffer(":l0");
- List newParams = new ArrayList(params);
+ List<String> newParams = new ArrayList<String>(params);
if (!checkForColumn(resultList.get(0), column)) {
throw new MapColumnNotFoundException("Column, " + column +
- ", not found " +
- "in driving query results");
+ ", not found " +
+ "in driving query results");
}
parameters.put("l0", getKey(resultList.get(0), column));
@@ -409,16 +416,16 @@ public class CachedStatement {
return cs.executeElaboratorBatch(resultList, mode, parameters);
}
- private Map setupParamMap(Map parameters) {
+ private Map<String, Object> setupParamMap(Map<String, Object> parameters) {
if (parameters == null && !params.isEmpty()) {
throw new IllegalArgumentException("Query contains named parameter," +
" but value map is null");
}
// Only pass the parameters from the original query.
- HashMap intersection = new HashMap();
- Iterator i = params.iterator();
+ HashMap<String, Object> intersection = new HashMap<String, Object>();
+ Iterator<String> i = params.iterator();
while (i.hasNext()) {
- String curr = (String)i.next();
+ String curr = i.next();
if (!parameters.containsKey(curr)) {
throw new ParameterValueNotFoundException("Parameter '" + curr +
"' not given for query: " + query);
@@ -428,16 +435,16 @@ public class CachedStatement {
return intersection;
}
- private Object execute(String sql, Map parameterMap,
- Map parameters, Mode mode) {
- return execute(sql, parameterMap, parameters, mode, null);
+ private Object execute(String sql, Map<String, List<Integer>> parameterMap,
+ Map<String, Object> parameters, Mode mode) {
+ return execute(sql, parameterMap, parameters, mode, null);
}
// This isn't great, but I want to return either an integer count of the
// number of rows updated, or the DataResult. That can only be done by
// returning an Object and letting the caller do the casting for us.
- private Object execute(String sql, Map parameterMap,
- Map parameters, Mode mode, List dr) {
+ private Object execute(String sql, Map<String, List<Integer>> parameterMap,
+ Map<String, Object> parameters, Mode mode, List<Object> dr) {
storeForRestart(sql, parameterMap, parameters, mode, dr);
PreparedStatement ps = null;
try {
@@ -455,8 +462,8 @@ public class CachedStatement {
}
boolean returnType = NamedPreparedStatement.execute(ps,
- parameterMap,
- setupParamMap(parameters));
+ parameterMap,
+ setupParamMap(parameters));
if (log.isDebugEnabled()) {
log.debug("execute() - Return type: " + returnType);
}
@@ -470,7 +477,7 @@ public class CachedStatement {
}
catch (HibernateException he) {
throw new
- HibernateRuntimeException(
+ HibernateRuntimeException(
"HibernateException executing CachedStatement", he);
}
@@ -484,17 +491,19 @@ public class CachedStatement {
}
}
- private Map processOutputParams(CallableStatement cs, Map outParams)
- throws SQLException {
+ private Map<String, Object> processOutputParams(CallableStatement cs,
+ Map<String, Integer> outParams)
+ throws SQLException {
- Iterator i = outParams.keySet().iterator();
- Map result = new HashMap();
+ Iterator<String> i = outParams.keySet().iterator();
+ Map<String, Object> result = new HashMap<String, Object>();
while (i.hasNext()) {
- String param = (String)i.next();
- Iterator positions = NamedPreparedStatement.getPositions(param, qMap);
+ String param = i.next();
+ Iterator<Integer> positions = NamedPreparedStatement.getPositions(
+ param, qMap);
// For now assume that we only specify each output parameter once,
// to do otherwise just doesn't make a lot of sense.
- Integer pos = (Integer)positions.next();
+ Integer pos = positions.next();
Object o = cs.getObject(pos.intValue());
if (o instanceof BigDecimal) {
o = new Long(((BigDecimal)o).longValue());
@@ -504,7 +513,8 @@ public class CachedStatement {
return result;
}
- Map executeCallable(Map inParams, Map outParams) {
+ Map<String, Object> executeCallable(Map<String, Object> inParams,
+ Map<String, Integer> outParams) {
CallableStatement cs = null;
try {
Connection conn = stealConnection();
@@ -513,7 +523,7 @@ public class CachedStatement {
// Do we need to check the return code? The original code in
// ConnInvocHandler didn't, but I'm not sure that is correct. rbb
NamedPreparedStatement.execute(cs, qMap, inParams,
- outParams);
+ outParams);
return processOutputParams(cs, outParams);
}
catch (SQLException e) {
@@ -521,7 +531,7 @@ public class CachedStatement {
}
catch (HibernateException he) {
throw new
- HibernateRuntimeException(
+ HibernateRuntimeException(
"HibernateException executing CachedStatement", he);
}
@@ -530,28 +540,28 @@ public class CachedStatement {
}
}
- private DataResult processResultSet(ResultSet rs, SelectMode mode,
- List currentResults) {
+ private DataResult<Object> processResultSet(ResultSet rs, SelectMode mode,
+ List<Object> currentResults) {
- Map pointers = null;
- DataResult dr;
+ Map<Object, Integer> pointers = null;
+ DataResult<Object> dr;
if (currentResults != null) {
pointers = generatePointers(currentResults, getColumn());
- dr = new DataResult(currentResults);
+ dr = new DataResult<Object>(currentResults);
}
else {
- dr = new DataResult(mode);
+ dr = new DataResult<Object>(mode);
}
String className = mode.getClassString();
try {
// Get the column names from the result set.
- List columns = getColumnNames(rs.getMetaData());
+ List<String> columns = getColumnNames(rs.getMetaData());
if (currentResults != null &&
- !columns.contains(getColumn().toLowerCase())) {
+ !columns.contains(getColumn().toLowerCase())) {
// This is ugly, but we check driving query results someplace
// else, so this is only executed if we are elaborating.
throw new MapColumnNotFoundException("Column, " + column +
- ", not found in elaborator results");
+ ", not found in elaborator results");
}
// loop through the results, adding them to the displayMap
@@ -560,12 +570,12 @@ public class CachedStatement {
* If no className was specified *or* if the caller wants a Map
*/
if (className == null || className.equals("java.util.Map")) {
- Map resultMap;
+ Map<String, Object> resultMap;
if (pointers == null) {
- resultMap = new HashMap();
+ resultMap = new HashMap<String, Object>();
}
else {
- Integer pos = (Integer)pointers.get(getObject(rs, getColumn()));
+ Integer pos = pointers.get(getObject(rs, getColumn()));
/* TODO: there is a possible bug here. If the elaborator does
* not restrict itself to only the current results (%s thing),
* then the pos here is null, because the object might not
@@ -573,10 +583,11 @@ public class CachedStatement {
* Decide if this is a bug here or a bug with the query that
* allows such effect. Decide what to do about it.
*/
- resultMap = (Map)currentResults.get(pos.intValue());
+ resultMap = (Map<String, Object>) currentResults
+ .get(pos.intValue());
}
addToMap(columns, rs, resultMap,
- mode.getElaborators().indexOf(parentStatement));
+ mode.getElaborators().indexOf(parentStatement));
// bug 141664: Don't add to the DataResult if we are
// elaborating the data.
@@ -588,17 +599,17 @@ public class CachedStatement {
* Otherwise, try to set the results to the class given.
*/
else {
- Class clazz = Class.forName(className);
+ Class<?> clazz = Class.forName(className);
Object obj;
if (pointers == null) {
obj = clazz.newInstance();
}
else {
- Integer pos = (Integer)pointers.get(getObject(rs, getColumn()));
+ Integer pos = pointers.get(getObject(rs, getColumn()));
if (pos == null) {
// possible mismatch on elaborator ids
throw new IllegalArgumentException("Null elab match for " +
- getColumn() + " " + getObject(rs, getColumn()));
+ getColumn() + " " + getObject(rs, getColumn()));
}
obj = currentResults.get(pos.intValue());
}
@@ -630,27 +641,29 @@ public class CachedStatement {
}
catch (ClassNotFoundException e) {
throw new ObjectCreateWrapperException("Could not create " +
- className, e);
+ className, e);
}
catch (InstantiationException e) {
throw new ObjectCreateWrapperException("Could not create " +
- className, e);
+ className, e);
}
catch (IllegalAccessException e) {
throw new ObjectCreateWrapperException("Could not create " +
- className, e);
+ className, e);
}
finally {
HibernateHelper.cleanupDB(rs);
}
}
- private void addToMap(List columns, ResultSet rs, Map resultMap, int pos)
- throws SQLException {
- Map newMap = new HashMap();
- Iterator i = columns.iterator();
+ private void addToMap(List<String> columns, ResultSet rs,
+ Map<String, Object> resultMap,
+ int pos)
+ throws SQLException {
+ Map<String, Object> newMap = new HashMap<String, Object>();
+ Iterator<String> i = columns.iterator();
while (i.hasNext()) {
- String columnName = (String)i.next();
+ String columnName = i.next();
newMap.put(columnName.toLowerCase(),
getObject(rs, columnName));
}
@@ -673,12 +686,12 @@ public class CachedStatement {
stmtName = "elaborator" + pos;
}
if (multiple) {
- List newList = null;
+ List<Object> newList = null;
if (resultMap.containsKey(stmtName)) {
- newList = (List)resultMap.get(stmtName);
+ newList = (List<Object>) resultMap.get(stmtName);
}
else {
- newList = new ArrayList();
+ newList = new ArrayList<Object>();
}
newList.add(newMap);
resultMap.put(stmtName, newList);
@@ -689,10 +702,11 @@ public class CachedStatement {
}
}
- private void addToObject(List columns, ResultSet rs, Object obj, boolean elaborator)
- throws SQLException {
+ private void addToObject(List<String> columns, ResultSet rs, Object obj,
+ boolean elaborator)
+ throws SQLException {
- List columnSkip;
+ List<String> columnSkip;
if (elaborator && obj instanceof RowCallback) {
RowCallback cb = (RowCallback)obj;
cb.callback(rs);
@@ -702,9 +716,9 @@ public class CachedStatement {
columnSkip = new ArrayList<String>();
}
- Iterator i = columns.iterator();
+ Iterator<String> i = columns.iterator();
while (i.hasNext()) {
- String columnName = (String)i.next();
+ String columnName = i.next();
if (columnSkip.contains(columnName.toLowerCase())) {
continue;
}
@@ -724,7 +738,7 @@ public class CachedStatement {
//getName() gets the name of the set method
//setName is the name of the set method
if (methods[j].getName().equals(setName)) {
- Class paramType = methods[j].getParameterTypes()[0];
+ Class<?> paramType = methods[j].getParameterTypes()[0];
if (Collection.class.isAssignableFrom(paramType)) {
isList = true;
}
@@ -733,10 +747,11 @@ public class CachedStatement {
}
if (isList) { //requires matching get method returning the same list
- Collection c = (Collection)MethodUtil.callMethod(obj,
- getName, new Object[0]);
+ Collection<Object> c = (Collection<Object>) MethodUtil
+ .callMethod(obj,
+ getName, new Object[0]);
if (c == null) {
- c = new ArrayList();
+ c = new ArrayList<Object>();
}
c.add(getObject(rs, columnName));
MethodUtil.callMethod(obj, setName, c);
@@ -777,9 +792,12 @@ public class CachedStatement {
// this : August 23, 2005 12:00:00 AM PDT
// vs the real date: August 23, 2005 1:36:12 PM PDT
if (columnValue instanceof Date ||
- ("oracle.sql.TIMESTAMPLTZ".equals(columnValue.getClass().getCanonicalName())) ||
- ("oracle.sql.TIMESTAMP".equals(columnValue.getClass().getCanonicalName())) ||
- ("oracle.sql.TIMESTAMPTZ".equals(columnValue.getClass().getCanonicalName()))) {
+ ("oracle.sql.TIMESTAMPLTZ".equals(columnValue.getClass()
+ .getCanonicalName())) ||
+ ("oracle.sql.TIMESTAMP".equals(columnValue.getClass()
+ .getCanonicalName())) ||
+ ("oracle.sql.TIMESTAMPTZ".equals(columnValue.getClass()
+ .getCanonicalName()))) {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
return rs.getTimestamp(columnName, cal);
}
@@ -788,9 +806,10 @@ public class CachedStatement {
}
return columnValue;
}
- private List getColumnNames(ResultSetMetaData rsmd) {
+
+ private List<String> getColumnNames(ResultSetMetaData rsmd) {
try {
- ArrayList columns = new ArrayList();
+ ArrayList<String> columns = new ArrayList<String>();
int count = rsmd.getColumnCount();
for (int i = 1; i <= count; i++) {
@@ -805,9 +824,9 @@ public class CachedStatement {
private boolean checkForColumn(Object obj, String key) {
if (obj instanceof Map) {
- return ((Map)obj).containsKey(key);
+ return ((Map<String, Object>) obj).containsKey(key);
}
- Class clazz = obj.getClass();
+ Class<?> clazz = obj.getClass();
Method[] methods = clazz.getMethods();
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(StringUtil.beanify("get " + key))) {
@@ -819,7 +838,7 @@ public class CachedStatement {
private Object getKey(Object obj, String key) {
if (obj instanceof Map) {
- return ((Map)obj).get(key);
+ return ((Map<String, Object>) obj).get(key);
}
Object keyData = MethodUtil.callMethod(obj,
StringUtil.beanify("get " + key),
@@ -827,17 +846,18 @@ public class CachedStatement {
return keyData;
}
- private Map generatePointers(List dr, String key) {
+ private Map<Object, Integer> generatePointers(List<Object> dr, String key) {
- Iterator i = dr.iterator();
+ Iterator<Object> i = dr.iterator();
int pos = 0;
- Map pointers = new HashMap();
+ Map<Object, Integer> pointers = new HashMap<Object, Integer>();
while (i.hasNext()) {
Object row = i.next();
if (row instanceof Map) {
- pointers.put(((Map)row).get(key), new Integer(pos));
+ pointers.put(((Map<String, Object>) row).get(key), new Integer(
+ pos));
}
else {
Object keyData = MethodUtil.callMethod(row,
@@ -866,14 +886,10 @@ public class CachedStatement {
return conn;
}
- private void storeForRestart(String sql, Map parameterMap,
- Map parameters, Mode mode, List dr) {
- restartData = new ArrayList();
- restartData.add(sql);
- restartData.add(parameterMap);
- restartData.add(parameters);
- restartData.add(mode);
- restartData.add(dr);
+ private void storeForRestart(String sql,
+ Map<String, List<Integer>> parameterMap,
+ Map<String, Object> parameters, Mode mode, List<Object> dr) {
+ restartData = new RestartData(sql, parameterMap, parameters, mode, dr);
}
/**
@@ -881,12 +897,9 @@ public class CachedStatement {
* @return what the previous query returned or null.
*/
public Object restartQuery() {
- return restartData == null ? null :
- execute((String) restartData.get(0),
- (Map) restartData.get(1),
- (Map) restartData.get(2),
- (Mode) restartData.get(3),
- (List) restartData.get(4));
+ return restartData == null ? null : execute(restartData.getSql(),
+ restartData.getParameterMap(), restartData.getParameters(),
+ restartData.getMode(), restartData.getDr());
}
}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CallableMode.java b/java/code/src/com/redhat/rhn/common/db/datasource/CallableMode.java
index 3029196..72299a5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CallableMode.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CallableMode.java
@@ -30,7 +30,8 @@ public class CallableMode extends BaseMode {
* @param outParams A map of parameter names to SQL Type
* @return A map of all result parameters to the result value
*/
- public Map execute(Map inParams, Map outParams) {
+ public Map<String, Object> execute(Map<String, Object> inParams,
+ Map<String, Integer> outParams) {
return getQuery().executeCallable(inParams, outParams);
}
}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java b/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
index e12a78a..eb2698f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
@@ -42,13 +42,13 @@ public class DataResult<T> extends ArrayList<T> {
private CharacterMap index;
private String filterData;
private boolean filter;
- private Map elabParams;
+ private Map<String, Object> elabParams;
/**
* Create a new DataResult object
* @param dr The Mode that created this DataResult
*/
- protected DataResult(DataResult dr) {
+ protected DataResult(DataResult<T> dr) {
super(dr);
mode = dr.getMode();
start = dr.getStart();
@@ -74,7 +74,7 @@ public class DataResult<T> extends ArrayList<T> {
* @param l The list to add
* @param m The Mode that created this DataResult
*/
- protected DataResult(Collection l, Mode m) {
+ protected DataResult(Collection<T> l, Mode m) {
super(l);
mode = (SelectMode)m;
}
@@ -85,7 +85,7 @@ public class DataResult<T> extends ArrayList<T> {
* short lists Hibernate Objects
* @param l Collection of Objects you want in the Result
*/
- public DataResult(Collection l) {
+ public DataResult(Collection<T> l) {
this(l, null);
this.setTotalSize(l.size());
start = 1;
@@ -101,6 +101,7 @@ public class DataResult<T> extends ArrayList<T> {
}
/** {@inheritDoc} */
+ @Override
public DataResult<T> subList(int fromIndex, int toIndex) {
int last = toIndex;
@@ -113,11 +114,11 @@ public class DataResult<T> extends ArrayList<T> {
fromIndex = last - 1;
}
if (fromIndex == -1) {
- return new DataResult(mode);
+ return new DataResult<T>(mode);
}
- List temp = super.subList(fromIndex, last);
- DataResult dr = new DataResult(temp, mode);
+ List<T> temp = super.subList(fromIndex, last);
+ DataResult<T> dr = new DataResult<T>(temp, mode);
dr.start = fromIndex + 1;
dr.end = toIndex;
dr.totalSize = this.getTotalSize();
@@ -143,7 +144,7 @@ public class DataResult<T> extends ArrayList<T> {
* key. This will execute all elaborators.
* @param values The values to bind to the BindParameters
*/
- public void elaborate(Map values) {
+ public void elaborate(Map<String, Object> values) {
elabParams = values;
if (mode != null) {
mode.elaborate(this, values);
@@ -170,14 +171,14 @@ public class DataResult<T> extends ArrayList<T> {
* cycle.
*/
public Elaborator getElaborator() {
- return new ModeElaborator(mode, elabParams);
+ return new ModeElaborator(mode, elabParams);
}
/**
* Return the parameters that were passed into the last call to elaborate()
* @return Map of elaboration values
*/
- public Map getElaborationParams() {
+ public Map<String, Object> getElaborationParams() {
return elabParams;
}
@@ -189,7 +190,7 @@ public class DataResult<T> extends ArrayList<T> {
* @param values name/value pairs used to elaborate the query
*
*/
- public void setElaborationParams(Map values) {
+ public void setElaborationParams(Map<String, Object> values) {
elabParams = values;
}
@@ -296,9 +297,10 @@ public class DataResult<T> extends ArrayList<T> {
}
/** {@inheritDoc} */
+ @Override
public String toString() {
return "{Start: " + start + " End: " + end + " Total: " + totalSize +
- super.toString() + "}";
+ super.toString() + "}";
}
/**
@@ -306,7 +308,7 @@ public class DataResult<T> extends ArrayList<T> {
* @param dr data result to add
* @return if data resule was changed
*/
- public boolean addDataResult(DataResult dr) {
+ public boolean addDataResult(DataResult<T> dr) {
boolean changed = super.addAll(dr);
totalSize += dr.size();
end += dr.size();
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/RestartData.java b/java/code/src/com/redhat/rhn/common/db/datasource/RestartData.java
new file mode 100644
index 0000000..a60a66d
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/RestartData.java
@@ -0,0 +1,105 @@
+package com.redhat.rhn.common.db.datasource;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An object that stores data needed for a sql query so that it can be
+ * restarted if necessary.
+ * @author sherr
+ */
+public class RestartData {
+ private String sql;
+ private Map<String, List<Integer>> parameterMap;
+ private Map<String, Object> parameters;
+ private Mode mode;
+ private List<Object> dr;
+
+ /**
+ * Create a RestartData for a query
+ * @param sqlIn the sql to execute
+ * @param parameterMapIn the parameter map
+ * @param parametersIn the parameters
+ * @param modeIn the mode
+ * @param drIn the dr
+ */
+ public RestartData(String sqlIn, Map<String, List<Integer>> parameterMapIn,
+ Map<String, Object> parametersIn, Mode modeIn, List<Object> drIn) {
+ this.sql = sqlIn;
+ this.parameterMap = parameterMapIn;
+ this.parameters = parametersIn;
+ this.mode = modeIn;
+ this.dr = drIn;
+ }
+
+ /**
+ * @return the sql
+ */
+ public String getSql() {
+ return sql;
+ }
+
+ /**
+ * @param sqlIn the sql to set
+ */
+ public void setSql(String sqlIn) {
+ this.sql = sqlIn;
+ }
+
+ /**
+ * @return the parameterMap
+ */
+ public Map<String, List<Integer>> getParameterMap() {
+ return parameterMap;
+ }
+
+ /**
+ * @param parameterMapIn the parameterMap to set
+ */
+ public void setParameterMap(Map<String, List<Integer>> parameterMapIn) {
+ this.parameterMap = parameterMapIn;
+ }
+
+ /**
+ * @return the parameters
+ */
+ public Map<String, Object> getParameters() {
+ return parameters;
+ }
+
+ /**
+ * @param parametersIn the parameters to set
+ */
+ public void setParameters(Map<String, Object> parametersIn) {
+ this.parameters = parametersIn;
+ }
+
+ /**
+ * @return the mode
+ */
+ public Mode getMode() {
+ return mode;
+ }
+
+ /**
+ * @param modeIn the mode to set
+ */
+ public void setMode(Mode modeIn) {
+ this.mode = modeIn;
+ }
+
+ /**
+ * @return the dr
+ */
+ public List<Object> getDr() {
+ return dr;
+ }
+
+ /**
+ * @param drIn the dr to set
+ */
+ public void setDr(List<Object> drIn) {
+ this.dr = drIn;
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java b/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
index 53e8ad4..98aadcc 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
@@ -29,7 +29,7 @@ import java.util.Map;
public class SelectMode extends BaseMode implements Serializable {
private String clazz;
- private List elaborators;
+ private List<CachedStatement> elaborators;
private int maxRows;
// increase this number on any data change
@@ -41,7 +41,7 @@ public class SelectMode extends BaseMode implements Serializable {
/** Constructs a new SelectMode */
public SelectMode() {
- elaborators = new ArrayList();
+ elaborators = new ArrayList<CachedStatement>();
}
/**
@@ -51,7 +51,8 @@ public class SelectMode extends BaseMode implements Serializable {
public SelectMode(SelectMode modeIn) {
if (modeIn != null) {
this.clazz = modeIn.getClassString();
- this.elaborators = new ArrayList(modeIn.getElaborators());
+ this.elaborators = new ArrayList<CachedStatement>(
+ modeIn.getElaborators());
setName(modeIn.getName());
setQuery(new CachedStatement(modeIn.getQuery()));
}
@@ -85,7 +86,7 @@ public class SelectMode extends BaseMode implements Serializable {
* Returns the list of elaborator queries.
* @return List of elaborator queries.
*/
- public List getElaborators() {
+ public List<CachedStatement> getElaborators() {
return elaborators;
}
@@ -138,10 +139,10 @@ public class SelectMode extends BaseMode implements Serializable {
while (subStart < inClause.size()) {
int subLength = subStart + CachedStatement.BATCH_SIZE >= inClause.size() ?
inClause.size() - subStart : CachedStatement.BATCH_SIZE;
- List subClause = inClause.subList(subStart, subStart + subLength);
- DataResult subDr = getQuery().execute(parameters, subClause, this);
- toReturn.addDataResult(subDr);
- subStart += subLength;
+ List subClause = inClause.subList(subStart, subStart + subLength);
+ DataResult subDr = getQuery().execute(parameters, subClause, this);
+ toReturn.addDataResult(subDr);
+ subStart += subLength;
}
return toReturn;
}
@@ -155,23 +156,24 @@ public class SelectMode extends BaseMode implements Serializable {
*/
public void elaborate(List resultList, Map parameters) {
// find the requested elaborator.
- Iterator i = elaborators.iterator();
+ Iterator<CachedStatement> i = elaborators.iterator();
CachedStatement cs = null;
while (i.hasNext()) {
- cs = (CachedStatement)i.next();
+ cs = i.next();
Collection elaborated = cs.executeElaborator(resultList, this,
- parameters);
+ parameters);
resultList.clear();
resultList.addAll(elaborated);
}
}
/** {@inheritDoc} */
+ @Override
public String toString() {
String str = super.toString();
return str +
- " # of elaborators: " + elaborators.size() + " ]";
+ " # of elaborators: " + elaborators.size() + " ]";
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
index a08968b..1af1752 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
@@ -95,11 +95,11 @@ public class OrgFactory extends HibernateFactory {
}
}
- Map in = new HashMap();
+ Map<String, Object> in = new HashMap<String, Object>();
in.put("org_id", oid);
CallableMode m = ModeFactory.getCallableMode(
"Org_queries", "delete_organization");
- m.execute(in, new HashMap());
+ m.execute(in, new HashMap<String, Integer>());
}
/**
@@ -186,8 +186,8 @@ public class OrgFactory extends HibernateFactory {
CallableMode m = ModeFactory.getCallableMode("General_queries",
"create_org");
- Map inParams = new HashMap();
- Map outParams = new HashMap();
+ Map<String, Object> inParams = new HashMap<String, Object>();
+ Map<String, Integer> outParams = new HashMap<String, Integer>();
inParams.put("name", org.getName());
// password is currently required as an input to the create_new_org
@@ -195,7 +195,7 @@ public class OrgFactory extends HibernateFactory {
inParams.put("password", org.getName());
outParams.put("org_id", new Integer(Types.NUMERIC));
- Map row = m.execute(inParams, outParams);
+ Map<String, Object> row = m.execute(inParams, outParams);
// Get the out params
Org retval = lookupById((Long) row.get("org_id"));
@@ -302,7 +302,7 @@ public class OrgFactory extends HibernateFactory {
SelectMode m = ModeFactory.getMode("General_queries",
"activation_keys_for_org");
- Map params = new HashMap();
+ Map<String, Long> params = new HashMap<String, Long>();
params.put("org_id", orgIn.getId());
DataList keys = DataList.getDataList(m, params, Collections.EMPTY_MAP);
return new Long(keys.size());
@@ -316,7 +316,7 @@ public class OrgFactory extends HibernateFactory {
public static Long getKickstarts(Org orgIn) {
SelectMode m = ModeFactory.getMode("General_queries",
"kickstarts_for_org");
- Map params = new HashMap();
+ Map<String, Long> params = new HashMap<String, Long>();
params.put("org_id", orgIn.getId());
DataList kickstarts = DataList.getDataList(m, params, Collections.EMPTY_MAP);
return new Long(kickstarts.size());
diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
index 68a0fa7..8d207d4 100644
--- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
@@ -61,8 +61,8 @@ public class UserFactory extends HibernateFactory {
private static List timeZoneList;
private static final Role[] IMPLIEDROLESARRAY = {RoleFactory.CHANNEL_ADMIN,
- RoleFactory.CONFIG_ADMIN, RoleFactory.SYSTEM_GROUP_ADMIN,
- RoleFactory.ACTIVATION_KEY_ADMIN, RoleFactory.MONITORING_ADMIN};
+ RoleFactory.CONFIG_ADMIN, RoleFactory.SYSTEM_GROUP_ADMIN,
+ RoleFactory.ACTIVATION_KEY_ADMIN, RoleFactory.MONITORING_ADMIN};
/** List of Role objects that are applied if you are an Org_admin */
public static final List <Role> IMPLIEDROLES = Arrays.asList(IMPLIEDROLESARRAY);
@@ -84,10 +84,10 @@ public class UserFactory extends HibernateFactory {
private static State loadState(String label) {
Session session = HibernateFactory.getSession();
State state = (State) session.getNamedQuery("UserState.lookupByLabel")
- .setParameter("label", label)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ .setParameter("label", label)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
return state;
}
@@ -100,10 +100,10 @@ public class UserFactory extends HibernateFactory {
public static User findResponsibleUser(Long orgId, Role r) {
Session session = HibernateFactory.getSession();
Iterator itr = session.getNamedQuery("User.findResponsibleUser")
- .setParameter("org_id", orgId)
- .setParameter("type_id", r.getId())
- //Retrieve from cache if there
- .list().iterator();
+ .setParameter("org_id", orgId)
+ .setParameter("type_id", r.getId())
+ //Retrieve from cache if there
+ .list().iterator();
if (itr.hasNext()) {
// only care about the first one
Object[] row = (Object[])itr.next();
@@ -123,21 +123,22 @@ public class UserFactory extends HibernateFactory {
public static User findRandomOrgAdmin(Org orgIn) {
Role r = RoleFactory.ORG_ADMIN;
Session session = HibernateFactory.getSession();
- Iterator itr = session.getNamedQuery("User.findRandomOrgAdmin")
- .setParameter("org_id", orgIn.getId())
- .setParameter("type_id", r.getId())
- //Retrieve from cache if there
- .list().iterator();
+ Iterator<Long> itr = session.getNamedQuery("User.findRandomOrgAdmin")
+ .setParameter("org_id", orgIn.getId())
+ .setParameter("type_id", r.getId())
+ //Retrieve from cache if there
+ .list().iterator();
if (itr.hasNext()) {
// only care about the first one
- return UserFactory.lookupById((Long)itr.next());
+ return UserFactory.lookupById(itr.next());
}
return null;
}
/** Get the Logger for the derived class so log messages
- * show up on the correct class
- */
+ * show up on the correct class
+ */
+ @Override
protected Logger getLogger() {
return log;
}
@@ -190,7 +191,7 @@ public class UserFactory extends HibernateFactory {
* @param ids the ids to lookup for
* @return the list of com.redhat.rhn.domain.User objects found
*/
- public static List lookupByIds(Collection<Long> ids) {
+ public static List<User> lookupByIds(Collection<Long> ids) {
if (ids.size() < 1000) {
return realLookupByIds(ids);
}
@@ -214,7 +215,7 @@ public class UserFactory extends HibernateFactory {
private static List<User> realLookupByIds(Collection<Long> ids) {
Session session = HibernateFactory.getSession();
Query query = session.getNamedQuery("User.findByIds")
- .setParameterList("userIds", ids);
+ .setParameterList("userIds", ids);
return query.list();
}
@@ -226,11 +227,11 @@ public class UserFactory extends HibernateFactory {
* @return the user found
*/
public static User lookupById(User user, Long id) {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("uid", id);
params.put("orgId", user.getOrg().getId());
User returnedUser = (User)getInstance().lookupObjectByNamedQuery(
- "User.findByIdandOrgId", params);
+ "User.findByIdandOrgId", params);
if (returnedUser == null || !user.getOrg().equals(returnedUser.getOrg())) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e = new LookupException("Could not find user " + id);
@@ -248,10 +249,10 @@ public class UserFactory extends HibernateFactory {
* @return the User found
*/
public static User lookupByLogin(String login) {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put(LOGIN_UC, login.toUpperCase());
User user = (User)getInstance()
- .lookupObjectByNamedQuery("User.findByLogin", params);
+ .lookupObjectByNamedQuery("User.findByLogin", params);
if (user == null) {
LocalizationService ls = LocalizationService.getInstance();
@@ -271,11 +272,11 @@ public class UserFactory extends HibernateFactory {
* @return the User found
*/
public static User lookupByLogin(User user, String login) {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put(LOGIN_UC, login.toUpperCase());
params.put("orgId", user.getOrg().getId());
User returnedUser = (User)getInstance().lookupObjectByNamedQuery(
- "User.findByLoginAndOrgId", params);
+ "User.findByLoginAndOrgId", params);
if (returnedUser == null) {
LocalizationService ls = LocalizationService.getInstance();
@@ -320,12 +321,12 @@ public class UserFactory extends HibernateFactory {
* @return Returns true if the user is disabled
*/
public static boolean isDisabled(User user) {
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put("user", user);
List <StateChange> changes = getInstance().
- listObjectsByNamedQuery("StateChanges.lookupByUserId", params);
+ listObjectsByNamedQuery("StateChanges.lookupByUserId", params);
return changes != null && !changes.isEmpty() &&
- DISABLED.equals(changes.get(0).getState());
+ DISABLED.equals(changes.get(0).getState());
}
@@ -352,8 +353,8 @@ public class UserFactory extends HibernateFactory {
}
// save the user
CallableMode m = ModeFactory.getCallableMode("User_queries", "create_new_user");
- Map inParams = new HashMap();
- Map outParams = new HashMap();
+ Map<String, Object> inParams = new HashMap<String, Object>();
+ Map<String, Integer> outParams = new HashMap<String, Integer>();
// Can't add the orgId to the object until the User has been
// successfully added to the DB. Doing so will mean that if
@@ -390,7 +391,7 @@ public class UserFactory extends HibernateFactory {
inParams.put("contEmail", "N");
outParams.put("userId", new Integer(Types.NUMERIC));
- Map result = m.execute(inParams, outParams);
+ Map<String, Object> result = m.execute(inParams, outParams);
Org org = OrgFactory.lookupById(orgId);
if (org != null) {
@@ -443,7 +444,7 @@ public class UserFactory extends HibernateFactory {
Boolean wasOrgAdmin = uimpl.wasOrgAdmin();
if (wasOrgAdmin != null) {
orgAdminChanged =
- usr.hasRole(RoleFactory.ORG_ADMIN) != wasOrgAdmin.booleanValue();
+ usr.hasRole(RoleFactory.ORG_ADMIN) != wasOrgAdmin.booleanValue();
}
if (orgAdminChanged) {
@@ -458,10 +459,10 @@ public class UserFactory extends HibernateFactory {
*/
public void syncServerGroupPerms(User usr) {
CallableMode m = ModeFactory.getCallableMode("User_queries",
- "update_perms_for_user");
- Map inParams = new HashMap();
+ "update_perms_for_user");
+ Map<String, Object> inParams = new HashMap<String, Object>();
inParams.put("user_id", usr.getId());
- m.execute(inParams, new HashMap());
+ m.execute(inParams, new HashMap<String, Integer>());
}
@@ -474,10 +475,10 @@ public class UserFactory extends HibernateFactory {
public static RhnTimeZone getTimeZone(int id) {
Session session = HibernateFactory.getSession();
return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTimeZoneById")
- .setInteger("tid", id)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ .setInteger("tid", id)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
}
/**
@@ -488,11 +489,11 @@ public class UserFactory extends HibernateFactory {
public static RhnTimeZone getTimeZone(String olsonName) {
Session session = HibernateFactory.getSession();
return (RhnTimeZone) session
- .getNamedQuery("RhnTimeZone.loadTimeZoneByOlsonName")
- .setString("ton", olsonName)
- //Retrieve from cache if there
- .setCacheable(true)
- .uniqueResult();
+ .getNamedQuery("RhnTimeZone.loadTimeZoneByOlsonName")
+ .setString("ton", olsonName)
+ //Retrieve from cache if there
+ .setCacheable(true)
+ .uniqueResult();
}
/**
@@ -509,7 +510,7 @@ public class UserFactory extends HibernateFactory {
*/
public static List lookupAllTimeZones() {
//timeZoneList is manually cached because instance variable is properly sorted
- //whereas the database is not.
+ //whereas the database is not.
if (timeZoneList == null) {
List timeZones = null; //temporary holding place until sorted
Session session = HibernateFactory.getSession();
@@ -521,12 +522,13 @@ public class UserFactory extends HibernateFactory {
//All other timezones are sorted West to East based on raw off-set.
if (timeZones != null) {
Collections.sort(timeZones, new Comparator() {
+ @Override
public int compare(Object o1, Object o2) {
int offSet1 = ((RhnTimeZone)o1).getTimeZone().getRawOffset();
int offSet2 = ((RhnTimeZone)o2).getTimeZone().getRawOffset();
if (offSet1 <= -18000000 && offSet1 >= -36000000 &&
- offSet2 <= -18000000 && offSet2 >= -36000000) {
+ offSet2 <= -18000000 && offSet2 >= -36000000) {
//both in America
return offSet2 - offSet1;
}
@@ -543,10 +545,10 @@ public class UserFactory extends HibernateFactory {
return offSet1 - offSet2;
}
}
- );
+ );
}
- timeZoneList = timeZones;
+ timeZoneList = timeZones;
}
return timeZoneList;
}
@@ -595,7 +597,7 @@ public class UserFactory extends HibernateFactory {
*/
public static boolean satelliteHasUsers() {
SelectMode m = ModeFactory.getMode("User_queries", "user_count");
- DataResult dr = m.execute(new HashMap());
+ DataResult dr = m.execute(new HashMap<String, Object>());
Map row = (Map) dr.get(0);
Long count = (Long) row.get("user_count");
return (count.longValue() > 0);
@@ -618,8 +620,8 @@ public class UserFactory extends HibernateFactory {
* @return UserServerPreference that corresponds to the parameters
*/
public UserServerPreference lookupServerPreferenceByUserServerAndName(User user,
- Server server,
- String name) {
+ Server server,
+ String name) {
UserServerPreferenceId id = new UserServerPreferenceId(user, server, name);
Session session = HibernateFactory.getSession();
return (UserServerPreference) session.get(UserServerPreference.class, id);
@@ -634,15 +636,15 @@ public class UserFactory extends HibernateFactory {
* @param value true if the preference should be true, false otherwise
*/
public void setUserServerPreferenceValue(User user,
- Server server,
- String preferenceName,
- boolean value) {
+ Server server,
+ String preferenceName,
+ boolean value) {
Session session = HibernateFactory.getSession();
UserServerPreferenceId id = new UserServerPreferenceId(user,
- server,
- preferenceName);
+ server,
+ preferenceName);
UserServerPreference usp = (UserServerPreference)
- session.get(UserServerPreference.class, id);
+ session.get(UserServerPreference.class, id);
/* Here, we delete the preference's entry if it should be true.
* We would hopefully be ok setting the value to "1," but I'm emulating
@@ -696,8 +698,8 @@ public class UserFactory extends HibernateFactory {
public static void deleteUser(Long userId) {
CallableMode m = ModeFactory.getCallableMode("User_queries",
"delete_user");
- Map inParams = new HashMap();
- Map outParams = new HashMap();
+ Map<String, Object> inParams = new HashMap<String, Object>();
+ Map<String, Integer> outParams = new HashMap<String, Integer>();
inParams.put("user_id", userId);
m.execute(inParams, outParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
index c193f35..2366516 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
@@ -50,11 +50,12 @@ public class DeleteChannelAction extends RhnAction {
private static final String DISABLE_DELETE = "disableDelete";
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping actionMapping,
- ActionForm actionForm,
- HttpServletRequest request,
- HttpServletResponse response)
- throws Exception {
+ ActionForm actionForm,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
RequestContext context = new RequestContext(request);
User user = context.getLoggedInUser();
@@ -68,14 +69,14 @@ public class DeleteChannelAction extends RhnAction {
// The channel doesn't carry its subscribed system count, so add this separately
int subscribedSystemsCount =
- SystemManager.countSystemsSubscribedToChannel(channelId, user);
+ SystemManager.countSystemsSubscribedToChannel(channelId, user);
request.setAttribute("subscribedSystemsCount", subscribedSystemsCount);
// Load the number of systems subscribed through a trust relationship to
// the channel
int trustedSystemsCount =
- SystemManager.countSubscribedToChannelWithoutOrg(channel.getOrg().getId(),
- channelId);
+ SystemManager.countSubscribedToChannelWithoutOrg(channel.getOrg().getId(),
+ channelId);
request.setAttribute("trustedSystemsCount", trustedSystemsCount);
if (context.isSubmitted()) {
@@ -107,8 +108,8 @@ public class DeleteChannelAction extends RhnAction {
Map params = new HashMap();
params.put("selected_channel", "all_managed_packages");
params.put("forwarded", "true");
- return getStrutsDelegate().forwardParams(actionMapping.findForward("delete"),
- params);
+ return getStrutsDelegate().forwardParams(
+ actionMapping.findForward("delete"), params);
}
return actionMapping.findForward("success");
}