java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java | 3 - java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 2 java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java | 7 +- java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 10 ++-- java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java | 16 +++--- java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java | 13 ++--- java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java | 3 - java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java | 13 ++--- java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java | 10 ++-- java/code/src/com/redhat/rhn/common/util/CharacterMap.java | 3 - java/code/src/com/redhat/rhn/common/util/DatePicker.java | 2 java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java | 3 - java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java | 3 - java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java | 3 - java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java | 5 +- java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java | 5 +- java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java | 10 ++-- java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java | 5 +- java/code/src/com/redhat/rhn/frontend/action/SearchAction.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 4 - java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java | 3 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java | 5 +- java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java | 5 +- java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java | 3 - java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java | 6 +- java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java | 3 - java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 5 +- java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 3 - java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 8 +-- java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 24 +++++----- java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java | 3 - java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java | 15 +++--- java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java | 3 - java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java | 21 ++++---- java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java | 12 ++--- java/code/src/com/redhat/rhn/testing/ForwardWrapper.java | 3 - java/code/src/org/cobbler/test/MockConnection.java | 6 +- 47 files changed, 153 insertions(+), 131 deletions(-)
New commits: commit 64ecb3f882bb4c946d903539f1933cd7aa9340de Author: Matej Kollar mkollar@redhat.com Date: Wed Aug 28 18:13:54 2013 +0200
Using Map instead of HashMap where possible
diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java b/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java index c7b6fcd..9401fb3 100644 --- a/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java +++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/EnforcementDoclet.java @@ -24,6 +24,7 @@ import java.io.InvalidObjectException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map;
/** @@ -44,7 +45,7 @@ public class EnforcementDoclet { }
- private static HashMap<String, List<String>> exceptions = + private static Map<String, List<String>> exceptions = new HashMap<String, List<String>>();
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 c174f0e..d8a1269 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 @@ -425,7 +425,7 @@ public class CachedStatement implements Serializable { " but value map is null"); } // Only pass the parameters from the original query. - HashMap<String, Object> intersection = new HashMap<String, Object>(); + Map<String, Object> intersection = new HashMap<String, Object>(); Iterator<String> i = params.iterator(); while (i.hasNext()) { String curr = i.next(); diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java b/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java index 1d773fe..b2113d1 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/DataSourceParserHelper.java @@ -22,6 +22,7 @@ import org.xml.sax.SAXException; import java.util.HashMap; import java.util.Iterator; import java.util.ListIterator; +import java.util.Map;
/** * A contentHandler that knows how to parse the DataSource XML files. @@ -37,8 +38,8 @@ class DataSourceParserHelper implements ContentHandler { private static final int MODE_AFTER_QUERY = 4; private static final int IN_ELABORATOR = 5;
- private HashMap internal_queries; - private HashMap modes; + private Map internal_queries; + private Map modes; private Mode m; private CachedStatement q; private int state; @@ -57,7 +58,7 @@ class DataSourceParserHelper implements ContentHandler { * Get the modes Map * @return the modes map. */ - public HashMap getModes() { + public Map getModes() { return modes; }
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java index 1a04cf7..5de2473 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java @@ -70,7 +70,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
private void lookup(String foobar, int id, int size) { SelectMode m = ModeFactory.getMode("test_queries", "find_in_table"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("foobar", foobar); params.put("id", new Integer(id)); DataResult<AdvDataSourceDto> dr = m.execute(params); @@ -83,7 +83,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
private void insert(String foobar, int id) throws Exception { WriteMode m = ModeFactory.getWriteMode("test_queries", "insert_into_table"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("foobar", foobar); params.put("id", Integer.valueOf(id)); params.put("test_column", "test-" + TestUtils.randomString()); @@ -187,7 +187,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase { // Take nothing for granted, make sure the data is there. lookup("Blarg", 1, 1); WriteMode m = ModeFactory.getWriteMode("test_queries", "delete_from_table"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("foobar", "Blarg"); assertEquals(1, m.executeUpdate(params)); // Close our Session so we test to make sure it @@ -200,7 +200,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase { insert("update_test", 4);
WriteMode m = ModeFactory.getWriteMode("test_queries", "update_in_table"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("foobar", "after_update"); params.put("id", new Integer(4)); int res = m.executeUpdate(params); @@ -218,7 +218,7 @@ public class AdvDataSourceTest extends RhnBaseTestCase { insert("update_multi_test", 5);
WriteMode m = ModeFactory.getWriteMode("test_queries", "update_in_table"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("foobar", "after_update_multi"); params.put("id", new Integer(5)); int res = m.executeUpdate(params); diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java index 7df0890..fd00cfd 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java @@ -90,7 +90,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { Iterator i = dr.iterator(); int pos = 0; while (i.hasNext()) { - HashMap hm = (HashMap)i.next(); + Map hm = (Map)i.next(); String name = (String)hm.get("username");
if (name.toLowerCase().equals(db_user)) { @@ -99,7 +99,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { pos++; }
- HashMap parameters = new HashMap(); + Map parameters = new HashMap(); parameters.put("user_name", db_user); dr.elaborate(parameters); assertNotNull(dr); @@ -122,7 +122,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { Iterator i = dr.iterator(); int pos = 0; while (i.hasNext()) { - HashMap hm = (HashMap)i.next(); + Map hm = (Map)i.next(); String name = (String)hm.get("username");
if (name.toLowerCase().equals(db_user)) { @@ -131,7 +131,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { pos++; }
- HashMap parameters = new HashMap(); + Map parameters = new HashMap(); parameters.put("user_name", db_user); dr.elaborate(parameters); assertNotNull(dr); @@ -262,7 +262,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { SelectMode m = ModeFactory.getMode("test_queries", "all_tables" + db_sufix); assertNotNull(m);
- HashMap params = new HashMap(); + Map params = new HashMap(); params.put("foo", "bar"); DataResult dr = m.execute(params); assertNotNull(dr); @@ -273,7 +273,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { db_sufix); assertNotNull(m);
- HashMap hm = new HashMap(); + Map hm = new HashMap(); hm.put("username", db_user); DataResult dr = m.execute(hm); assertNotNull(dr); @@ -371,7 +371,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
public void testExternalQuery() throws Exception { SelectMode m = ModeFactory.getMode("System_queries", "visible_to_uid"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("formvar_uid", new Long(12345)); DataResult dr = m.execute(params); assertEquals(m, dr.getMode()); @@ -416,7 +416,7 @@ public class DataSourceParserTest extends RhnBaseTestCase { SelectMode m = ModeFactory.getMode("test_queries", "user_class" + db_sufix); String clazz = m.getClassString(); assertEquals("com.redhat.rhn.common.db.datasource.test.UserData", clazz); - HashMap hm = new HashMap(); + Map hm = new HashMap(); hm.put("username", db_user); DataResult dr = m.execute(hm); assertNotNull(dr); diff --git a/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java b/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java index f72f89a..2a9ebf0 100644 --- a/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java +++ b/java/code/src/com/redhat/rhn/common/db/test/NamedPreparedStatementTest.java @@ -24,6 +24,7 @@ import org.hibernate.Session; import java.sql.PreparedStatement; import java.util.HashMap; import java.util.List; +import java.util.Map;
public class NamedPreparedStatementTest extends RhnBaseTestCase {
@@ -87,7 +88,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testColonInQuotes() throws Exception { String jdbcQuery; - HashMap pMap = new HashMap(); + Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(COLON_IN_QUOTES, pMap); @@ -99,7 +100,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testCreateSQL() throws Exception { String jdbcQuery; - HashMap pMap = new HashMap(); + Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(SIMPLE_QUERY, pMap); @@ -113,7 +114,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
public void testPrepare() throws Exception { String jdbcQuery; - HashMap pMap = new HashMap(); + Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(SIMPLE_QUERY, pMap); @@ -130,7 +131,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase { public void testTwoBindPrepare() throws Exception { List lst; String jdbcQuery; - HashMap pMap = new HashMap(); + Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(TWO_VAR_QUERY, pMap); @@ -153,7 +154,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase { public void testNotFoundBindParam() throws Exception { List lst; String jdbcQuery; - HashMap pMap = new HashMap(); + Map pMap = new HashMap();
jdbcQuery = NamedPreparedStatement.replaceBindParams(TWO_VAR_QUERY, pMap); @@ -172,7 +173,7 @@ public class NamedPreparedStatementTest extends RhnBaseTestCase {
PreparedStatement ps = session.connection().prepareStatement(jdbcQuery);
- HashMap parameters = new HashMap(); + Map parameters = new HashMap(); parameters.put("BAD_DATA", "GARBAGE"); try { NamedPreparedStatement.execute(ps, pMap, parameters); diff --git a/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java b/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java index 581f081..9170023 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java +++ b/java/code/src/com/redhat/rhn/common/messaging/test/TestDBAction.java @@ -22,6 +22,7 @@ import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.testing.TestUtils;
import java.util.HashMap; +import java.util.Map;
public class TestDBAction implements MessageAction {
@@ -44,7 +45,7 @@ public class TestDBAction implements MessageAction { public void execute(EventMessage msg) { TestDBEventMessage tm = (TestDBEventMessage) msg; System.out.println("Execute .."); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("data", tm.getTestString()); DataResult dr = TestUtils.runTestQuery("select_test_time_series", params); diff --git a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java index f1ff0a3..d2ddd63 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java @@ -21,7 +21,6 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.user.UserManager;
-import java.util.HashMap; import java.util.Map; import java.util.Set;
@@ -75,7 +74,7 @@ public class ChannelAclHandler extends BaseHandler { * @return true if allowed, false else */ public boolean aclUserCanAdminChannel(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Channel chan = getChannel(usr, ctxMap); if (chan != null) { @@ -91,7 +90,7 @@ public class ChannelAclHandler extends BaseHandler { * @return true if allowed, false else */ public boolean aclOrgChannelSetting(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Channel chan = getChannel(usr, ctxMap); if (chan != null) { @@ -124,7 +123,7 @@ public class ChannelAclHandler extends BaseHandler { return false; }
- HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Channel chan = getChannel(usr, ctxMap); String archType = chan.getChannelArch().getArchType().getLabel(); @@ -138,7 +137,7 @@ public class ChannelAclHandler extends BaseHandler { * @return true if allowed, false else */ public boolean aclChannelPackagingType(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Channel chan = getChannel(usr, ctxMap); String archType = chan.getChannelArch().getArchType().getLabel(); @@ -152,7 +151,7 @@ public class ChannelAclHandler extends BaseHandler { * @return true if allowed, false else */ public boolean aclChannelSubscribable(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Channel chan = getChannel(usr, ctxMap);
@@ -179,7 +178,7 @@ public class ChannelAclHandler extends BaseHandler { * @return true if channel-vers is RHEL5, false else */ public boolean aclIsRhel5(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Channel chan = getChannel(usr, ctxMap); if (chan != null) { diff --git a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java index 656c71c..009b52a 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java @@ -22,7 +22,7 @@ import com.redhat.rhn.frontend.struts.RequestContext;
import org.apache.commons.lang.StringUtils;
-import java.util.HashMap; +import java.util.Map;
/** @@ -56,7 +56,7 @@ public class KickstartAclHandler extends BaseHandler { * @return true if a raw format, false else */ public boolean aclIsKsRaw(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); KickstartData ks = getKickstart(usr, params); if (ks != null) { @@ -72,7 +72,7 @@ public class KickstartAclHandler extends BaseHandler { * @return true if a wizard format, false else */ public boolean aclIsKsNotRaw(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); KickstartData ks = getKickstart(usr, params); if (ks == null) { @@ -90,7 +90,7 @@ public class KickstartAclHandler extends BaseHandler { * to cobbler */ public boolean aclTreeIsSynced(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Long id = getAsLong(ctxMap.get(RequestContext.KSTREE_ID)); if (id == null) { @@ -111,7 +111,7 @@ public class KickstartAclHandler extends BaseHandler { * to cobbler */ public boolean aclProfileIsValid(Object ctx, String[] params) { - HashMap ctxMap = (HashMap)ctx; + Map ctxMap = (Map)ctx; User usr = (User)ctxMap.get(USER); Long id = getAsLong(ctxMap.get(RequestContext.KICKSTART_ID)); if (id == null) { diff --git a/java/code/src/com/redhat/rhn/common/util/CharacterMap.java b/java/code/src/com/redhat/rhn/common/util/CharacterMap.java index 3f214bd..9921ccf 100644 --- a/java/code/src/com/redhat/rhn/common/util/CharacterMap.java +++ b/java/code/src/com/redhat/rhn/common/util/CharacterMap.java @@ -19,6 +19,7 @@ import org.apache.commons.lang.builder.EqualsBuilder;
import java.io.Serializable; import java.util.HashMap; +import java.util.Map;
/** * An wrapper around HashMap that ONLY acccepts @@ -31,7 +32,7 @@ import java.util.HashMap; */ public class CharacterMap implements Serializable {
- private HashMap innerMap; + private Map innerMap;
// increase this number on any data change private static final long serialVersionUID = 1L; diff --git a/java/code/src/com/redhat/rhn/common/util/DatePicker.java b/java/code/src/com/redhat/rhn/common/util/DatePicker.java index ee2200e..cb8d720 100644 --- a/java/code/src/com/redhat/rhn/common/util/DatePicker.java +++ b/java/code/src/com/redhat/rhn/common/util/DatePicker.java @@ -541,7 +541,7 @@ public class DatePicker { }
private static Map makeFieldCalendarMap(boolean isLatin) { - HashMap result = new HashMap(); + Map result = new HashMap(); result.put(YEAR, new Integer(Calendar.YEAR)); result.put(MONTH, new Integer(Calendar.MONTH)); result.put(DAY, new Integer(Calendar.DAY_OF_MONTH)); diff --git a/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java b/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java index fea9efe..cd716ec 100644 --- a/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java +++ b/java/code/src/com/redhat/rhn/common/util/test/DatePickerTest.java @@ -22,6 +22,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Locale; +import java.util.Map; import java.util.TimeZone;
import junit.framework.TestCase; @@ -70,7 +71,7 @@ public class DatePickerTest extends TestCase {
public void testReadWriteFromMap() throws ParseException { - HashMap form = new HashMap(); + Map form = new HashMap(); DatePicker p = makePicker(Locale.ENGLISH); Date d = parseDate("1996-08-03T15:33"); p.setDate(d); diff --git a/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java b/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java index fd4e763..5e2c835 100644 --- a/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java +++ b/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.audit;
import java.util.HashMap; +import java.util.Map;
import org.apache.log4j.Logger;
@@ -39,7 +40,7 @@ public class ScapFactory extends HibernateFactory { * @return the XccdfTestResult found */ public static XccdfTestResult lookupTestResultById(Long xid) { - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("xid", xid); return (XccdfTestResult)singleton.lookupObjectByNamedQuery( "XccdfTestResult.findById", params); diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java b/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java index 8765bdd..d50f929 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/command/test/CommandTest.java @@ -37,6 +37,7 @@ import org.hibernate.HibernateException; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map;
/** * CommandTest @@ -135,7 +136,7 @@ public class CommandTest extends RhnBaseTestCase { }
private static class MapTransformer implements Transformer { - private HashMap map = new HashMap(); + private Map map = new HashMap();
public Object transform(Object input) { return map.get(((ThresholdParameter) input).getThresholdType()); diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java b/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java index 8688469..ca32f4e 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/notification/MatchType.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.util.Asserts;
import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set;
/** @@ -31,8 +32,8 @@ public class MatchType { public static final String CAT_REGEX = "regex"; public static final String CAT_CONTACT = "contact";
- private static final HashMap TYPES = new HashMap(); - private static final HashMap CATEGORIES = new HashMap(); + private static final Map TYPES = new HashMap(); + private static final Map CATEGORIES = new HashMap();
public static final MatchType PROBE = create("PROBE_ID", "probe", CAT_SCOPE); public static final MatchType SCOUT = create("NETSAINT_ID", "scout", CAT_SCOPE); diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java index c344b24..052750c 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java @@ -31,6 +31,7 @@ import java.net.SocketException; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Map;
/** * SatClusterFactory - the singleton class used to fetch and store @@ -73,7 +74,7 @@ public class SatClusterFactory extends HibernateFactory { * @return the <code>SatCluster</code> with ID <code>satClusterID</code> */ public static SatCluster findSatClusterById(Long satClusterID) { - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("satClusterID", satClusterID); return (SatCluster) singleton.lookupObjectByNamedQuery("SatCluster.findByID", params); @@ -223,7 +224,7 @@ public class SatClusterFactory extends HibernateFactory { * @return list of sat clusters */ public static List<SatCluster> findSatClusters() { - HashMap params = new HashMap(); + Map params = new HashMap(); return singleton.listObjectsByNamedQuery("SatCluster.findAll", params); }
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java b/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java index d99ff85..f3988b8 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/test/MonitoringTestUtils.java @@ -44,7 +44,7 @@ public final class MonitoringTestUtils { */ public static Map parameterValueMap(Probe probe) { Set ppvSet = probe.getProbeParameterValues(); - HashMap result = new HashMap(); + Map result = new HashMap(); for (Iterator i = ppvSet.iterator(); i.hasNext();) { ProbeParameterValue ppv = (ProbeParameterValue) i.next(); result.put(ppv.getParamName(), ppv.getValue()); @@ -100,11 +100,11 @@ public final class MonitoringTestUtils { */ public static void setupParamValues(ActionHelper ah, Command command, int multiplicity) { - HashMap defaults = makeParamDefaults(command, true); + Map defaults = makeParamDefaults(command, true); setupParamValues(ah, defaults, multiplicity); }
- public static void setupParamValues(ActionHelper ah, HashMap params, + public static void setupParamValues(ActionHelper ah, Map params, int multiplicity) { for (Iterator i = params.keySet().iterator(); i.hasNext();) { String name = (String) i.next(); @@ -120,10 +120,10 @@ public final class MonitoringTestUtils { * of {@link com.redhat.rhn.domain.monitoring.MonitoringConstants#COMMAND_CHECK_TCP} * @param includeInvisible TODO */ - public static HashMap makeParamDefaults(Command command, boolean includeInvisible) { + public static Map makeParamDefaults(Command command, boolean includeInvisible) { Assert.assertEquals("Only CHECK_TCP is supported", MonitoringConstants.getCommandCheckTCP().getName(), command.getName()); - HashMap result = new HashMap(); + Map result = new HashMap(); result.put("send", "send it"); result.put("expect", "expect it"); result.put("r_port_0", "666"); diff --git a/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java b/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java index b9006ab..19b446c 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java +++ b/java/code/src/com/redhat/rhn/domain/rhnset/SetCleanup.java @@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.UserFactory; import org.apache.log4j.Logger;
import java.util.HashMap; +import java.util.Map;
/** * Encapsulate the query/method that needs to be run after @@ -116,7 +117,7 @@ public class SetCleanup {
protected int cleanup(RhnSet set) { WriteMode m = ModeFactory.getWriteMode(catalogName, modeName); - HashMap p = new HashMap(); + Map p = new HashMap(); p.put("user_id", set.getUserId()); p.put("label", set.getLabel()); return m.executeUpdate(p); @@ -155,7 +156,7 @@ public class SetCleanup {
protected int cleanup(RhnSet set) { WriteMode m = ModeFactory.getWriteMode("Set_queries", getMode()); - HashMap p = new HashMap(); + Map p = new HashMap(); p.put("org_id", UserFactory.lookupById(set.getUserId()).getOrg().getId()); p.put("user_id", set.getUserId()); p.put("label", set.getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java index db8997e..517c6f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java @@ -69,7 +69,7 @@ public class SearchAction extends RhnAction { OrgFactory.getEntitlementSwMgrPersonal()) || user.getOrg().getEntitlements().contains( OrgFactory.getEntitlementEnterprise()))) { - HashMap attributes = new HashMap(); + Map attributes = new HashMap(); attributes.put(RhnAction.SUBMITTED, "true"); attributes.put(SystemSearchSetupAction.WHERE_TO_SEARCH, "all"); attributes.put(SystemSearchSetupAction.VIEW_MODE, @@ -84,7 +84,7 @@ public class SearchAction extends RhnAction { return null; } else if (searchType.equals("errata")) { - HashMap attributes = new HashMap(); + Map attributes = new HashMap(); attributes.put("view_mode", "errata_search_by_all_fields"); attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString); attributes.put("optionIssueDateSearch", Boolean.FALSE); @@ -100,7 +100,7 @@ public class SearchAction extends RhnAction { return null; } else if (searchType.equals("packages")) { - HashMap attributes = new HashMap(); + Map attributes = new HashMap(); attributes.put("view_mode", "search_name_and_summary"); attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString); attributes.put(PackageSearchAction.WHERE_CRITERIA, "architecture"); @@ -126,7 +126,7 @@ public class SearchAction extends RhnAction { return null; } else if (searchType.equals("docs")) { - HashMap attributes = new HashMap(); + Map attributes = new HashMap(); attributes.put("view_mode", "search_content_title"); attributes.put(SystemSearchSetupAction.SEARCH_STRING, searchString); performRedirect("/help/Search.do", diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java index 4af49de..b1773f2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java @@ -635,13 +635,13 @@ public class EditChannelAction extends RhnAction implements Listable { } ctx.getRequest().setAttribute("parentChannels", baseChannels);
- HashMap parentChannelArches = new HashMap(); + Map parentChannelArches = new HashMap(); for (Channel c : bases) { parentChannelArches.put(c.getId(), c.getChannelArch().getLabel()); } ctx.getRequest().setAttribute("parentChannelArches", parentChannelArches);
- HashMap parentChannelChecksums = new HashMap(); + Map parentChannelChecksums = new HashMap(); for (Channel c : bases) { parentChannelChecksums.put(c.getId(), c.getChecksumTypeLabel()); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java index 89fb2fe..10af2cd 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java @@ -87,7 +87,7 @@ public abstract class BaseSetOperateOnDiffAction extends RhnSetAction { RhnSetManager.store(currentset);
Map params = makeParamMap(formIn, request); - HashMap diffmap = new HashMap(); + Map diffmap = new HashMap();
Iterator originalItems = getCurrentItemsIterator(new RequestContext(request));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java index ddf1c9b..2cae11f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java @@ -276,7 +276,7 @@ public class DownloadFile extends DownloadAction { response.sendError(HttpServletResponse.SC_NOT_FOUND); return mapping.findForward("error"); } - HashMap params = new HashMap(); + Map params = new HashMap(); params.put(TYPE, DownloadManager.DOWNLOAD_TYPE_KICKSTART); params.put(TREE, tree); params.put(CHILD, child); @@ -292,7 +292,7 @@ public class DownloadFile extends DownloadAction { response.sendError(HttpServletResponse.SC_NOT_FOUND); return mapping.findForward("error"); } - HashMap params = new HashMap(); + Map params = new HashMap(); params.put(TYPE, DownloadManager.DOWNLOAD_TYPE_KICKSTART); params.put(TREE, tree); params.put(FILENAME, path); diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java index ff3767e..85bfadf 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java @@ -95,7 +95,7 @@ public class DeleteErratumAction extends LookupDispatchAction { * {@inheritDoc} */ protected Map getKeyMethodMap() { - HashMap map = new HashMap(); + Map map = new HashMap(); map.put("delete.jsp.delete", "deleteErratum"); return map; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java index b57d869..b3ccf29 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartLocaleEditAction.java @@ -22,8 +22,8 @@ import com.redhat.rhn.manager.kickstart.KickstartLocaleCommand; import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; +import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -121,7 +121,7 @@ public class KickstartLocaleEditAction extends BaseKickstartEditAction { Iterator iter = validTimezones.iterator();
while (iter.hasNext()) { - HashMap possible = (HashMap) iter.next(); + Map possible = (Map) iter.next(); if (timezone.equals(possible.get("value"))) { return Boolean.TRUE; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java index 3087dac..163d8d2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java @@ -39,6 +39,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Set;
import javax.servlet.http.HttpServletRequest; @@ -192,7 +193,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { ctx.getRequest().setAttribute(AVAIL_CHILD_CHANNELS, childchannels);
// Setup the list of selected child channels - HashMap<Long, Long> selectedChannels = new HashMap<Long, Long>(); + Map<Long, Long> selectedChannels = new HashMap<Long, Long>(); if (cmd.getKickstartData().getChildChannels() != null) { Set<Channel> channelSet = cmd.getKickstartData().getChildChannels(); for (Channel c : channelSet) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java index 41dc7a4..84bb832 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java @@ -24,6 +24,7 @@ import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList; import java.util.HashMap; +import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -118,7 +119,7 @@ public class KickstartTroubleshootingEditAction extends BaseKickstartEditAction ]; */
- HashMap grub = new HashMap(); + Map grub = new HashMap(); grub.put("display", "GRUB"); grub.put("value", "grub");
@@ -126,7 +127,7 @@ public class KickstartTroubleshootingEditAction extends BaseKickstartEditAction
displayList.add(grub); if (!cmd.getKickstartData().isRhel5OrGreater()) { - HashMap lilo = new HashMap(); + Map lilo = new HashMap(); lilo.put("display", "LILO"); lilo.put("value", "lilo");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java index ef452d4..1728a3e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteProbeEditAction.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.monitoring.suite.ProbeSuite; import com.redhat.rhn.frontend.action.systems.monitoring.BaseProbeEditAction; import com.redhat.rhn.frontend.struts.RequestContext;
-import java.util.HashMap; +import java.util.Map;
/** * Edit a probe that is part of a probe suite @@ -35,7 +35,7 @@ public class ProbeSuiteProbeEditAction extends BaseProbeEditAction { rctx.getRequest().setAttribute("probeSuite", suite); }
- protected void addSuccessParams(RequestContext rctx, HashMap params, Probe probe) { + protected void addSuccessParams(RequestContext rctx, Map params, Probe probe) { params.put(RequestContext.SUITE_ID, rctx.lookupProbeSuite().getId()); }
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java index a53bc93..48826b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java @@ -298,7 +298,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable { protected void setupForm(HttpServletRequest request, DynaActionForm form, String viewMode) { - HashMap optGroupsMap = new HashMap(); + Map optGroupsMap = new HashMap(); boolean matchingViewModeFound = false;
/* Here we set up a hashmap using the string resources key for the various options diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java index 78d6ae9..182f1b6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java @@ -182,7 +182,7 @@ public class BaseProbeAction extends RhnAction {
private static Map getCommandParameterMap(CommandParameter cp, String paramName, String value, boolean isThreshold, String lastLabel) { - HashMap map = new HashMap(); + Map map = new HashMap(); map.put("value", value); map.put("mandatory", Boolean.valueOf(cp.isMandatory())); String label = cp.getDescription(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java index 1e3053a..8ff0490 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java @@ -84,7 +84,7 @@ public abstract class BaseProbeCreateAction extends BaseProbeAction { // ServerProbe created and saved createSuccessMessage(req, "probecreate.created", cmd.getProbe().getDescription()); - HashMap params = new HashMap(); + Map params = new HashMap(); addSuccessParams(ctx, params, cmd.getProbe()); return getStrutsDelegate().forwardParams(mapping.findForward("success"), params); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java index bbfd673..f149af8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java @@ -26,6 +26,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm;
import java.util.HashMap; +import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,7 +52,7 @@ public abstract class BaseProbeEditAction extends BaseProbeAction { ModifyProbeCommand cmd = new ModifyProbeCommand(user, probe); if (editProbe(cmd, form, req)) { createSuccessMessage(req, "probeedit.probesaved", probe.getDescription()); - HashMap params = new HashMap(); + Map params = new HashMap(); addSuccessParams(rctx, params, cmd.getProbe()); return getStrutsDelegate().forwardParams(mapping.findForward("success"), params); @@ -75,7 +76,7 @@ public abstract class BaseProbeEditAction extends BaseProbeAction { return mapping.findForward(RhnHelper.DEFAULT_FORWARD); }
- protected abstract void addSuccessParams(RequestContext rctx, HashMap params, + protected abstract void addSuccessParams(RequestContext rctx, Map params, Probe probe);
/** diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java index e328a49..d9f28ce 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java @@ -29,6 +29,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm;
import java.util.HashMap; +import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -60,7 +61,7 @@ public class ProbeDeleteAction extends BaseProbeAction { req.setAttribute("probe", probe);
if (submitted) { - HashMap params = new HashMap(); + Map params = new HashMap(); params.put(RequestContext.SID, server.getId()); log.debug("Deleted probe: " + probe.getId()); return getStrutsDelegate().forwardParams(mapping.findForward("deleted"), diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java index 714e43a..83c779b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeEditAction.java @@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.systems.monitoring; import com.redhat.rhn.domain.monitoring.Probe; import com.redhat.rhn.frontend.struts.RequestContext;
-import java.util.HashMap; +import java.util.Map;
/** * Edit a probe attached to one system @@ -35,7 +35,7 @@ public class ProbeEditAction extends BaseProbeEditAction {
protected void addSuccessParams(RequestContext rctx, - HashMap params, Probe probe) { + Map params, Probe probe) { params.put(SID, rctx.lookupAndBindServer().getId()); params.put(PROBEID, rctx.lookupProbe().getId()); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java index 0c645f1..c26e6c3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java @@ -35,7 +35,7 @@ import com.redhat.rhn.testing.RhnMockHttpSession; import org.apache.commons.lang.StringUtils; import org.hibernate.HibernateException;
-import java.util.HashMap; +import java.util.Map; import java.util.List; import java.util.Set;
@@ -75,7 +75,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase { setupCommand(ah, orig); setupProbeFields(ah, orig);
- HashMap params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true); + Map params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true); // Remove required param params.put("r_port_0", ""); MonitoringTestUtils.setupParamValues(ah, params, 3); @@ -141,7 +141,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase { setupCommand(ah, orig); setupProbeFields(ah, orig);
- HashMap params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true); + Map params = MonitoringTestUtils.makeParamDefaults(orig.getCommand(), true); // Make sure that the values are not in ascending order params.put("warning", "7"); params.put("critical", "7"); diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java index 858070a..2f254c4 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ClonableErrataDto.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.dto; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map;
/** * ClonableErrataDto @@ -62,7 +63,7 @@ public class ClonableErrataDto extends BaseDto { public List<Object> getChannelMap() { List<Object> l = new ArrayList<Object>(); for (int i = 0; i < channelId.size(); i++) { - HashMap<String, Object> m = new HashMap<String, Object>(); + Map<String, Object> m = new HashMap<String, Object>(); m.put("id", channelId.get(i)); m.put("name", channelName.get(i)); l.add(m); diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java index 4e7c263..128fbf7 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.dto;
import java.util.HashMap; import java.util.List; +import java.util.Map;
/** * Simple DTO for transfering data from the DB to the UI through datasource. @@ -33,7 +34,7 @@ public abstract class XccdfTestResultCounts extends BaseDto { private static final String INFORMATIONAL_LABEL = "informational"; private static final String FIXED_LABEL = "fixed";
- private HashMap<String, Long> countMap; + private Map<String, Long> countMap;
/* Following properties are set by testresult_counts elaborator. */ private List label; @@ -186,7 +187,7 @@ public abstract class XccdfTestResultCounts extends BaseDto { return (result != null) ? result : 0; }
- private HashMap<String, Long> getCountMap() { + private Map<String, Long> getCountMap() { if (this.countMap == null) { this.countMap = new HashMap<String, Long>(); if (this.label != null && this.count != null) { diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java index af95704..4baeced 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnListDispatchAction.java @@ -43,7 +43,7 @@ public abstract class RhnListDispatchAction extends RhnLookupDispatchAction { * {@inheritDoc} */ protected Map getKeyMethodMap() { - HashMap map = new HashMap(); + Map map = new HashMap(); map.put(RequestContext.FILTER_KEY, "filter"); processMethodKeys(map); return map; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java index 45ff222..87a274a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; +import java.util.Map;
import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; @@ -72,7 +73,7 @@ public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer {
for (ServerNetAddress6 addr : device.getIPv6Addresses()) { // SerializerHelper m = new SerializerHelper(builtInSerializer); - HashMap m = new HashMap(); + Map m = new HashMap(); m.put("address", StringUtils.defaultString(addr.getAddress())); m.put("netmask", StringUtils.defaultString(addr.getNetmask())); m.put("scope", StringUtils.defaultString(addr.getScope())); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java index 877b2ad..ba2d361 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java @@ -235,7 +235,7 @@ public class CrashHandler extends BaseHandler { List returnList = new ArrayList();
for (CrashFile crashFile : crash.getCrashFiles()) { - HashMap crashMap = new HashMap(); + Map crashMap = new HashMap(); crashMap.put("id", crashFile.getId()); crashMap.put("filename", crashFile.getFilename()); crashMap.put("path", crashFile.getPath()); @@ -393,7 +393,7 @@ public class CrashHandler extends BaseHandler { crashId.longValue()); List returnList = new ArrayList(); for (CrashNote cn : c.getCrashNotes()) { - HashMap crashNotesMap = new HashMap(); + Map crashNotesMap = new HashMap(); crashNotesMap.put("id", cn.getId()); crashNotesMap.put("subject", cn.getSubject()); crashNotesMap.put("details", cn.getNote() == null ? "" : cn.getNote()); @@ -426,7 +426,7 @@ public class CrashHandler extends BaseHandler { List returnList = new ArrayList(); for (IdenticalCrashesDto ic : CrashFactory.listIdenticalCrashesForOrg(user, user.getOrg())) { - HashMap crashMap = new HashMap(); + Map crashMap = new HashMap(); crashMap.put("uuid", ic.getUuid()); String component = ic.getComponent(); if (component != null) { @@ -468,7 +468,7 @@ public class CrashHandler extends BaseHandler { List returnList = new ArrayList(); for (CrashSystemsDto cs : CrashFactory.listCrashSystems(user, user.getOrg(), uuid)) { - HashMap crashMap = new HashMap(); + Map crashMap = new HashMap(); crashMap.put("server_id", cs.getServerId()); crashMap.put("server_name", cs.getServerName()); crashMap.put("crash_id", cs.getCrashId()); diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index 2238de7..08d5220 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -56,7 +56,7 @@ public class ScapManager extends BaseManager { public static boolean isScapEnabled(Server server, User user) { SelectMode m = ModeFactory.getMode("scap_queries", "system_scap_enabled_check"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("user_id", user.getId()); params.put("sid", server.getId()); DataResult<Map<String, ? extends Number>> dr = m.execute(params); @@ -72,7 +72,7 @@ public class ScapManager extends BaseManager { public static DataResult latestTestResultByUser(User user) { SelectMode m = ModeFactory.getMode("scap_queries", "latest_testresults_by_user"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("user_id", user.getId()); return makeDataResult(params, new HashMap(), null, m); } @@ -88,7 +88,7 @@ public class ScapManager extends BaseManager { User user, Long systemId) { SelectMode m = ModeFactory.getMode("scap_queries", "latest_testresults_by_server"); - HashMap<String, Long> params = new HashMap<String, Long>(); + Map<String, Long> params = new HashMap<String, Long>(); params.put("user_id", user.getId()); params.put("sid", systemId); return m.execute(params); @@ -102,7 +102,7 @@ public class ScapManager extends BaseManager { public static DataResult allScans(Server server) { SelectMode m = ModeFactory.getMode("scap_queries", "show_system_scans"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("sid", server.getId()); return makeDataResult(params, new HashMap(), null, m); } @@ -116,7 +116,7 @@ public class ScapManager extends BaseManager { public static DataResult<XccdfTestResultDto> scansInSet(User user, String setLabel) { SelectMode m = ModeFactory.getMode("scap_queries", "scans_in_set"); - HashMap<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("user_id", user.getId()); params.put("set_label", setLabel); return makeDataResult(params, new HashMap<String, Object>(), null, m); @@ -130,7 +130,7 @@ public class ScapManager extends BaseManager { public static List<XccdfRuleResultDto> ruleResultsPerScan(Long testResultId) { SelectMode m = ModeFactory.getMode("scap_queries", "show_ruleresults"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("xid", testResultId); return m.execute(params); } @@ -143,7 +143,7 @@ public class ScapManager extends BaseManager { public static XccdfRuleResultDto ruleResultById(Long ruleResultId) { SelectMode m = ModeFactory.getMode("scap_queries", "ruleresult_by_id"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("rr_id", ruleResultId); List<XccdfRuleResultDto> result = m.execute(params); return result.isEmpty() ? null : result.get(0); @@ -159,7 +159,7 @@ public class ScapManager extends BaseManager { public static Long previousComparableTestResult(Long testResultId) { SelectMode m = ModeFactory.getMode("scap_queries", "previous_comparable_tr"); - HashMap<String, Long> params = new HashMap<String, Long>(); + Map<String, Long> params = new HashMap<String, Long>(); params.put("xid", testResultId); DataResult<Map> toReturn = m.execute(params); return (Long) toReturn.get(0).get("xid"); @@ -199,7 +199,7 @@ public class ScapManager extends BaseManager { public static List<XccdfIdentDto> identsPerRuleResult(Long ruleResultId) { SelectMode m = ModeFactory.getMode("scap_queries", "idents_per_ruleresult"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("rr_id", ruleResultId); return m.execute(params); } @@ -212,7 +212,7 @@ public class ScapManager extends BaseManager { public static DataResult scapCapableSystemsInSsm(User scheduler) { SelectMode m = ModeFactory.getMode("scap_queries", "scap_capable_systems_in_set"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("user_id", scheduler.getId()); params.put("set_label", RhnSetDecl.SYSTEMS.getLabel()); return m.execute(params); @@ -226,7 +226,7 @@ public class ScapManager extends BaseManager { public static DataResult systemsInSsmAndScapCapability(User scheduler) { SelectMode m = ModeFactory.getMode("scap_queries", "systems_in_set_and_scap_capability"); - HashMap params = new HashMap(); + Map params = new HashMap(); params.put("user_id", scheduler.getId()); params.put("set_label", RhnSetDecl.SYSTEMS.getLabel()); return m.execute(params); @@ -278,7 +278,7 @@ public class ScapManager extends BaseManager { public static boolean isAvailableToUser(User user, Long testResultId) { SelectMode m = ModeFactory.getMode("scap_queries", "is_available_to_user"); - HashMap<String, Long> params = new HashMap<String, Long>(); + Map<String, Long> params = new HashMap<String, Long>(); params.put("user_id", user.getId()); params.put("xid", testResultId); return m.execute(params).size() >= 1; diff --git a/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java b/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java index 4e3ac4a..da7e1a4 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java +++ b/java/code/src/com/redhat/rhn/manager/audit/scap/RuleResultDiffer.java @@ -17,6 +17,7 @@ package com.redhat.rhn.manager.audit.scap; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map;
import com.redhat.rhn.frontend.dto.XccdfRuleResultDto; import com.redhat.rhn.manager.audit.ScapManager; @@ -26,7 +27,7 @@ import com.redhat.rhn.manager.audit.ScapManager; * assigned with given xccdf:TestResult-s */ public class RuleResultDiffer { - private HashMap<String, RuleResultComparator> dataMap; + private Map<String, RuleResultComparator> dataMap;
/** * Constructor diff --git a/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java b/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java index 5750c78..f2040aa 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java +++ b/java/code/src/com/redhat/rhn/manager/audit/scap/TestResultDiffer.java @@ -17,6 +17,7 @@ package com.redhat.rhn.manager.audit.scap; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import com.redhat.rhn.domain.audit.XccdfTestResult;
/** @@ -35,9 +36,9 @@ public class TestResultDiffer { * @param second the second TestResult to compare * @return the diff */ - public static List<HashMap<String, Object>> diff(XccdfTestResult first, + public static List<Map<String, Object>> diff(XccdfTestResult first, XccdfTestResult second) { - List<HashMap<String, Object>> result = new ArrayList<HashMap<String, Object>>(); + List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); result.add(buildItem("id", linkToScan(first), linkToScan(second))); result.add(buildItem("system.audit.xccdfdetails.jsp.benchmarkid", first.getBenchmark().getIdentifier(), @@ -79,13 +80,13 @@ public class TestResultDiffer { * False - filters out items which differs * @return the result */ - public static List<HashMap<String, Object>> diff(XccdfTestResult first, + public static List<Map<String, Object>> diff(XccdfTestResult first, XccdfTestResult second, Boolean differs) { if (differs == null) { return diff(first, second); } - List<HashMap<String, Object>> result = new ArrayList<HashMap<String, Object>>(); - for (HashMap<String, Object> item : diff(first, second)) { + List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); + for (Map<String, Object> item : diff(first, second)) { if (differs.equals(item.get(DIFFERS))) { result.add(item); } @@ -93,9 +94,9 @@ public class TestResultDiffer { return result; }
- private static HashMap<String, Object> buildItem(String localizationString, + private static Map<String, Object> buildItem(String localizationString, Object first, Object second) { - HashMap<String, Object> item = new HashMap<String, Object>(); + Map<String, Object> item = new HashMap<String, Object>(); item.put("msg", localizationString); item.put(FIRST, first == null ? "" : first); item.put(SECOND, second == null ? "" : second); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java index 608ba68..a09a2a6 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java @@ -30,6 +30,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; +import java.util.Map;
/** * KickstartLocaleCommand - for editing locale-related options @@ -130,7 +131,7 @@ public class KickstartLocaleCommand extends BaseKickstartCommand {
while (iter.hasNext()) { TimezoneDto old = (TimezoneDto) iter.next(); - HashMap row = new HashMap(); + Map row = new HashMap(); row.put("display", old.getName()); row.put("value", old.getLabel());
diff --git a/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java b/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java index 8a97e7a..2e7b4ae 100644 --- a/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java +++ b/java/code/src/com/redhat/rhn/manager/system/VirtualizationActionMap.java @@ -18,6 +18,7 @@ import com.redhat.rhn.domain.action.ActionFactory; import com.redhat.rhn.domain.action.ActionType;
import java.util.HashMap; +import java.util.Map;
/** * A map between virtualization states and actions @@ -27,7 +28,7 @@ import java.util.HashMap; public class VirtualizationActionMap { private static VirtualizationActionMap singleton = new VirtualizationActionMap();
- private HashMap actionMap; + private Map actionMap; // Essentially a state machine to answer: // "Given a desired action (start, // suspend, resume, restart, shutdown) and a @@ -35,14 +36,14 @@ public class VirtualizationActionMap { // crashed, paused), what RHN action // should be used?"
- private HashMap startMap; - private HashMap suspendMap; - private HashMap resumeMap; - private HashMap restartMap; - private HashMap shutdownMap; - private HashMap deleteMap; - private HashMap setVcpusMap; - private HashMap setMemoryMap; + private Map startMap; + private Map suspendMap; + private Map resumeMap; + private Map restartMap; + private Map shutdownMap; + private Map deleteMap; + private Map setVcpusMap; + private Map setMemoryMap;
private VirtualizationActionMap() { setup(); @@ -114,7 +115,7 @@ public class VirtualizationActionMap { */ public static ActionType lookupActionType(String currentState, String actionName) { if (singleton.actionMap.get(actionName) != null) { - HashMap aMap = (HashMap) singleton.actionMap.get(actionName); + Map aMap = (Map) singleton.actionMap.get(actionName); return (ActionType) aMap.get(currentState); }
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java index 1233a72..d5e511f 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java @@ -305,8 +305,8 @@ public class DailySummary extends RhnJavaJob { StringBuffer legend = new StringBuffer(); StringBuffer msg = new StringBuffer(); LinkedHashSet<String> statusSet = new LinkedHashSet(); - TreeMap<String, HashMap<String, Integer>> nonErrataActions = new TreeMap(); - TreeMap<String, HashMap<String, Integer>> errataActions = new TreeMap(); + TreeMap<String, Map<String, Integer>> nonErrataActions = new TreeMap(); + TreeMap<String, Map<String, Integer>> errataActions = new TreeMap(); TreeMap<String, String> errataSynopsis = new TreeMap();
legend.append(LocalizationService @@ -331,7 +331,7 @@ public class DailySummary extends RhnJavaJob { longestActionLength = advisoryKey.length() + HEADER_SPACER; } } - HashMap<String, Integer> counts = errataActions.get(advisoryKey); + Map<String, Integer> counts = errataActions.get(advisoryKey); counts.put(am.getStatus(), am.getCount());
if (am.getAdvisory() != null && @@ -346,7 +346,7 @@ public class DailySummary extends RhnJavaJob { longestActionLength = am.getType().length() + HEADER_SPACER; } } - HashMap<String, Integer> counts = nonErrataActions.get(am.getType()); + Map<String, Integer> counts = nonErrataActions.get(am.getType()); counts.put(am.getStatus(), am.getCount()); }
@@ -387,13 +387,13 @@ public class DailySummary extends RhnJavaJob {
private StringBuffer renderActionTree(int longestActionLength, int longestStatusLength, LinkedHashSet<String> statusSet, - TreeMap<String, HashMap<String, Integer>> actionTree) { + TreeMap<String, Map<String, Integer>> actionTree) { StringBuffer formattedActions = new StringBuffer(); for (String actionName : actionTree.keySet()) { formattedActions.append(actionName + StringUtils.repeat(" ", (longestActionLength - (actionName.length())))); for (String status : statusSet) { - HashMap<String, Integer> counts = actionTree.get(actionName); + Map<String, Integer> counts = actionTree.get(actionName); Integer theCount = counts.get(status); if (counts.containsKey(status)) { theCount = counts.get(status); diff --git a/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java b/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java index d7b9383..728cb34 100644 --- a/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java +++ b/java/code/src/com/redhat/rhn/testing/ForwardWrapper.java @@ -19,6 +19,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.config.ForwardConfig;
import java.util.HashMap; +import java.util.Map;
/** * A decorator for a {@link org.apache.struts.action.ActionForward}. In @@ -30,7 +31,7 @@ import java.util.HashMap; public class ForwardWrapper extends ActionForward {
private ForwardConfig fc; - private HashMap params; + private Map params;
/** * Create a new forward that decorates <code>fc0</code> diff --git a/java/code/src/org/cobbler/test/MockConnection.java b/java/code/src/org/cobbler/test/MockConnection.java index ebe04bd..67e512a 100644 --- a/java/code/src/org/cobbler/test/MockConnection.java +++ b/java/code/src/org/cobbler/test/MockConnection.java @@ -132,7 +132,7 @@ public class MockConnection extends CobblerConnection { return true; } else if ("new_profile".equals(name)) { - HashMap profile = new HashMap(); + Map profile = new HashMap(); String uid = random(); String key = random(); profile.put("uid", uid); @@ -187,7 +187,7 @@ public class MockConnection extends CobblerConnection { else if ("new_distro".equals(name)) { String uid = random();
- HashMap distro = new HashMap(); + Map distro = new HashMap(); String key = random(); distro.put("uid", uid);
@@ -235,7 +235,7 @@ public class MockConnection extends CobblerConnection { systems.remove(findByName((String)args[0], systems)); } else if ("new_system".equals(name)) { - HashMap profile = new HashMap(); + Map profile = new HashMap(); String key = random(); profile.put("uid", random()); Map interfaces = new HashMap();