spacewalk-commits October 2012

spacewalk-commits@lists.fedorahosted.org

7 participants
383 discussions

2 commits - rel-eng/packages spacewalk/pylint
by Michael Mraka 24 Oct '12

24 Oct '12

rel-eng/packages/spacewalk-pylint | 2 +- spacewalk/pylint/spacewalk-pylint.rc | 3 +-- spacewalk/pylint/spacewalk-pylint.spec | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 6c8041c38cba67d848aebcffdb4250714d6fbb7e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 24 09:27:45 2012 +0200 Automatic commit of package [spacewalk-pylint] release [0.8-1]. diff --git a/rel-eng/packages/spacewalk-pylint b/rel-eng/packages/spacewalk-pylint index c3b1ac0..6051662 100644 --- a/rel-eng/packages/spacewalk-pylint +++ b/rel-eng/packages/spacewalk-pylint @@ -1 +1 @@ -0.7-1 spacewalk/pylint/ +0.8-1 spacewalk/pylint/ diff --git a/spacewalk/pylint/spacewalk-pylint.spec b/spacewalk/pylint/spacewalk-pylint.spec index 7549b0c..0c102cc 100644 --- a/spacewalk/pylint/spacewalk-pylint.spec +++ b/spacewalk/pylint/spacewalk-pylint.spec @@ -1,5 +1,5 @@ Name: spacewalk-pylint -Version: 0.7 +Version: 0.8 Release: 1%{?dist} Summary: Pylint configuration for spacewalk python packages @@ -49,6 +49,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Wed Oct 24 2012 Michael Mraka <michael.mraka(a)redhat.com> 0.8-1 +- Revert "put W1201 on list of ignored pylint warnings" + * Fri Aug 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 0.7-1 - put W1201 on list of ignored pylint warnings commit cb1de8632c632a5a2df3148b3496e8ce995c8cac Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 24 09:25:49 2012 +0200 Revert "put W1201 on list of ignored pylint warnings" This reverts commit 73f85b6a6f29b8e00d0dba197b0e1c0856483e5f. it breaks RHEL6: Traceback (most recent call last): File "/usr/bin/pylint", line 4, in <module> lint.Run(sys.argv[1:]) File "/usr/lib/python2.6/site-packages/pylint/lint.py", line 832, in __init__ linter.load_config_file() File "/usr/lib/python2.6/site-packages/logilab/common/configuration.py", line 655, in load_config_file provider.set_option(option, value, optdict=optdict) File "/usr/lib/python2.6/site-packages/pylint/lint.py", line 297, in set_option meth(_id) File "/usr/lib/python2.6/site-packages/pylint/utils.py", line 170, in disable msg = self.check_message_id(msgid) File "/usr/lib/python2.6/site-packages/pylint/utils.py", line 227, in check_message_id raise UnknownMessage('No such message id %s' % msgid) pylint.utils.UnknownMessage: No such message id W1201 diff --git a/spacewalk/pylint/spacewalk-pylint.rc b/spacewalk/pylint/spacewalk-pylint.rc index 7408778..990c8e6 100644 --- a/spacewalk/pylint/spacewalk-pylint.rc +++ b/spacewalk/pylint/spacewalk-pylint.rc @@ -12,7 +12,7 @@ persistent=no [MESSAGES CONTROL] # Disable the message(s) with the given id(s). -disable=I0011,C0302,C0111,R0801,R0902,R0904,R0912,R0913,R0914,R0915,W0142,W0403,W0603,W1201 +disable=I0011,C0302,C0111,R0801,R0902,R0904,R0912,R0913,R0914,R0915,W0142,W0403,W0603 # list of disabled messages: #I0011: 62: Locally disabling R0201 @@ -27,7 +27,6 @@ disable=I0011,C0302,C0111,R0801,R0902,R0904,R0912,R0913,R0914,R0915,W0142,W0403, #W0142:228:MPM_Package.write: Used * or ** magic #W0403: 28: Relative import 'rhnLog', should be 'backend.common.rhnLog' #W0603: 72:initLOG: Using the global statement -#W1201: 49,12:KatelloShell.history_file: Specify string format arguments as logging function parameters [REPORTS]

1 0

Changes to 'refs/tags/spacewalk-java-1.8.168-1'
by StephenHerr 23 Oct '12

23 Oct '12

Tag 'spacewalk-java-1.8.168-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-10-23 21:20 +0000 Tagging package [spacewalk-java] version [1.8.168-1] in directory [java/]. Changes since spacewalk-proxy-1.8.14-1: Stephen Herr (3): Fixing a bunch of Generics type errors 869428 - Added new API method for Splice integration Automatic commit of package [spacewalk-java] release [1.8.168-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 6 java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 18 java/code/src/com/redhat/rhn/domain/action/script/ScriptActionDetails.java | 8 java/code/src/com/redhat/rhn/domain/server/Server.java | 214 ++-- java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 82 - java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 456 ++++++---- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java | 6 java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java | 38 java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 296 +++--- java/spacewalk-java.spec | 10 rel-eng/packages/spacewalk-java | 2 11 files changed, 648 insertions(+), 488 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by StephenHerr 23 Oct '12

23 Oct '12

java/spacewalk-java.spec | 10 +++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit b2de03368776a297f44b1b9bd4f6dd569050bdc5 Author: Stephen Herr <sherr(a)redhat.com> Date: Tue Oct 23 17:20:38 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.168-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index bb68fc4..ae6fde0 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -23,7 +23,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.167 +Version: 1.8.168 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -616,6 +616,14 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Oct 23 2012 Stephen Herr <sherr(a)redhat.com> 1.8.168-1 +- 869428 - Added new API method for Splice integration +- Fixing a bunch of Generics type errors +- Expose extra packages / systems with extra packages +- 853444 - do not list custom base channel twice in the base channel combo for + an activation key +- WebUI improvement, adding "Search Google for errata" on package details page. + * Mon Oct 22 2012 Jan Pazdziora 1.8.167-1 - WebUI improvement, showing activation key used for system activation at system overview page. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index de3636a..3e65a30 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.167-1 java/ +1.8.168-1 java/

1 0

2 commits - java/code
by StephenHerr 23 Oct '12

23 Oct '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 6 java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 18 java/code/src/com/redhat/rhn/domain/action/script/ScriptActionDetails.java | 8 java/code/src/com/redhat/rhn/domain/server/Server.java | 214 ++-- java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 82 - java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 456 ++++++---- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java | 6 java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java | 38 java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 296 +++--- 9 files changed, 638 insertions(+), 486 deletions(-) New commits: commit 140a0403f422c04363dbf806d377fe1507681e09 Author: Stephen Herr <sherr(a)redhat.com> Date: Tue Oct 23 17:19:19 2012 -0400 869428 - Added new API method for Splice integration diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index eb0ff3c..e01e796 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -146,6 +146,7 @@ import java.io.IOException; import java.io.StringReader; import java.sql.Blob; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -610,6 +611,98 @@ public class SystemHandler extends BaseHandler { return SystemManager.systemListShortActive(loggedInUser, null); } + /** + * Given a list of server ids, will return details about the + * systems that are active and visible to the user + * @param sessionKey The sessionKey for the logged in user + * @param serverIds A list of ids to get info for + * @return a list of maps representing the details for the active systems + * + * @throws FaultException A FaultException is thrown if the user cannot + * be found from the session key + * + * @xmlrpc.doc Given a list of server ids, returns a list of active servers' details visible to the user. + * @xmlrpc.param #param("string", "sessionKey") + * @xmlrpc.param #array_single("int", "serverIds") + * @xmlrpc.returntype + * #array() + * #struct("server details") + * #prop_desc("int", "id", "The server's id") + * #prop_desc("string", "name", "The server's name") + * #prop_desc("dateTime.iso8601", "last_checkin", "Last time server successfully checked in ") + * #prop_desc("int", "ram", "The amount of physical memory in MB.") + * #prop_desc("int", "swap", "The amount of swap space in MB.") + * #prop_desc("struct", "network_devices", "The server's network devices") + * $NetworkInterfaceSerializer + * #prop_desc("struct", "dmi_info", "The server's dmi info") + * $DmiSerializer + * #prop_desc("struct", "cpu_info", "The server's cpu info") + * $CpuSerializer + * #prop_desc("array", "subscribed_channels", "List of subscribed channels") + * #array() + * #struct("channel") + * #prop_desc("int", "channel_id", "The channel id.") + * #prop_desc("string", "channel_label", "The channel label.") + * #struct_end() + * #array_end() + * #prop_desc("array", "active_guest_system_ids", "List of virtual guest system ids for active guests") + * #array() + * #prop_desc("int", "guest_id", "The guest's system id.") + * #array_end() + * #struct_end() + * #array_end() + */ + public List<Map<String, Object>> listActiveSystemDetails(String sessionKey, + List<Integer> serverIds) throws FaultException { + User loggedInUser = getLoggedInUser(sessionKey); + List<Server> servers = XmlRpcSystemHelper.getInstance().lookupServers( + loggedInUser, serverIds); + List<Map<String, Object>> ret = new ArrayList<Map<String, Object>>(); + for (Server server : servers) { + if (!server.isInactive()) { + Map<String, Object> m = new HashMap<String, Object>(); + m.put("id", server.getId()); + m.put("name", server.getName()); + m.put("last_checkin", server.getLastCheckin()); + m.put("ram", server.getRam()); + m.put("swap", server.getSwap()); + m.put("cpu_info", server.getCpu()); + m.put("dmi_info", server.getDmi()); + m.put("network_devices", + new ArrayList<NetworkInterface>(server + .getNetworkInterfaces())); + + List<Map<String, Object>> channels = new ArrayList<Map<String, Object>>(); + Channel base = server.getBaseChannel(); + if (base != null) { + Map<String, Object> basec = new HashMap<String, Object>(); + basec.put("channel_id", base.getId()); + basec.put("channel_label", base.getLabel()); + channels.add(basec); + for (Channel child : server.getChildChannels()) { + Map<String, Object> childc = new HashMap<String, Object>(); + childc.put("channel_id", child.getId()); + childc.put("channel_label", child.getLabel()); + channels.add(childc); + } + } + m.put("subscribed_channels", channels); + + Collection<VirtualInstance> guests = server.getGuests(); + List<Long> guestList = new ArrayList<Long>(); + for (VirtualInstance guest : guests) { + Server g = guest.getGuestSystem(); + if (g != null && !g.isInactive()) { + guestList.add(g.getId()); + } + } + + ret.add(m); + } + } + return ret; + } + private Map<String, Object> createChannelMap(EssentialChannelDto channel, Boolean currentBase) { Map<String, Object> ret = new HashMap<String, Object>(); @@ -4251,7 +4344,7 @@ public class SystemHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); DataResult<VirtualSystemOverview> result = SystemManager .virtualGuestsForHostList(loggedInUser, - sid.longValue(), null); + sid.longValue(), null); result.elaborate(); return result; } @@ -4379,7 +4472,7 @@ public class SystemHandler extends BaseHandler { action, vi.getHostSystem(), vi.getUuid(), - new HashMap<String, String>()); + new HashMap<String, String>()); cmd.store(); return cmd.getAction().getId().intValue(); } @@ -5086,26 +5179,26 @@ public class SystemHandler extends BaseHandler { } /** - * List extra packages for given system - * @param sessionKey Session key - * @param serverId Server ID - * @return Array of extra packages for given system - * - * @xmlrpc.doc List extra packages for a system - * @xmlrpc.param #param("string", "sessionKey") - * @xmlrpc.param #param("int", "serverId") - * @xmlrpc.returntype - * #array() - * #struct("package") - * #prop("string", "name") - * #prop("string", "version") - * #prop("string", "release") - * #prop_desc("string", "epoch", "returned only if non-zero") - * #prop("string", "arch") - * #prop_desc("date", "installtime", "returned only if known") - * #struct_end() - * #array_end() - */ + * List extra packages for given system + * @param sessionKey Session key + * @param serverId Server ID + * @return Array of extra packages for given system + * + * @xmlrpc.doc List extra packages for a system + * @xmlrpc.param #param("string", "sessionKey") + * @xmlrpc.param #param("int", "serverId") + * @xmlrpc.returntype + * #array() + * #struct("package") + * #prop("string", "name") + * #prop("string", "version") + * #prop("string", "release") + * #prop_desc("string", "epoch", "returned only if non-zero") + * #prop("string", "arch") + * #prop_desc("date", "installtime", "returned only if known") + * #struct_end() + * #array_end() + */ public List listExtraPackages(String sessionKey, Integer serverId) { User loggedInUser = getLoggedInUser(sessionKey); DataResult dr = SystemManager.listExtraPackages(new Long(serverId)); commit 9d2ad9da4305d41d1d43666b2685eed2136c2f16 Author: Stephen Herr <sherr(a)redhat.com> Date: Tue Oct 23 16:16:39 2012 -0400 Fixing a bunch of Generics type errors diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index dc031dd..edac3fb 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -412,7 +412,7 @@ SELECT ES.id, S.name, 1 as selectable <elaborator name="entitlements"/> </mode> -<mode name="xmlrpc_visible_to_user"> +<mode name="xmlrpc_visible_to_user" class="com.redhat.rhn.frontent.dto.SystemOverview"> <query params="user_id"> select * from ( SELECT DISTINCT S.id AS ID, @@ -427,7 +427,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id </query> </mode> -<mode name="xmlrpc_visible_to_user_inactive"> +<mode name="xmlrpc_visible_to_user_inactive" class="com.redhat.rhn.frontent.dto.SystemOverview"> <query params="user_id, checkin_threshold"> select * from ( SELECT DISTINCT S.id AS ID, @@ -443,7 +443,7 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id </query> </mode> -<mode name="xmlrpc_visible_to_user_active"> +<mode name="xmlrpc_visible_to_user_active" class="com.redhat.rhn.frontent.dto.SystemOverview"> <query params="user_id, checkin_threshold"> select * from ( SELECT DISTINCT S.id AS ID, diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java index 5f4bc9c..da664e5 100644 --- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java +++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java @@ -76,7 +76,7 @@ public class LocalizationService { private Map keyToBundleMap; // List of supported locales - private Map supportedLocales = new HashMap(); + private final Map supportedLocales = new HashMap(); /** * hidden constructor @@ -125,7 +125,7 @@ public class LocalizationService { } catch (ClassNotFoundException ce) { String message = "Class not found when trying to initalize " + - "the LocalizationService: " + ce.toString(); + "the LocalizationService: " + ce.toString(); log.error(message, ce); throw new LocalizationException(message, ce); } @@ -570,17 +570,19 @@ public class LocalizationService { * * @return SortedMap sorted map of available countries. */ - public SortedMap availableCountries() { - List validCountries = new LinkedList(Arrays.asList(Locale + public SortedMap<String, String> availableCountries() { + List<String> validCountries = new LinkedList<String>( + Arrays.asList(Locale .getISOCountries())); String[] excluded = Config.get().getStringArray( ConfigDefaults.WEB_EXCLUDED_COUNTRIES); if (excluded != null) { - validCountries.removeAll(new LinkedList(Arrays.asList(excluded))); + validCountries.removeAll(new LinkedList<String>(Arrays + .asList(excluded))); } - SortedMap ret = new TreeMap(); - for (Iterator iter = validCountries.iterator(); iter.hasNext();) { - String isoCountry = (String) iter.next(); + SortedMap<String, String> ret = new TreeMap<String, String>(); + for (Iterator<String> iter = validCountries.iterator(); iter.hasNext();) { + String isoCountry = iter.next(); ret.put(this.getMessage(isoCountry), isoCountry); } diff --git a/java/code/src/com/redhat/rhn/domain/action/script/ScriptActionDetails.java b/java/code/src/com/redhat/rhn/domain/action/script/ScriptActionDetails.java index ebce766..b11e5b9 100644 --- a/java/code/src/com/redhat/rhn/domain/action/script/ScriptActionDetails.java +++ b/java/code/src/com/redhat/rhn/domain/action/script/ScriptActionDetails.java @@ -31,7 +31,7 @@ public class ScriptActionDetails extends ActionChild { private String groupname; private byte[] script; private Long timeout; - private Set results; + private Set<ScriptResult> results; /** * @return Returns the groupname. @@ -92,14 +92,14 @@ public class ScriptActionDetails extends ActionChild { /** * @return Returns the result. */ - public Set getResults() { + public Set<ScriptResult> getResults() { return results; } /** * @param r The result to set. */ - public void setResults(Set r) { + public void setResults(Set<ScriptResult> r) { this.results = r; } @@ -109,7 +109,7 @@ public class ScriptActionDetails extends ActionChild { */ public void addResult(ScriptResult r) { if (this.results == null) { //init results if needed - this.results = new HashSet(); + this.results = new HashSet<ScriptResult>(); } r.setParentScriptActionDetails(this); this.results.add(r); diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 4d5f10c..035428e 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -29,6 +29,7 @@ import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; import com.redhat.rhn.domain.org.CustomDataKey; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; +import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; @@ -88,27 +89,27 @@ public class Server extends BaseDomainHelper implements Identifiable { private Date channelsChanged; private Date created; private String cobblerId; - private Set devices; + private Set<Device> devices; private ServerInfo serverInfo; private CPU cpu; private ServerLock lock; private ServerUuid serverUuid; - private Set notes; - private Set networks; + private Set<Note> notes; + private Set<Network> networks; private Ram ram; private Dmi dmi; - private Set networkInterfaces; + private Set<NetworkInterface> networkInterfaces; private Set<CustomDataValue> customDataValues; - private Set channels; - private List configChannels = Collections.EMPTY_LIST; - private Set localChannels = new HashSet(); + private Set<Channel> channels; + private List<ConfigChannel> configChannels = new ArrayList<ConfigChannel>(); + private Set<ConfigChannel> localChannels = new HashSet<ConfigChannel>(); private Location serverLocation; - private Set<VirtualInstance> guests = new HashSet(); + private Set<VirtualInstance> guests = new HashSet<VirtualInstance>(); private VirtualInstance virtualInstance; private PushClient pushClient; - private ConfigChannelListProcessor configListProc = new ConfigChannelListProcessor(); - private Set history; - private Set packages; + private final ConfigChannelListProcessor configListProc = new ConfigChannelListProcessor(); + private Set<ServerHistoryEvent> history; + private Set<Package> packages; private ProxyInfo proxyInfo; private Set<? extends ServerGroup> groups; private Set<Capability> capabilities; @@ -178,8 +179,9 @@ public class Server extends BaseDomainHelper implements Identifiable { public ConfigChannel getLocalOverrideNoCreate() { ensureConfigManageable(); ConfigChannel channel = null; - for (Iterator itr = localChannels.iterator(); itr.hasNext();) { - ConfigChannel ch = (ConfigChannel) itr.next(); + for (Iterator<ConfigChannel> itr = localChannels.iterator(); itr + .hasNext();) { + ConfigChannel ch = itr.next(); if (ch.getConfigChannelType().equals(ConfigChannelType.local())) { channel = ch; break; @@ -197,7 +199,7 @@ public class Server extends BaseDomainHelper implements Identifiable { } private void setLocalType(ConfigChannel channel, - ConfigChannelType cct) { + ConfigChannelType cct) { ConfigChannel ch = findLocal(cct); if (ch != null) { @@ -206,11 +208,11 @@ public class Server extends BaseDomainHelper implements Identifiable { localChannels.add(channel); } - protected void setLocalChannels(Set chls) { + protected void setLocalChannels(Set<ConfigChannel> chls) { localChannels = chls; } - protected Set getLocalChannels() { + protected Set<ConfigChannel> getLocalChannels() { return localChannels; } @@ -223,12 +225,13 @@ public class Server extends BaseDomainHelper implements Identifiable { private ConfigChannel findLocal(ConfigChannelType cct) { assert localChannels.size() <= 2 : "More than two local override channels" + - "Associated with this server." + - "There should be NO more than Two" + - " Override Channels associated"; + "Associated with this server." + + "There should be NO more than Two" + + " Override Channels associated"; ensureConfigManageable(); - for (Iterator itr = localChannels.iterator(); itr.hasNext();) { - ConfigChannel ch = (ConfigChannel) itr.next(); + for (Iterator<ConfigChannel> itr = localChannels.iterator(); itr + .hasNext();) { + ConfigChannel ch = itr.next(); ConfigChannelType item = ch.getConfigChannelType(); if (cct.equals(item)) { return ch; @@ -263,8 +266,9 @@ public class Server extends BaseDomainHelper implements Identifiable { public ConfigChannel getSandboxOverrideNoCreate() { ensureConfigManageable(); ConfigChannel channel = null; - for (Iterator itr = localChannels.iterator(); itr.hasNext();) { - ConfigChannel ch = (ConfigChannel) itr.next(); + for (Iterator<ConfigChannel> itr = localChannels.iterator(); itr + .hasNext();) { + ConfigChannel ch = itr.next(); if (ch.getConfigChannelType().equals(ConfigChannelType.sandbox())) { channel = ch; break; @@ -285,9 +289,11 @@ public class Server extends BaseDomainHelper implements Identifiable { * ONLY TO BE USED FOR/BY HIBERNATE * @param configChannelsIn The configChannels to set. */ - protected void setConfigChannelsHibernate(List configChannelsIn) { + protected void setConfigChannelsHibernate( + List<ConfigChannel> configChannelsIn) { configChannels = configChannelsIn; - for (Iterator itr = configChannels.iterator(); itr.hasNext();) { + for (Iterator<ConfigChannel> itr = configChannels.iterator(); itr + .hasNext();) { if (itr.next() == null) { itr.remove(); } @@ -299,7 +305,7 @@ public class Server extends BaseDomainHelper implements Identifiable { * * @return List of config channels */ - protected List getConfigChannelsHibernate() { + protected List<ConfigChannel> getConfigChannelsHibernate() { return configChannels; } @@ -356,11 +362,11 @@ public class Server extends BaseDomainHelper implements Identifiable { * Protected constructor */ protected Server() { - devices = new HashSet(); - notes = new HashSet(); - networks = new HashSet(); - networkInterfaces = new HashSet(); - customDataValues = new HashSet(); + devices = new HashSet<Device>(); + notes = new HashSet<Note>(); + networks = new HashSet<Network>(); + networkInterfaces = new HashSet<NetworkInterface>(); + customDataValues = new HashSet<CustomDataValue>(); ignoreEntitlementsForMigration = Boolean.FALSE; } @@ -396,6 +402,7 @@ public class Server extends BaseDomainHelper implements Identifiable { * * @return Long to get */ + @Override public Long getId() { return this.id; } @@ -717,7 +724,7 @@ public class Server extends BaseDomainHelper implements Identifiable { * Sets the set of devices. * @param devicesIn The devices to set. */ - protected void setDevices(Set devicesIn) { + protected void setDevices(Set<Device> devicesIn) { devices = devicesIn; } @@ -747,14 +754,14 @@ public class Server extends BaseDomainHelper implements Identifiable { /** * @return Returns the notes. */ - public Set getNotes() { + public Set<Note> getNotes() { return notes; } /** * @param n The notes to set. */ - public void setNotes(Set n) { + public void setNotes(Set<Note> n) { this.notes = n; } @@ -791,10 +798,10 @@ public class Server extends BaseDomainHelper implements Identifiable { } /** - * Sets teh set of networks + * Sets the set of networks * @param n The networks to set */ - public void setNetworks(Set n) { + public void setNetworks(Set<Network> n) { this.networks = n; } @@ -851,7 +858,7 @@ public class Server extends BaseDomainHelper implements Identifiable { */ public NetworkInterface findPrimaryNetworkInterface() { if (!networkInterfaces.isEmpty()) { - Iterator i = networkInterfaces.iterator(); + Iterator<NetworkInterface> i = networkInterfaces.iterator(); // First pass look for names NetworkInterface ni = null; @@ -874,10 +881,10 @@ public class Server extends BaseDomainHelper implements Identifiable { // Second pass look for localhost i = networkInterfaces.iterator(); while (i.hasNext()) { - NetworkInterface n = (NetworkInterface) i.next(); + NetworkInterface n = i.next(); String addr = n.getIpaddr(); if (addr != null && - !addr.equals("127.0.0.1")) { + !addr.equals("127.0.0.1")) { log.debug("Found NetworkInterface !localhost"); return n; } @@ -891,7 +898,7 @@ public class Server extends BaseDomainHelper implements Identifiable { // If we didnt match any of the above criteria // just give up and return the 1st one. log.debug("just returning 1st network interface"); - return (NetworkInterface) networkInterfaces.iterator().next(); + return networkInterfaces.iterator().next(); } return null; } @@ -900,8 +907,9 @@ public class Server extends BaseDomainHelper implements Identifiable { if (networkInterfaces.isEmpty()) { return null; } - for (Iterator i = networkInterfaces.iterator(); i.hasNext();) { - NetworkInterface ni = (NetworkInterface) i.next(); + for (Iterator<NetworkInterface> i = networkInterfaces.iterator(); i + .hasNext();) { + NetworkInterface ni = i.next(); if (ni.isDisabled()) { continue; } @@ -924,9 +932,9 @@ public class Server extends BaseDomainHelper implements Identifiable { // Sometimes java really annoys me private Network findPrimaryNetwork() { if (!networks.isEmpty()) { - Iterator i = networks.iterator(); + Iterator<Network> i = networks.iterator(); while (i.hasNext()) { - Network n = (Network) i.next(); + Network n = i.next(); String addr = n.getIpaddr(); if (addr != null && !addr.equals("127.0.0.1")) { @@ -935,16 +943,16 @@ public class Server extends BaseDomainHelper implements Identifiable { } } log.debug("giving up, returning 1st Network"); - return (Network) networks.iterator().next(); + return networks.iterator().next(); } return null; } private Network findPrimaryIpv6Network() { if (!networks.isEmpty()) { - Iterator i = networks.iterator(); + Iterator<Network> i = networks.iterator(); while (i.hasNext()) { - Network n = (Network) i.next(); + Network n = i.next(); String addr = n.getIp6addr(); if (addr != null && !addr.equals("::1")) { @@ -953,7 +961,7 @@ public class Server extends BaseDomainHelper implements Identifiable { } } log.debug("giving up, returning 1st Network"); - return (Network) networks.iterator().next(); + return networks.iterator().next(); } return null; } @@ -976,7 +984,7 @@ public class Server extends BaseDomainHelper implements Identifiable { */ public String getHostname() { if (!networks.isEmpty()) { - Network net = (Network) networks.iterator().next(); + Network net = networks.iterator().next(); return net.getHostname(); } return null; @@ -987,9 +995,10 @@ public class Server extends BaseDomainHelper implements Identifiable { * @return Returns the hostname aliases for this server */ public List<String> getCnames() { - List<String> result = new ArrayList(); - List proxyCnames = Config.get().getList(VALID_CNAMES + - serverInfo.getId().toString()); + List<String> result = new ArrayList<String>(); + List<String> proxyCnames = Config.get().getList( + VALID_CNAMES + + serverInfo.getId().toString()); if (!proxyCnames.isEmpty()) { result.addAll(proxyCnames); } @@ -1006,13 +1015,13 @@ public class Server extends BaseDomainHelper implements Identifiable { return (hostname == null) ? null : IDN.toUnicode(hostname); } - /** + /** * Get the hostname aliases (cname records) for this server * If hostname is IDN, it is decoded from Pune encoding * @return Returns the primary hostname for this server */ public List<String> getDecodedCnames() { - List<String> result = new ArrayList(); + List<String> result = new ArrayList<String>(); for (String hostname : getCnames()) { result.add(IDN.toUnicode(hostname)); } @@ -1150,7 +1159,7 @@ public class Server extends BaseDomainHelper implements Identifiable { /** * @param customDataValuesIn The customDataValues to set. */ - public void setCustomDataValues(Set customDataValuesIn) { + public void setCustomDataValues(Set<CustomDataValue> customDataValuesIn) { this.customDataValues = customDataValuesIn; } @@ -1174,13 +1183,13 @@ public class Server extends BaseDomainHelper implements Identifiable { // Check for null key values. if (key == null || key.getLabel() == null) { throw new - UndefinedCustomDataKeyException("CustomDataKey can not be null."); + UndefinedCustomDataKeyException("CustomDataKey can not be null."); } // Make sure this org has this particular CustomDataKey defined if (!org.hasCustomDataKey(key.getLabel())) { throw new - UndefinedCustomDataKeyException("CustomDataKey: " + key.getLabel() + + UndefinedCustomDataKeyException("CustomDataKey: " + key.getLabel() + " is not defined for this org."); } @@ -1235,7 +1244,7 @@ public class Server extends BaseDomainHelper implements Identifiable { return channels; } - protected void setChannels(Set chans) { + protected void setChannels(Set<Channel> chans) { channels = chans; } @@ -1258,8 +1267,8 @@ public class Server extends BaseDomainHelper implements Identifiable { * relatively small, loop through the channels set and look for one without a * parentChannel instead of going back to the db. */ - for (Iterator itr = channels.iterator(); itr.hasNext();) { - Channel channel = (Channel) itr.next(); + for (Iterator<Channel> itr = channels.iterator(); itr.hasNext();) { + Channel channel = itr.next(); if (channel.getParentChannel() == null) { // This is the base channel return channel; @@ -1300,8 +1309,8 @@ public class Server extends BaseDomainHelper implements Identifiable { * @return true if the server has the given Entitlement. */ public boolean hasEntitlement(Entitlement entitlement) { - List grps = getEntitledGroups(); - for (Iterator itr = grps.iterator(); itr.hasNext();) { + List<?> grps = getEntitledGroups(); + for (Iterator<?> itr = grps.iterator(); itr.hasNext();) { ServerGroup g = (ServerGroup) itr.next(); // The server's group type can be null if the user has created some @@ -1326,11 +1335,11 @@ public class Server extends BaseDomainHelper implements Identifiable { public Set<Entitlement> getEntitlements() { Set<Entitlement> entitlements = new HashSet<Entitlement>(); - Iterator i = getEntitledGroups().iterator(); + Iterator<EntitlementServerGroup> i = getEntitledGroups().iterator(); while (i.hasNext()) { - ServerGroup grp = (ServerGroup)i.next(); - entitlements.add(EntitlementManager.getByName( - grp.getGroupType().getLabel())); + ServerGroup grp = i.next(); + entitlements.add(EntitlementManager.getByName( + grp.getGroupType().getLabel())); } return entitlements; } @@ -1341,10 +1350,10 @@ public class Server extends BaseDomainHelper implements Identifiable { */ public Entitlement getBaseEntitlement() { Entitlement baseEntitlement = null; - Iterator i = getEntitledGroups().iterator(); + Iterator<EntitlementServerGroup> i = getEntitledGroups().iterator(); while (i.hasNext() && baseEntitlement == null) { - ServerGroupType sgt = ((ServerGroup) i.next()).getGroupType(); + ServerGroupType sgt = (i.next()).getGroupType(); if (sgt.isBase()) { baseEntitlement = EntitlementManager.getByName(sgt.getLabel()); @@ -1360,7 +1369,7 @@ public class Server extends BaseDomainHelper implements Identifiable { */ public void setBaseEntitlement(Entitlement baseIn) { ServerGroupType verify = ServerFactory. - lookupServerGroupTypeByLabel(baseIn.getLabel()); + lookupServerGroupTypeByLabel(baseIn.getLabel()); if (!verify.isBase()) { throw new IllegalArgumentException("baseIn is not a base entitlement"); } @@ -1383,9 +1392,9 @@ public class Server extends BaseDomainHelper implements Identifiable { * @return Set of entitlements that are add-on entitlements for the server */ public Set<Entitlement> getAddOnEntitlements() { - Set s = new HashSet(); + Set<Entitlement> s = new HashSet<Entitlement>(); - Iterator i = getEntitledGroups().iterator(); + Iterator<?> i = getEntitledGroups().iterator(); while (i.hasNext()) { ServerGroupType sgt = ((ServerGroup) i.next()).getGroupType(); @@ -1406,8 +1415,8 @@ public class Server extends BaseDomainHelper implements Identifiable { * labels. */ public String getAddOnEntitlementsAsText() { - Set addOnEntitlements = getAddOnEntitlements(); - Iterator iterator = addOnEntitlements.iterator(); + Set<?> addOnEntitlements = getAddOnEntitlements(); + Iterator<?> iterator = addOnEntitlements.iterator(); StringBuffer buffer = new StringBuffer(); Entitlement entitlement = null; @@ -1454,7 +1463,7 @@ public class Server extends BaseDomainHelper implements Identifiable { */ public boolean hasVirtualizationEntitlement() { return hasEntitlement(EntitlementManager.VIRTUALIZATION) || - hasEntitlement(EntitlementManager.VIRTUALIZATION_PLATFORM); + hasEntitlement(EntitlementManager.VIRTUALIZATION_PLATFORM); } /** @@ -1578,18 +1587,18 @@ public class Server extends BaseDomainHelper implements Identifiable { Server castOther = (Server) other; return new EqualsBuilder().append(os, castOther.getOs()) - .append(release, castOther.getRelease()) - .append(name, castOther.getName()) - .append(description, castOther.getDescription()) - .append(info, castOther.getInfo()) - .append(secret, castOther.getSecret()) - .append(autoDeliver, castOther.getAutoDeliver()) - .append(autoUpdate, castOther.getAutoUpdate()) - .append(runningKernel, castOther.getRunningKernel()) - .append(lastBoot, castOther.getLastBoot()) - .append(channelsChanged, castOther.getChannelsChanged()) - .append(getProxyInfo(), castOther.getProxyInfo()) - .isEquals(); + .append(release, castOther.getRelease()) + .append(name, castOther.getName()) + .append(description, castOther.getDescription()) + .append(info, castOther.getInfo()) + .append(secret, castOther.getSecret()) + .append(autoDeliver, castOther.getAutoDeliver()) + .append(autoUpdate, castOther.getAutoUpdate()) + .append(runningKernel, castOther.getRunningKernel()) + .append(lastBoot, castOther.getLastBoot()) + .append(channelsChanged, castOther.getChannelsChanged()) + .append(getProxyInfo(), castOther.getProxyInfo()) + .isEquals(); } /** @@ -1598,12 +1607,12 @@ public class Server extends BaseDomainHelper implements Identifiable { @Override public int hashCode() { return new HashCodeBuilder().append(id).append(digitalServerId).append(os) - .append(release).append(name).append(description) - .append(info).append(secret).append(autoDeliver) - .append(autoUpdate).append(runningKernel) - .append(lastBoot).append(channelsChanged). - append(getProxyInfo()) - .toHashCode(); + .append(release).append(name).append(description) + .append(info).append(secret).append(autoDeliver) + .append(autoUpdate).append(runningKernel) + .append(lastBoot).append(channelsChanged). + append(getProxyInfo()) + .toHashCode(); } /** @@ -1613,7 +1622,7 @@ public class Server extends BaseDomainHelper implements Identifiable { public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append( "id", id).append("org", org).append("name", name).append( - "description", description).toString(); + "description", description).toString(); } /** @@ -1693,11 +1702,11 @@ public class Server extends BaseDomainHelper implements Identifiable { } } if (retval.size() == 0) { - return Collections.EMPTY_SET; + return new HashSet<Channel>(); } return retval; } - return Collections.EMPTY_SET; + return new HashSet<Channel>(); } /** @@ -1720,7 +1729,7 @@ public class Server extends BaseDomainHelper implements Identifiable { * @return boolean true false if subbed or not. */ public boolean isSubscribed(Channel channelIn) { - Set childChannels = this.channels; + Set<Channel> childChannels = this.channels; if (childChannels != null) { return childChannels.contains(channelIn); } @@ -1747,9 +1756,10 @@ public class Server extends BaseDomainHelper implements Identifiable { * * @return Set of valid addon Entitlement instances for this server */ - public Set getValidAddonEntitlementsForServer() { - Set retval = new HashSet(); - Iterator i = this.getOrg().getValidAddOnEntitlementsForOrg().iterator(); + public Set<Entitlement> getValidAddonEntitlementsForServer() { + Set<Entitlement> retval = new HashSet<Entitlement>(); + Iterator<?> i = this.getOrg().getValidAddOnEntitlementsForOrg() + .iterator(); while (i.hasNext()) { Entitlement ent = (Entitlement) i.next(); if (this.isEntitlementAllowed(ent)) { @@ -1780,14 +1790,14 @@ public class Server extends BaseDomainHelper implements Identifiable { * Set the history events for this server * @param historyIn the List of history events */ - public void setHistory(Set historyIn) { + public void setHistory(Set<ServerHistoryEvent> historyIn) { this.history = historyIn; } /** * @return Returns the packages. */ - public Set getPackages() { + public Set<Package> getPackages() { return packages; } @@ -1795,7 +1805,7 @@ public class Server extends BaseDomainHelper implements Identifiable { /** * @param packagesIn The packages to set. */ - public void setPackages(Set packagesIn) { + public void setPackages(Set<Package> packagesIn) { this.packages = packagesIn; } diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 8309ed2..dc1cb52 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -25,6 +25,7 @@ import com.redhat.rhn.domain.org.CustomDataKey; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.HistoryEvent; import com.redhat.rhn.frontend.xmlrpc.ChannelSubscriptionException; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.UpdateBaseChannelCommand; @@ -75,9 +76,9 @@ public class ServerFactory extends HibernateFactory { Session session = HibernateFactory.getSession(); return (CustomDataValue) session.getNamedQuery( "CustomDataValue.findByServerAndKey").setEntity("server", - server).setEntity("key", key) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); + server).setEntity("key", key) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } /** @@ -150,6 +151,7 @@ public class ServerFactory extends HibernateFactory { * Get the Logger for the derived class so log messages show up on the * correct class */ + @Override protected Logger getLogger() { return log; } @@ -215,7 +217,7 @@ public class ServerFactory extends HibernateFactory { * @throws InvalidCertificateException thrown if certificate is invalid. */ public static Server lookupByCert(ClientCertificate clientcert) - throws InvalidCertificateException { + throws InvalidCertificateException { String idstr = clientcert.getValueByName(ClientCertificate.SYSTEM_ID); String[] parts = StringUtils.split(idstr, '-'); @@ -258,7 +260,7 @@ public class ServerFactory extends HibernateFactory { public static List<Server> lookupByIdsAndUser(List<Long> serverIds, User user) { Session session = HibernateFactory.getSession(); Query query = session.getNamedQuery("Server.findByIdsAndOrgId") - .setParameter("orgId", user.getOrg().getId()); + .setParameter("orgId", user.getOrg().getId()); if (serverIds.size() < 1000) { query.setParameterList("serverIds", serverIds); return query.list(); @@ -454,8 +456,8 @@ public class ServerFactory extends HibernateFactory { List result = session.getNamedQuery( "Server.findVirtHostsExceedingGuestLimitByOrg").setParameter( - "group_type_id", groupType.getId()).setParameter("org_id", - org.getId()).list(); + "group_type_id", groupType.getId()).setParameter("org_id", + org.getId()).list(); return convertToCountView(result); } @@ -518,11 +520,11 @@ public class ServerFactory extends HibernateFactory { * @param server the server who's history you want * @return A list of ServerHistoryEvents */ - public static List getServerHistory(Server server) { + public static List<HistoryEvent> getServerHistory(Server server) { SelectMode m = ModeFactory.getMode("Action_queries", "system_events_history"); - Map params = new HashMap(); + Map<String, Long> params = new HashMap<String, Long>(); params.put("sid", server.getId()); return m.execute(params); @@ -605,7 +607,7 @@ public class ServerFactory extends HibernateFactory { */ public static List<Server> listConfigEnabledSystems() { return singleton.listObjectsByNamedQuery( - "Server.listConfigEnabledSystems", Collections.EMPTY_MAP); + "Server.listConfigEnabledSystems", Collections.EMPTY_MAP); } /** @@ -616,7 +618,7 @@ public class ServerFactory extends HibernateFactory { */ public static List<Server> listConfigDiffEnabledSystems() { return singleton.listObjectsByNamedQuery( - "Server.listConfigDiffEnabledSystems", Collections.EMPTY_MAP); + "Server.listConfigDiffEnabledSystems", Collections.EMPTY_MAP); } /** @@ -712,24 +714,24 @@ public class ServerFactory extends HibernateFactory { if ((startDate != null) && (endDate != null)) { HibernateFactory.getSession() - .getNamedQuery("ServerSnapshot.deleteBetweenDates") - .setParameter("org", org) - .setParameter("start_date", startDate) - .setParameter("end_date", endDate) - .executeUpdate(); + .getNamedQuery("ServerSnapshot.deleteBetweenDates") + .setParameter("org", org) + .setParameter("start_date", startDate) + .setParameter("end_date", endDate) + .executeUpdate(); } else if (startDate != null) { HibernateFactory.getSession() - .getNamedQuery("ServerSnapshot.deleteAfterDate") - .setParameter("org", org) - .setParameter("start_date", startDate) - .executeUpdate(); + .getNamedQuery("ServerSnapshot.deleteAfterDate") + .setParameter("org", org) + .setParameter("start_date", startDate) + .executeUpdate(); } else { HibernateFactory.getSession() - .getNamedQuery("ServerSnapshot.delete") - .setParameter("org", org) - .executeUpdate(); + .getNamedQuery("ServerSnapshot.delete") + .setParameter("org", org) + .executeUpdate(); } } @@ -755,27 +757,27 @@ public class ServerFactory extends HibernateFactory { if ((startDate != null) && (endDate != null)) { HibernateFactory.getSession() - .getNamedQuery("ServerSnapshot.deleteForServerBetweenDates") - .setParameter("org", org) - .setParameter("server", server) - .setParameter("start_date", startDate) - .setParameter("end_date", endDate) - .executeUpdate(); + .getNamedQuery("ServerSnapshot.deleteForServerBetweenDates") + .setParameter("org", org) + .setParameter("server", server) + .setParameter("start_date", startDate) + .setParameter("end_date", endDate) + .executeUpdate(); } else if (startDate != null) { HibernateFactory.getSession() - .getNamedQuery("ServerSnapshot.deleteForServerAfterDate") - .setParameter("org", org) - .setParameter("server", server) - .setParameter("start_date", startDate) - .executeUpdate(); + .getNamedQuery("ServerSnapshot.deleteForServerAfterDate") + .setParameter("org", org) + .setParameter("server", server) + .setParameter("start_date", startDate) + .executeUpdate(); } else { HibernateFactory.getSession() - .getNamedQuery("ServerSnapshot.deleteForServer") - .setParameter("org", org) - .setParameter("server", server) - .executeUpdate(); + .getNamedQuery("ServerSnapshot.deleteForServer") + .setParameter("org", org) + .setParameter("server", server) + .executeUpdate(); } } @@ -821,7 +823,7 @@ public class ServerFactory extends HibernateFactory { */ public static void addTagToSnapshot(Long snpId, Long orgId, String tagName) { CallableMode m = ModeFactory.getCallableMode("System_queries", - "add_tag_to_snapshot"); + "add_tag_to_snapshot"); Map inParams = new HashMap(); inParams.put("snapshot_id", snpId); inParams.put("org_id", orgId); @@ -836,7 +838,7 @@ public class ServerFactory extends HibernateFactory { */ public static void removeTagFromSnapshot(Long serverId, SnapshotTag tag) { CallableMode m = ModeFactory.getCallableMode("System_queries", - "remove_tag_from_snapshot"); + "remove_tag_from_snapshot"); Map inParams = new HashMap(); inParams.put("server_id", serverId); inParams.put("tag_id", tag.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 5d5be49..eb0ff3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -58,10 +58,11 @@ import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.CPU; import com.redhat.rhn.domain.server.CustomDataValue; +import com.redhat.rhn.domain.server.Device; import com.redhat.rhn.domain.server.Dmi; -import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Location; import com.redhat.rhn.domain.server.ManagedServerGroup; +import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; @@ -74,12 +75,16 @@ import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.ActivationKeyDto; +import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.EssentialChannelDto; import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.dto.HistoryEvent; +import com.redhat.rhn.frontend.dto.ProfileOverviewDto; import com.redhat.rhn.frontend.dto.ServerPath; import com.redhat.rhn.frontend.dto.SystemCurrency; import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.frontend.dto.VirtualSystemOverview; import com.redhat.rhn.frontend.events.SsmDeleteServersEvent; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidActionTypeException; @@ -332,8 +337,9 @@ public class SystemHandler extends BaseHandler { * or channelLabel") * @xmlrpc.returntype #return_int_success() */ - public int setChildChannels(String sessionKey, Integer sid, List channelIdsOrLabels) - throws FaultException { + public int setChildChannels(String sessionKey, Integer sid, + List channelIdsOrLabels) + throws FaultException { //Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey); @@ -548,7 +554,7 @@ public class SystemHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); Channel baseChannel = server.getBaseChannel(); - List returnList = new ArrayList(); + List<Map<String, Object>> returnList = new ArrayList<Map<String, Object>>(); List<EssentialChannelDto> list = ChannelManager.listBaseChannelsForSystem(loggedInUser, server); @@ -598,13 +604,14 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listActiveSystems(String sessionKey) throws FaultException { + public List<SystemOverview> listActiveSystems(String sessionKey) + throws FaultException { User loggedInUser = getLoggedInUser(sessionKey); return SystemManager.systemListShortActive(loggedInUser, null); } - private Map createChannelMap(EssentialChannelDto channel, Boolean currentBase) { - Map ret = new HashMap(); + private Map<String, Object> createChannelMap(EssentialChannelDto channel, Boolean currentBase) { + Map<String, Object> ret = new HashMap<String, Object>(); ret.put("id", channel.getId()); ret.put("name", channel.getName()); @@ -678,7 +685,7 @@ public class SystemHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); Channel baseChannel = server.getBaseChannel(); - List returnList = new ArrayList(); + List<Map<String, Object>> returnList = new ArrayList<Map<String, Object>>(); //make sure channel is not null if (baseChannel == null) { @@ -693,7 +700,7 @@ public class SystemHandler extends BaseHandler { // Luckily, this list shouldn't be too long. for (Iterator itr = dr.iterator(); itr.hasNext();) { Map row = (Map) itr.next(); - Map channel = new HashMap(); + Map<String, Object> channel = new HashMap<String, Object>(); channel.put("id", row.get("id")); channel.put("label", row.get("label")); @@ -872,9 +879,10 @@ public class SystemHandler extends BaseHandler { * @param pkgEpoch The epoch of the package * @return Returns a map representing a package */ - private Map fillOutPackage(String pkgName, String pkgVersion, String pkgRelease, + private Map<String, String> fillOutPackage(String pkgName, + String pkgVersion, String pkgRelease, String pkgEpoch) { - Map map = new HashMap(); + Map<String, String> map = new HashMap<String, String>(); map.put("name", StringUtils.defaultString(pkgName)); map.put("version", StringUtils.defaultString(pkgVersion)); map.put("release", StringUtils.defaultString(pkgRelease)); @@ -1074,17 +1082,17 @@ public class SystemHandler extends BaseHandler { * #struct_end() * #array_end() */ - public List listLatestAvailablePackage(String sessionKey, List<Integer> systemIds, + public List<Map<String, Object>> listLatestAvailablePackage(String sessionKey, List<Integer> systemIds, String name) throws FaultException { // Get the logged in user User loggedInUser = getLoggedInUser(sessionKey); - List list = new ArrayList(); + List<Map<String, Object>> list = new ArrayList<Map<String, Object>>(); for (Integer sid : systemIds) { Server server = lookupServer(loggedInUser, sid); - Map systemMap = new HashMap(); + Map<String, Object> systemMap = new HashMap<String, Object>(); // get the package name ID Map pkgEvr = PackageManager.lookupEvrIdByPackageName(sid.longValue(), name); @@ -1097,7 +1105,7 @@ public class SystemHandler extends BaseHandler { // build the hash to return if (pkg != null) { - HashMap pkgMap = new HashMap(); + Map<String, Object> pkgMap = new HashMap<String, Object>(); pkgMap.put("id", pkg.getId()); pkgMap.put("name", pkg.getPackageName().getName()); pkgMap.put("version", pkg.getPackageEvr().getVersion()); @@ -1142,12 +1150,13 @@ public class SystemHandler extends BaseHandler { Server server = lookupServer(loggedInUser, sid); // A list of entitlements to return - List entitlements = new ArrayList(); + List<String> entitlements = new ArrayList<String>(); // Loop through the entitlement objects for this server and stick // label into the entitlements list to return - for (Iterator itr = server.getEntitlements().iterator(); itr.hasNext();) { - Entitlement entitlement = (Entitlement) itr.next(); + for (Iterator<Entitlement> itr = server.getEntitlements().iterator(); itr + .hasNext();) { + Entitlement entitlement = itr.next(); entitlements.add(entitlement.getLabel()); } @@ -1243,7 +1252,7 @@ public class SystemHandler extends BaseHandler { ") does not represent a host system"); } - List<String> availableGuests = new ArrayList(); + List<String> availableGuests = new ArrayList<String>(); for (VirtualInstance vi : server.getGuests()) { availableGuests.add(vi.getName()); @@ -1393,7 +1402,8 @@ public class SystemHandler extends BaseHandler { * #prop_desc("string", "hostname", "Hostname of server") * #struct_end() */ - public Map getNetwork(String sessionKey, Integer sid) throws FaultException { + public Map<String, String> getNetwork(String sessionKey, Integer sid) + throws FaultException { // Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); @@ -1404,7 +1414,7 @@ public class SystemHandler extends BaseHandler { String hostname = server.getHostname(); // Stick in a map and return - Map network = new HashMap(); + Map<String, String> network = new HashMap<String, String>(); network.put("ip", StringUtils.defaultString(ip)); network.put("ip6", StringUtils.defaultString(ip6)); network.put("hostname", StringUtils.defaultString(hostname)); @@ -1428,13 +1438,14 @@ public class SystemHandler extends BaseHandler { * $NetworkInterfaceSerializer * #array_end() */ - public List getNetworkDevices(String sessionKey, Integer sid) - throws FaultException { + public List<NetworkInterface> getNetworkDevices(String sessionKey, + Integer sid) + throws FaultException { // Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - Set devices = server.getNetworkInterfaces(); - return new ArrayList(devices); + Set<NetworkInterface> devices = server.getNetworkInterfaces(); + return new ArrayList<NetworkInterface>(devices); } /** @@ -1468,7 +1479,7 @@ public class SystemHandler extends BaseHandler { loggedInUser); - List servers = new ArrayList(1); + List<Server> servers = new ArrayList<Server>(1); servers.add(server); if (member) { @@ -1515,13 +1526,13 @@ public class SystemHandler extends BaseHandler { Server server = lookupServer(loggedInUser, sid); DataResult groups = SystemManager.availableSystemGroups(server, loggedInUser); - List returnList = new ArrayList(); + List<Map<String, Object>> returnList = new ArrayList<Map<String, Object>>(); // More stupid data munging... for (Iterator itr = groups.iterator(); itr.hasNext();) { Map map = (Map) itr.next(); - Map row = new HashMap(); + Map<String, Object> row = new HashMap<String, Object>(); row.put("id", map.get("id")); row.put("sgid", map.get("id").toString()); @@ -1550,7 +1561,8 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listUserSystems(String sessionKey, String login) throws FaultException { + public List<SystemOverview> listUserSystems(String sessionKey, String login) + throws FaultException { // Get the logged in user User loggedInUser = getLoggedInUser(sessionKey); User target = XmlRpcUserHelper.getInstance().lookupTargetUser(loggedInUser, login); @@ -1569,7 +1581,7 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listUserSystems(String sessionKey) { + public List<SystemOverview> listUserSystems(String sessionKey) { // Get the logged in user User loggedInUser = getLoggedInUser(sessionKey); return SystemManager.systemListShort(loggedInUser, null); @@ -1605,13 +1617,13 @@ public class SystemHandler extends BaseHandler { * #struct_end() * @xmlrpc.returntype #return_int_success() */ - public int setCustomValues(String sessionKey, Integer sid, Map values) + public int setCustomValues(String sessionKey, Integer sid, Map<String, String> values) throws FaultException { // Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); Org org = loggedInUser.getOrg(); - List skippedKeys = new ArrayList(); + List<String> skippedKeys = new ArrayList<String>(); /* * Loop through the map the user sent us. Check to make sure that the org has the @@ -1619,9 +1631,9 @@ public class SystemHandler extends BaseHandler { * the skippedKeys list so we can throw a fault exception later and tell the user * which keys were skipped. */ - Set keys = values.keySet(); - for (Iterator itr = keys.iterator(); itr.hasNext();) { - String label = (String) itr.next(); + Set<String> keys = values.keySet(); + for (Iterator<String> itr = keys.iterator(); itr.hasNext();) { + String label = itr.next(); if (org.hasCustomDataKey(label)) { server.addCustomDataValue(label, values.get(label).toString(), loggedInUser); @@ -1639,8 +1651,8 @@ public class SystemHandler extends BaseHandler { StringBuffer msg = new StringBuffer("One or more of the following " + "custom info fields was not defined: "); - for (Iterator itr = skippedKeys.iterator(); itr.hasNext();) { - String label = (String) itr.next(); + for (Iterator<String> itr = skippedKeys.iterator(); itr.hasNext();) { + String label = itr.next(); msg.append("\n" + label); } @@ -1666,20 +1678,20 @@ public class SystemHandler extends BaseHandler { * #prop("string", "custom info label") * #struct_end() */ - public Map getCustomValues(String sessionKey, Integer sid) throws FaultException { + public Map<String, String> getCustomValues(String sessionKey, Integer sid) throws FaultException { // Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - Set customDataValues = server.getCustomDataValues(); - Map returnMap = new HashMap(); + Set<CustomDataValue> customDataValues = server.getCustomDataValues(); + Map<String, String> returnMap = new HashMap<String, String>(); /* * Loop through the customDataValues set for the server. We're only interested in * the key and value information from the CustomDataValue object. */ - for (Iterator itr = customDataValues.iterator(); itr.hasNext();) { - CustomDataValue val = (CustomDataValue) itr.next(); + for (Iterator<CustomDataValue> itr = customDataValues.iterator(); itr.hasNext();) { + CustomDataValue val = itr.next(); if (val.getValue() != null) { returnMap.put(val.getKey().getLabel(), val.getValue()); } @@ -1955,7 +1967,7 @@ public class SystemHandler extends BaseHandler { * #struct_end() * #array_end() */ - public List listSystemEvents(String sessionKey, Integer sid) { + public List<Map<String, Object>> listSystemEvents(String sessionKey, Integer sid) { // Get the logged in user and server User loggedInUser = getLoggedInUser(sessionKey); @@ -1971,10 +1983,10 @@ public class SystemHandler extends BaseHandler { // information like, the specific errata applied, pkgs installed/removed/ // upgraded/verified, config files uploaded, deployed or compared...etc. - List<Map> results = new ArrayList<Map>(); + List<Map<String, Object>> results = new ArrayList<Map<String, Object>>(); for (ServerAction sAction : sActions) { - Map result = new HashMap(); + Map<String, Object> result = new HashMap<String, Object>(); Action action = sAction.getParentAction(); @@ -2366,7 +2378,7 @@ public class SystemHandler extends BaseHandler { if (ve != null) { throw new FaultException(-2, "provisionError", LocalizationService.getInstance().getMessage( - ve.getKey(), ve.getValues())); + ve.getKey(), ve.getValues())); } return 1; @@ -2437,10 +2449,10 @@ public class SystemHandler extends BaseHandler { * successfully checked in") * #struct_end() */ - public Map getName(String sessionKey, Integer serverId) { + public Map<String, Object> getName(String sessionKey, Integer serverId) { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, serverId); - Map name = new HashMap(); + Map<String, Object> name = new HashMap<String, Object>(); name.put("id", server.getId()); name.put("name", server.getName()); name.put("last_checkin", server.getLastCheckin()); @@ -2486,13 +2498,13 @@ public class SystemHandler extends BaseHandler { public List<Channel> listSubscribedChildChannels(String sessionKey, Integer sid) { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - Set childChannels = server.getChildChannels(); + Set<Channel> childChannels = server.getChildChannels(); if (childChannels == null) { - return new ArrayList(); + return new ArrayList<Channel>(); } - return new ArrayList(childChannels); + return new ArrayList<Channel>(childChannels); } @@ -2517,10 +2529,10 @@ public class SystemHandler extends BaseHandler { * #array_end() * */ - public List searchByName(String sessionKey, String regexp) { + public List<SystemOverview> searchByName(String sessionKey, String regexp) { User loggedInUser = getLoggedInUser(sessionKey); List<SystemOverview> systems = getUserSystemsList(loggedInUser); - List returnList = new ArrayList(); + List<SystemOverview> returnList = new ArrayList<SystemOverview>(); Pattern pattern = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE); @@ -2608,7 +2620,7 @@ public class SystemHandler extends BaseHandler { public Object[] getEventHistory(String sessionKey, Integer sid) { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - List history = ServerFactory.getServerHistory(server); + List<HistoryEvent> history = ServerFactory.getServerHistory(server); return history.toArray(); } @@ -2633,7 +2645,8 @@ public class SystemHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - DataResult dr = SystemManager.relevantErrata(loggedInUser, server.getId()); + DataResult<ErrataOverview> dr = SystemManager.relevantErrata( + loggedInUser, server.getId()); return dr.toArray(); } @@ -2714,7 +2727,8 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param #array_single("int", "errataId") * @xmlrpc.returntype #return_int_success() */ - public int scheduleApplyErrata(String sessionKey, List serverIds, List errataIds) { + public int scheduleApplyErrata(String sessionKey, List<Integer> serverIds, + List<Integer> errataIds) { return scheduleApplyErrata(sessionKey, serverIds, errataIds, null); } @@ -2734,13 +2748,13 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param dateTime.iso8601 earliestOccurrence * @xmlrpc.returntype #return_int_success() */ - public int scheduleApplyErrata(String sessionKey, List serverIds, List errataIds, + public int scheduleApplyErrata(String sessionKey, List<Integer> serverIds, List<Integer> errataIds, Date earliestOccurrence) { // we need long values to pass to ErrataManager.applyErrataHelper - List<Long> longServerIds = new ArrayList(); - for (Iterator it = serverIds.iterator(); it.hasNext();) { - longServerIds.add(new Long((Integer) it.next())); + List<Long> longServerIds = new ArrayList<Long>(); + for (Iterator<Integer> it = serverIds.iterator(); it.hasNext();) { + longServerIds.add(new Long(it.next())); } ErrataManager.applyErrataHelper(getLoggedInUser(sessionKey), @@ -2764,7 +2778,8 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.returntype #return_int_success() */ @Deprecated - public int applyErrata(String sessionKey, Integer sid, List errataIds) { + public int applyErrata(String sessionKey, Integer sid, + List<Integer> errataIds) { scheduleApplyErrata(sessionKey, sid, errataIds); return 1; } @@ -2783,8 +2798,9 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param #array_single("int", "errataId") * @xmlrpc.returntype #return_int_success() */ - public int scheduleApplyErrata(String sessionKey, Integer sid, List errataIds) { - List serverIds = new ArrayList(); + public int scheduleApplyErrata(String sessionKey, Integer sid, + List<Integer> errataIds) { + List<Integer> serverIds = new ArrayList<Integer>(); serverIds.add(sid); return scheduleApplyErrata(sessionKey, serverIds, errataIds); @@ -2806,9 +2822,9 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param dateTime.iso8601 earliestOccurrence * @xmlrpc.returntype #return_int_success() */ - public int scheduleApplyErrata(String sessionKey, Integer sid, List errataIds, + public int scheduleApplyErrata(String sessionKey, Integer sid, List<Integer> errataIds, Date earliestOccurrence) { - List serverIds = new ArrayList(); + List<Integer> serverIds = new ArrayList<Integer>(); serverIds.add(sid); return scheduleApplyErrata(sessionKey, serverIds, errataIds, earliestOccurrence); @@ -2882,7 +2898,7 @@ public class SystemHandler extends BaseHandler { Server server = lookupServer(loggedInUser, sid); Dmi dmi = server.getDmi(); if (dmi == null) { - return new HashMap(); + return new HashMap<String, String>(); } return dmi; } @@ -2905,7 +2921,7 @@ public class SystemHandler extends BaseHandler { Server server = lookupServer(loggedInUser, sid); CPU cpu = server.getCpu(); if (cpu == null) { - return new HashMap(); + return new HashMap<String, String>(); } return cpu; } @@ -2926,10 +2942,10 @@ public class SystemHandler extends BaseHandler { * #prop_desc("int", "swap", "The amount of swap space in MB.") * #struct_end() */ - public Map getMemory(String sessionKey, Integer sid) { + public Map<String, Long> getMemory(String sessionKey, Integer sid) { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - Map memory = new HashMap(); + Map<String, Long> memory = new HashMap<String, Long>(); memory.put("swap", new Long(server.getSwap())); memory.put("ram", new Long(server.getRam())); return memory; @@ -2954,7 +2970,7 @@ public class SystemHandler extends BaseHandler { public Object[] getDevices(String sessionKey, Integer sid) { User loggedInUser = getLoggedInUser(sessionKey); Server server = lookupServer(loggedInUser, sid); - Set devices = server.getDevices(); + Set<Device> devices = server.getDevices(); return devices.toArray(); } @@ -2974,7 +2990,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param dateTime.iso8601 earliestOccurrence * @xmlrpc.returntype #return_int_success() */ - public int schedulePackageInstall(String sessionKey, Integer sid, List packageIds, + public int schedulePackageInstall(String sessionKey, Integer sid, List<Integer> packageIds, Date earliestOccurrence) { User loggedInUser = getLoggedInUser(sessionKey); Server server = SystemManager.lookupByIdAndUser(new Long(sid.longValue()), @@ -2988,10 +3004,10 @@ public class SystemHandler extends BaseHandler { } // Build a list of maps in the format the ActionManager wants: - List packageMaps = new LinkedList(); - for (Iterator it = packageIds.iterator(); it.hasNext();) { - Integer pkgId = (Integer)it.next(); - Map pkgMap = new HashMap(); + List<Map<String, Long>> packageMaps = new LinkedList<Map<String, Long>>(); + for (Iterator<Integer> it = packageIds.iterator(); it.hasNext();) { + Integer pkgId = it.next(); + Map<String, Long> pkgMap = new HashMap<String, Long>(); Package p = PackageManager.lookupByIdAndUser(new Long(pkgId.longValue()), loggedInUser); @@ -3033,7 +3049,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.returntype int - ID of the action scheduled, otherwise exception thrown * on error */ - public int schedulePackageRemove(String sessionKey, Integer sid, List packageIds, + public int schedulePackageRemove(String sessionKey, Integer sid, List<Integer> packageIds, Date earliestOccurrence) { User loggedInUser = getLoggedInUser(sessionKey); @@ -3048,10 +3064,10 @@ public class SystemHandler extends BaseHandler { } // Build a list of maps in the format the ActionManager wants: - List packageMaps = new LinkedList(); - for (Iterator it = packageIds.iterator(); it.hasNext();) { - Integer pkgId = (Integer)it.next(); - Map pkgMap = new HashMap(); + List<Map<String, Long>> packageMaps = new LinkedList<Map<String, Long>>(); + for (Iterator<Integer> it = packageIds.iterator(); it.hasNext();) { + Integer pkgId = it.next(); + Map<String, Long> pkgMap = new HashMap<String, Long>(); Package p = PackageManager.lookupByIdAndUser(new Long(pkgId.longValue()), loggedInUser); @@ -3134,15 +3150,15 @@ public class SystemHandler extends BaseHandler { Channel channel = ChannelFactory.lookupByLabelAndUser(channelLabel, loggedInUser); - Set chanPacks = channel.getPackages(); - Set sysPacks = server.getPackages(); - Set intersection = new HashSet(); + Set<Package> chanPacks = channel.getPackages(); + Set<Package> sysPacks = server.getPackages(); + Set<Package> intersection = new HashSet<Package>(); - for (Iterator it = sysPacks.iterator(); it.hasNext();) { - InstalledPackage insPack = (InstalledPackage) it.next(); + for (Iterator<Package> it = sysPacks.iterator(); it.hasNext();) { + Package insPack = it.next(); - for (Iterator chanIt = chanPacks.iterator(); chanIt.hasNext();) { - Package chanPack = (Package) chanIt.next(); + for (Iterator<Package> chanIt = chanPacks.iterator(); chanIt.hasNext();) { + Package chanPack = chanIt.next(); if (insPack.equals(chanPack)) { intersection.add(chanPack); @@ -3234,7 +3250,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.returntype int - ID of the script run action created. Can be used to fetch * results with system.getScriptResults. */ - public Integer scheduleScriptRun(String sessionKey, List systemIds, String username, + public Integer scheduleScriptRun(String sessionKey, List<Integer> systemIds, String username, String groupname, Integer timeout, String script, Date earliest) { User loggedInUser = getLoggedInUser(sessionKey); @@ -3243,10 +3259,10 @@ public class SystemHandler extends BaseHandler { new Long(timeout.longValue()), script); ScriptAction action = null; - List servers = new ArrayList(); + List<Server> servers = new ArrayList<Server>(); - for (Iterator sysIter = systemIds.iterator(); sysIter.hasNext();) { - Integer sidAsInt = (Integer) sysIter.next(); + for (Iterator<Integer> sysIter = systemIds.iterator(); sysIter.hasNext();) { + Integer sidAsInt = sysIter.next(); Long sid = new Long(sidAsInt.longValue()); Server server = null; @@ -3303,7 +3319,7 @@ public class SystemHandler extends BaseHandler { public Integer scheduleScriptRun(String sessionKey, Integer sid, String username, String groupname, Integer timeout, String script, Date earliest) { - List systemIds = new ArrayList(); + List<Integer> systemIds = new ArrayList<Integer>(); systemIds.add(sid); return scheduleScriptRun(sessionKey, systemIds, username, groupname, timeout, @@ -3337,8 +3353,9 @@ public class SystemHandler extends BaseHandler { } List<ScriptResult> results = new LinkedList<ScriptResult>(); - for (Iterator it = details.getResults().iterator(); it.hasNext();) { - ScriptResult r = (ScriptResult)it.next(); + for (Iterator<ScriptResult> it = details.getResults().iterator(); it + .hasNext();) { + ScriptResult r = it.next(); results.add(r); } return results.toArray(); @@ -3363,8 +3380,8 @@ public class SystemHandler extends BaseHandler { * #array_single("$ScriptResultSerializer", "result") * #struct_end() */ - public Map getScriptActionDetails(String sessionKey, Integer actionId) { - Map retDetails = new HashMap(); + public Map<String, Object> getScriptActionDetails(String sessionKey, Integer actionId) { + Map<String, Object> retDetails = new HashMap<String, Object>(); User loggedInUser = getLoggedInUser(sessionKey); ScriptRunAction action = lookupScriptRunAction(actionId, loggedInUser); ScriptActionDetails details = action.getScriptActionDetails(); @@ -3376,8 +3393,9 @@ public class SystemHandler extends BaseHandler { if (details.getResults() != null) { List<ScriptResult> results = new LinkedList<ScriptResult>(); - for (Iterator it = details.getResults().iterator(); it.hasNext();) { - ScriptResult r = (ScriptResult)it.next(); + for (Iterator<ScriptResult> it = details.getResults().iterator(); it + .hasNext();) { + ScriptResult r = it.next(); results.add(r); } retDetails.put("result", results.toArray()); @@ -3485,7 +3503,8 @@ public class SystemHandler extends BaseHandler { * * @xmlrpc.returntype #return_int_success() */ - public Integer setDetails(String sessionKey, Integer serverId, Map details) { + public Integer setDetails(String sessionKey, Integer serverId, + Map<String, Object> details) { // confirm that the user only provided valid keys in the map Set<String> validKeys = new HashSet<String>(); @@ -3576,7 +3595,8 @@ public class SystemHandler extends BaseHandler { } if (details.containsKey("country")) { String country = (String)details.get("country"); - Map map = LocalizationService.getInstance().availableCountries(); + Map<String, String> map = LocalizationService.getInstance() + .availableCountries(); if (country.length() > 2 || !map.containsValue(country)) { throw new UnrecognizedCountryException(country); @@ -3659,7 +3679,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param #array_single("string", " entitlementLabel") * @xmlrpc.returntype #return_int_success() */ - public int addEntitlements(String sessionKey, Integer serverId, List entitlements) { + public int addEntitlements(String sessionKey, Integer serverId, List<String> entitlements) { boolean needsSnapshot = false; User loggedInUser = getLoggedInUser(sessionKey); Server server = null; @@ -3686,7 +3706,7 @@ public class SystemHandler extends BaseHandler { throw new InvalidEntitlementException(); } - List addOnEnts = new LinkedList(entitlements); + List<String> addOnEnts = new LinkedList<String>(entitlements); // first process base entitlements for (Entitlement en : EntitlementManager.getBaseEntitlements()) { if (addOnEnts.contains(en.getLabel())) { @@ -3700,9 +3720,9 @@ public class SystemHandler extends BaseHandler { throw new InvalidEntitlementException("Base entitlement missing"); } - for (Iterator it = addOnEnts.iterator(); it.hasNext();) { + for (Iterator<String> it = addOnEnts.iterator(); it.hasNext();) { - Entitlement ent = EntitlementManager.getByName((String)it.next()); + Entitlement ent = EntitlementManager.getByName(it.next()); // Ignore if the system already has this entitlement: if (server.hasEntitlement(ent)) { @@ -3746,7 +3766,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param #array_single("string", "entitlement_label") * @xmlrpc.returntype #return_int_success() */ - public int removeEntitlements(String sessionKey, Integer serverId, List entitlements) { + public int removeEntitlements(String sessionKey, Integer serverId, List<String> entitlements) { boolean needsSnapshot = false; User loggedInUser = getLoggedInUser(sessionKey); Server server = null; @@ -3760,10 +3780,10 @@ public class SystemHandler extends BaseHandler { validateEntitlements(entitlements); - List<Entitlement> baseEnts = new LinkedList(); + List<Entitlement> baseEnts = new LinkedList<Entitlement>(); - for (Iterator it = entitlements.iterator(); it.hasNext();) { - Entitlement ent = EntitlementManager.getByName((String)it.next()); + for (Iterator<String> it = entitlements.iterator(); it.hasNext();) { + Entitlement ent = EntitlementManager.getByName(it.next()); if (ent.isBase()) { baseEnts.add(ent); continue; @@ -3803,7 +3823,7 @@ public class SystemHandler extends BaseHandler { public Object[] listPackageProfiles(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); - DataResult profiles = ProfileManager.listProfileOverviews( + DataResult<ProfileOverviewDto> profiles = ProfileManager.listProfileOverviews( loggedInUser.getOrg().getId()); return profiles.toArray(); @@ -3931,7 +3951,8 @@ public class SystemHandler extends BaseHandler { */ public Object[] listOutOfDateSystems(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); - DataResult list = SystemManager.outOfDateList(loggedInUser, null); + DataResult<SystemOverview> list = SystemManager.outOfDateList( + loggedInUser, null); return list.toArray(); } @@ -3956,7 +3977,8 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.returntype #return_int_success() */ public int scheduleSyncPackagesWithSystem(String sessionKey, Integer targetServerId, - Integer sourceServerId, List packageIds, Date earliest) { + Integer sourceServerId, + List<Integer> packageIds, Date earliest) { User loggedInUser = getLoggedInUser(sessionKey); Server target = null; @@ -3977,9 +3999,9 @@ public class SystemHandler extends BaseHandler { // For each of the package ids provided, retrieve the pkg id combo // which includes name_id|evr_id|arch_id - Set pkgIdCombos = new HashSet(); - for (Iterator it = packageIds.iterator(); it.hasNext();) { - Integer i = (Integer)it.next(); + Set<String> pkgIdCombos = new HashSet<String>(); + for (Iterator<Integer> it = packageIds.iterator(); it.hasNext();) { + Integer i = it.next(); Package pkg = PackageManager.lookupByIdAndUser(i.longValue(), loggedInUser); @@ -4051,7 +4073,7 @@ public class SystemHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); List <Server> servers = ServerFactory.listUngroupedSystems(loggedInUser); - List <Map> serverMaps = new ArrayList<Map>(); + List<Map<String, Object>> serverMaps = new ArrayList<Map<String, Object>>(); XmlRpcSystemHelper helper = XmlRpcSystemHelper.getInstance(); for (Server server : servers) { serverMaps.add(helper.format(server)); @@ -4077,7 +4099,7 @@ public class SystemHandler extends BaseHandler { Server server = lookupServer(loggedInUser, sid); Channel base = server.getBaseChannel(); if (base == null) { - return new HashMap(); + return new HashMap<String, String>(); } return base; } @@ -4096,7 +4118,7 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listInactiveSystems(String sessionKey) { + public List<SystemOverview> listInactiveSystems(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); return SystemManager.systemListShortInactive(loggedInUser, null); } @@ -4117,7 +4139,8 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listInactiveSystems(String sessionKey, Integer days) { + public List<SystemOverview> listInactiveSystems(String sessionKey, + Integer days) { User loggedInUser = getLoggedInUser(sessionKey); return SystemManager.systemListShortInactive(loggedInUser, days, null); } @@ -4154,7 +4177,8 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listSystemsWithPackage(String sessionKey, Integer pid) { + public List<SystemOverview> listSystemsWithPackage(String sessionKey, + Integer pid) { User loggedInUser = getLoggedInUser(sessionKey); Package pack = PackageFactory.lookupByIdAndOrg( pid.longValue(), loggedInUser.getOrg()); @@ -4183,7 +4207,8 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listSystemsWithPackage(String sessionKey, String name, String version, + public List<SystemOverview> listSystemsWithPackage(String sessionKey, + String name, String version, String release) { User loggedInUser = getLoggedInUser(sessionKey); return SystemManager.listSystemsWithPackage(loggedInUser, @@ -4202,7 +4227,7 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public List listVirtualHosts(String sessionKey) { + public List<SystemOverview> listVirtualHosts(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); return SystemManager.listVirtualHosts(loggedInUser); } @@ -4221,9 +4246,11 @@ public class SystemHandler extends BaseHandler { * $VirtualSystemOverviewSerializer * #array_end() */ - public List listVirtualGuests(String sessionKey, Integer sid) { + public List<VirtualSystemOverview> listVirtualGuests(String sessionKey, + Integer sid) { User loggedInUser = getLoggedInUser(sessionKey); - DataResult result = SystemManager.virtualGuestsForHostList(loggedInUser, + DataResult<VirtualSystemOverview> result = SystemManager + .virtualGuestsForHostList(loggedInUser, sid.longValue(), null); result.elaborate(); return result; @@ -4251,7 +4278,7 @@ public class SystemHandler extends BaseHandler { VirtualInstance vi = VirtualInstanceFactory.getInstance().lookupByGuestId( loggedInUser.getOrg(), sid.longValue()); - Map context = new HashMap(); + Map<String, String> context = new HashMap<String, String>(); //convert from mega to kilo bytes context.put(VirtualizationSetMemoryAction.SET_MEMORY_STRING, new Integer(memory * 1024).toString()); @@ -4290,7 +4317,7 @@ public class SystemHandler extends BaseHandler { VirtualInstance vi = VirtualInstanceFactory.getInstance().lookupByGuestId( loggedInUser.getOrg(), sid.longValue()); - Map context = new HashMap(); + Map<String, String> context = new HashMap<String, String>(); context.put(VirtualizationSetVcpusAction.SET_CPU_STRING, numOfCpus.toString()); VirtualizationActionCommand cmd = new VirtualizationActionCommand(loggedInUser, @@ -4352,7 +4379,7 @@ public class SystemHandler extends BaseHandler { action, vi.getHostSystem(), vi.getUuid(), - new HashMap()); + new HashMap<String, String>()); cmd.store(); return cmd.getAction().getId().intValue(); } @@ -4642,7 +4669,7 @@ public class SystemHandler extends BaseHandler { * #prop_array_end() * #struct_end() */ - public Map getVariables(String sessionKey, Integer serverId) { + public Map<String, Object> getVariables(String sessionKey, Integer serverId) { User loggedInUser = getLoggedInUser(sessionKey); @@ -4665,7 +4692,7 @@ public class SystemHandler extends BaseHandler { throw new NoSuchCobblerSystemRecordException(); } - Map vars = new HashMap(); + Map<String, Object> vars = new HashMap<String, Object>(); vars.put("netboot", rec.isNetbootEnabled()); vars.put("variables", rec.getKsMeta()); @@ -4736,10 +4763,11 @@ public class SystemHandler extends BaseHandler { } - private List transformDuplicate(List<DuplicateSystemGrouping> list, String propName) { - List toRet = new ArrayList(); + private List<Map<String, Object>> transformDuplicate( + List<DuplicateSystemGrouping> list, String propName) { + List<Map<String, Object>> toRet = new ArrayList<Map<String, Object>>(); for (DuplicateSystemGrouping b : list) { - Map map = new HashMap(); + Map<String, Object> map = new HashMap<String, Object>(); map.put(propName, b.getKey()); map.put("systems", b.getSystems()); toRet.add(map); @@ -4765,7 +4793,7 @@ public class SystemHandler extends BaseHandler { * #struct_end() * #array_end() **/ - public List listDuplicatesByIp(String sessionKey) { + public List<Map<String, Object>> listDuplicatesByIp(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); List<DuplicateSystemGrouping> list = SystemManager.listDuplicatesByIP(loggedInUser, 0L); @@ -4815,7 +4843,7 @@ public class SystemHandler extends BaseHandler { * #struct_end() * #array_end() **/ - public List listDuplicatesByHostname(String sessionKey) { + public List<Map<String, Object>> listDuplicatesByHostname(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); List<DuplicateSystemGrouping> list = SystemManager.listDuplicatesByHostname(loggedInUser, 0L); @@ -4836,7 +4864,7 @@ public class SystemHandler extends BaseHandler { * $ChannelFamilySystemGroupSerializer * #array_end() **/ - public List listFlexGuests(String sessionKey) { + public List<ChannelFamilySystemGroup> listFlexGuests(String sessionKey) { User user = getLoggedInUser(sessionKey); return VirtualizationEntitlementsManager.getInstance().listFlexGuests(user); } @@ -4854,7 +4882,8 @@ public class SystemHandler extends BaseHandler { * $ChannelFamilySystemGroupSerializer * #array_end() **/ - public List listEligibleFlexGuests(String sessionKey) { + public List<ChannelFamilySystemGroup> listEligibleFlexGuests( + String sessionKey) { User user = getLoggedInUser(sessionKey); return VirtualizationEntitlementsManager. getInstance().listEligibleFlexGuests(user); @@ -4877,7 +4906,7 @@ public class SystemHandler extends BaseHandler { * that were converted to use flex entitlement. */ public int convertToFlexEntitlement(String sessionKey, - List serverIds, String channelFamilyLabel) { + List<Integer> serverIds, String channelFamilyLabel) { User user = getLoggedInUser(sessionKey); ChannelFamily cf = ChannelFamilyFactory.lookupByLabel( channelFamilyLabel, user.getOrg()); @@ -4885,9 +4914,9 @@ public class SystemHandler extends BaseHandler { throw new InvalidEntitlementException(); } // we need long values to pass - List<Long> longServerIds = new ArrayList(); - for (Iterator it = serverIds.iterator(); it.hasNext();) { - longServerIds.add(new Long((Integer) it.next())); + List<Long> longServerIds = new ArrayList<Long>(); + for (Iterator<Integer> it = serverIds.iterator(); it.hasNext();) { + longServerIds.add(new Long(it.next())); } return VirtualizationEntitlementsManager.getInstance(). convertToFlex(longServerIds, cf.getId(), user).size(); @@ -4902,9 +4931,9 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.param #param("string", "sessionKey") * @xmlrpc.returntype Map of score multipliers */ - public Map getSystemCurrencyMultipliers(String sessionKey) { + public Map<String, Integer> getSystemCurrencyMultipliers(String sessionKey) { getLoggedInUser(sessionKey); - Map multipliers = new HashMap(); + Map<String, Integer> multipliers = new HashMap<String, Integer>(); multipliers.put("scCrit", ConfigDefaults.get().getSCCrit()); multipliers.put("scImp", ConfigDefaults.get().getSCImp()); multipliers.put("scMod", ConfigDefaults.get().getSCMod()); @@ -4937,13 +4966,13 @@ public class SystemHandler extends BaseHandler { * #struct_end() * #array_end() */ - public List getSystemCurrencyScores(String sessionKey) { + public List<Map<String, Long>> getSystemCurrencyScores(String sessionKey) { User user = getLoggedInUser(sessionKey); DataResult<SystemCurrency> dr = SystemManager.systemCurrencyList(user, null); - List l = new ArrayList(); - for (Iterator it = dr.iterator(); it.hasNext();) { - Map m = new HashMap(); - SystemCurrency s = (SystemCurrency) it.next(); + List<Map<String, Long>> l = new ArrayList<Map<String, Long>>(); + for (Iterator<SystemCurrency> it = dr.iterator(); it.hasNext();) { + Map<String, Long> m = new HashMap<String, Long>(); + SystemCurrency s = it.next(); m.put("sid", s.getId()); m.put("crit", s.getCritical()); m.put("imp", s.getImportant()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java index 749a3f2..556ec53 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java @@ -85,7 +85,7 @@ public class XmlRpcSystemHelper { * corresponding to sid cannot be found. */ public List<Server> lookupServers(User user, - List< ? extends Number> serverIds) throws NoSuchSystemException { + List< ? extends Number> serverIds) throws NoSuchSystemException { List<Server> servers = new LinkedList<Server>(); for (Number sid : serverIds) { servers.add(lookupServer(user, sid)); @@ -101,8 +101,8 @@ public class XmlRpcSystemHelper { * @param server server to format * @return a Map with just enough info to get details on a server */ - public Map format(Server server) { - Map serverMap = new HashMap(); + public Map<String, Object> format(Server server) { + Map<String, Object> serverMap = new HashMap<String, Object>(); serverMap.put("id", server.getId()); serverMap.put("name", server.getName()); serverMap.put("last_checkin", server.getLastCheckin()); diff --git a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java index e81a919..80a89c0 100644 --- a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java +++ b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java @@ -36,7 +36,9 @@ import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; import com.redhat.rhn.frontend.dto.PackageMetadata; +import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.dto.ProfileOverviewDto; +import com.redhat.rhn.frontend.dto.ProfilePackageOverviewDto; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.MissingEntitlementException; @@ -134,14 +136,14 @@ public class ProfileManager extends BaseManager { */ public static void copyFrom(Server server, Profile profile) { WriteMode m = ModeFactory.getWriteMode("profile_queries", - "delete_package_profile"); + "delete_package_profile"); Map params = new HashMap(); params.put("sid", server.getId()); params.put("prid", profile.getId()); m.executeUpdate(params); m = ModeFactory.getWriteMode("profile_queries", - "insert_package_profile"); + "insert_package_profile"); params = new HashMap(); params.put("sid", server.getId()); params.put("prid", profile.getId()); @@ -252,7 +254,7 @@ public class ProfileManager extends BaseManager { log.debug("Checking on : " + profpkgitem.getEvr()); if (compareArch(syspkgitem.getArch(), - profpkgitem.getArch()) != 0) { + profpkgitem.getArch()) != 0) { // if the arch of the packages doesn't match, we don't // need to compare the EVR; therefore, if at end of the // list, add both packages to the result @@ -277,7 +279,7 @@ public class ProfileManager extends BaseManager { // If the package exists on one but not the other we // need to add it to the compare map if (pm.getComparisonAsInt() != - PackageMetadata.KEY_NO_DIFF) { + PackageMetadata.KEY_NO_DIFF) { if ((j + 1) == plist.size()) { // this is the last entry in plist; therefore, @@ -427,7 +429,7 @@ public class ProfileManager extends BaseManager { */ private static int compareArch(String a1, String a2) { if (((a1 == null) && (a2 != null)) || - ((a1 != null) && (a2 == null))) { + ((a1 != null) && (a2 == null))) { return 1; } @@ -725,8 +727,8 @@ public class ProfileManager extends BaseManager { if (log.isDebugEnabled()) { log.debug("Package [" + pm.getName() + - "] is in Channel [" + validChannel.getId() + - "]"); + "] is in Channel [" + validChannel.getId() + + "]"); } neededChannels.add(validChannel); @@ -806,8 +808,8 @@ public class ProfileManager extends BaseManager { if (log.isDebugEnabled()) { log.debug("Package [" + pm.getName() + - "] is in Channel [" + validChannel.getId() + - "]"); + "] is in Channel [" + validChannel.getId() + + "]"); } pm.addChannel(validChannel); @@ -901,8 +903,8 @@ public class ProfileManager extends BaseManager { if (log.isDebugEnabled()) { log.debug("Package [" + pm.getName() + - "] is in Channel [" + validChannel.getId() + - "]"); + "] is in Channel [" + validChannel.getId() + + "]"); } neededChannels.add(validChannel); @@ -1072,7 +1074,7 @@ public class ProfileManager extends BaseManager { private static DataResult getPackagesInChannelByIdCombo(Long cid) { SelectMode m = ModeFactory.getMode("Package_queries", - "packages_in_channel_by_id_combo"); + "packages_in_channel_by_id_combo"); Map params = new HashMap(); Map elabParams = new HashMap(); params.put("cid", cid); @@ -1116,8 +1118,8 @@ public class ProfileManager extends BaseManager { for (int i = 0; i < pkgsInChannel.size(); i++) { PackageListItem pkgInChannel = pkgsInChannel.get(i); if (pkgInChannel.getVersion().equals(pm.getVersion()) && - pkgInChannel.getRelease().equals(pm.getRelease()) && - (epochcmp(pkgInChannel.getEpoch(), pm.getEpoch()) == 0)) { + pkgInChannel.getRelease().equals(pm.getRelease()) && + (epochcmp(pkgInChannel.getEpoch(), pm.getEpoch()) == 0)) { foundMatch = true; break; //stop searching for match @@ -1271,7 +1273,8 @@ public class ProfileManager extends BaseManager { * @param profileId The id of the profile the packages are associated with. * @return DataResult of ProfilePackageOverviewDto */ - public static DataResult listProfilePackages(Long profileId) { + public static DataResult<ProfilePackageOverviewDto> listProfilePackages( + Long profileId) { SelectMode m = ModeFactory.getMode("profile_queries", "profile_package_overview"); @@ -1310,11 +1313,12 @@ public class ProfileManager extends BaseManager { * @param pc PageControl to filter the list. * @return DataResult containing ProfileDto objects */ - public static DataResult compatibleWithChannel(Channel channelIn, + public static DataResult<ProfileDto> compatibleWithChannel( + Channel channelIn, Org orgIn, PageControl pc) { SelectMode m = ModeFactory.getMode("profile_queries", - "compatible_with_channel"); + "compatible_with_channel"); Map params = new HashMap(); params.put("org_id", orgIn.getId()); params.put("cid", channelIn.getId()); diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 4ed71cd..d580613 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -52,12 +52,16 @@ import com.redhat.rhn.domain.server.VirtualInstanceFactory; import com.redhat.rhn.domain.server.VirtualInstanceState; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; +import com.redhat.rhn.frontend.dto.ActivationKeyDto; import com.redhat.rhn.frontend.dto.CustomDataKeyOverview; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.HardwareDeviceDto; import com.redhat.rhn.frontend.dto.NetworkDto; import com.redhat.rhn.frontend.dto.OrgProxyServer; +import com.redhat.rhn.frontend.dto.ServerPath; +import com.redhat.rhn.frontend.dto.SystemCurrency; import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.frontend.dto.VirtualSystemOverview; import com.redhat.rhn.frontend.dto.kickstart.KickstartSessionDto; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.xmlrpc.InvalidProxyVersionException; @@ -104,11 +108,11 @@ public class SystemManager extends BaseManager { public static final String CAP_CONFIGFILES_UPLOAD = "configfiles.upload"; public static final String CAP_CONFIGFILES_DIFF = "configfiles.diff"; public static final String CAP_CONFIGFILES_MTIME_UPLOAD = - "configfiles.mtime_upload"; + "configfiles.mtime_upload"; public static final String CAP_CONFIGFILES_DEPLOY = "configfiles.deploy"; public static final String CAP_PACKAGES_VERIFY = "packages.verify"; public static final String CAP_CONFIGFILES_BASE64_ENC = - "configfiles.base64_enc"; + "configfiles.base64_enc"; public static final String NO_SLOT_KEY = "system.entitle.noslots"; @@ -148,7 +152,7 @@ public class SystemManager extends BaseManager { */ public static DataResult subscribableChannels(Long sid, Long uid, Long cid) { SelectMode m = ModeFactory.getMode("Channel_queries", - "subscribable_channels", Map.class); + "subscribable_channels", Map.class); Map params = new HashMap(); params.put("server_id", sid); params.put("user_id", uid); @@ -183,7 +187,7 @@ public class SystemManager extends BaseManager { */ public static DataResult systemChannelSubscriptions(Long sid) { SelectMode m = ModeFactory.getMode("System_queries", - "system_channel_subscriptions"); + "system_channel_subscriptions"); Map params = new HashMap(); params.put("sid", sid); return m.execute(params); @@ -271,8 +275,8 @@ public class SystemManager extends BaseManager { */ public static DataResult latestUpgradablePackages(Long sid) { SelectMode m = ModeFactory.getMode("Package_queries", - "system_upgradable_package_list_no_errata_info", - Map.class); + "system_upgradable_package_list_no_errata_info", + Map.class); Map params = new HashMap(); params.put("sid", sid); return m.execute(params); @@ -285,8 +289,8 @@ public class SystemManager extends BaseManager { */ public static DataResult latestInstallablePackages(Long sid) { SelectMode m = ModeFactory.getMode("Package_queries", - "system_latest_all_available_packages", - Map.class); + "system_latest_all_available_packages", + Map.class); Map params = new HashMap(); params.put("sid", sid); return m.execute(params); @@ -299,7 +303,7 @@ public class SystemManager extends BaseManager { */ public static DataResult installedPackages(Long sid) { SelectMode m = ModeFactory.getMode("System_queries", "system_installed_packages", - Map.class); + Map.class); Map params = new HashMap(); params.put("sid", sid); DataResult<Map> pkgs = m.execute(params); @@ -374,7 +378,7 @@ public class SystemManager extends BaseManager { */ public static DataResult availableSystemGroups(Server server, User user) { SelectMode m = ModeFactory.getMode("SystemGroup_queries", "visible_to_system", - Map.class); + Map.class); Map params = new HashMap(); params.put("sid", server.getId()); params.put("org_id", user.getOrg().getId()); @@ -382,7 +386,7 @@ public class SystemManager extends BaseManager { return m.execute(params); } - /** + /** * Returns list of all notes for a system. * @param s The server in question * @return list of SystemNotes. @@ -414,7 +418,8 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult systemCurrencyList(User user, PageControl pc) { + public static DataResult<SystemCurrency> systemCurrencyList(User user, + PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "system_currency"); Map params = new HashMap(); params.put("uid", user.getId()); @@ -428,12 +433,13 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult systemListShort(User user, PageControl pc) { + public static DataResult<SystemOverview> systemListShort(User user, + PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "xmlrpc_visible_to_user", SystemOverview.class); - Map params = new HashMap(); + Map<String, Long> params = new HashMap<String, Long>(); params.put("user_id", user.getId()); - Map elabParams = new HashMap(); + Map<String, Long> elabParams = new HashMap<String, Long>(); return makeDataResult(params, elabParams, pc, m); } @@ -445,7 +451,8 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult systemListShortInactive(User user, PageControl pc) { + public static DataResult<SystemOverview> systemListShortInactive(User user, + PageControl pc) { return systemListShortInactive(user, new Integer(Config.get().getInt(ConfigDefaults .SYSTEM_CHECKIN_THRESHOLD)), pc); } @@ -458,15 +465,15 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult systemListShortInactive( + public static DataResult<SystemOverview> systemListShortInactive( User user, int inactiveThreshold, PageControl pc) { SelectMode m = ModeFactory.getMode( "System_queries", "xmlrpc_visible_to_user_inactive", SystemOverview.class); - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("user_id", user.getId()); params.put("checkin_threshold", inactiveThreshold); - Map elabParams = new HashMap(); + Map<String, Object> elabParams = new HashMap<String, Object>(); return makeDataResult(params, elabParams, pc, m); } @@ -478,14 +485,15 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult systemListShortActive(User user, PageControl pc) { + public static DataResult<SystemOverview> systemListShortActive(User user, + PageControl pc) { SelectMode m = ModeFactory.getMode( "System_queries", "xmlrpc_visible_to_user_active", SystemOverview.class); - Map params = new HashMap(); + Map<String, Object> params = new HashMap<String, Object>(); params.put("user_id", user.getId()); params.put("checkin_threshold", new Integer(Config.get().getInt(ConfigDefaults .SYSTEM_CHECKIN_THRESHOLD))); - Map elabParams = new HashMap(); + Map<String, Object> elabParams = new HashMap<String, Object>(); return makeDataResult(params, elabParams, pc, m); } @@ -499,7 +507,7 @@ public class SystemManager extends BaseManager { * @return list of SystemOverviews. */ public static DataResult <SystemOverview> systemsNotInGroup(User user, - ServerGroup sg, PageControl pc) { + ServerGroup sg, PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "target_systems_for_group"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -544,12 +552,13 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult outOfDateList(User user, PageControl pc) { + public static DataResult<SystemOverview> outOfDateList(User user, + PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "out_of_date"); - Map params = new HashMap(); + Map<String, Long> params = new HashMap<String, Long>(); params.put("org_id", user.getOrg().getId()); params.put("user_id", user.getId()); - Map elabParams = new HashMap(); + Map<String, Long> elabParams = new HashMap<String, Long>(); return makeDataResult(params, elabParams, pc, m); } @@ -627,18 +636,18 @@ public class SystemManager extends BaseManager { * @return list of SystemOverviews */ public static DataResult registeredList(User user, - PageControl pc, - int threshold) { + PageControl pc, + int threshold) { SelectMode m; Map params = new HashMap(); if (threshold == 0) { m = ModeFactory.getMode("System_queries", - "all_systems_by_registration"); + "all_systems_by_registration"); } else { m = ModeFactory.getMode("System_queries", - "recently_registered"); + "recently_registered"); params.put("threshold", new Integer(threshold)); } @@ -658,7 +667,7 @@ public class SystemManager extends BaseManager { */ public static DataResult inactiveListSortbyCheckinTime(User user, PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", - "inactive_order_by_checkin_time"); + "inactive_order_by_checkin_time"); Map params = new HashMap(); params.put("org_id", user.getOrg().getId()); params.put("user_id", user.getId()); @@ -688,7 +697,8 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult virtualSystemsList(User user, PageControl pc) { + public static DataResult<VirtualSystemOverview> virtualSystemsList( + User user, PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "virtual_servers"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -703,7 +713,8 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult virtualGuestsForHostList(User user, Long sid, PageControl pc) { + public static DataResult<VirtualSystemOverview> virtualGuestsForHostList( + User user, Long sid, PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "virtual_guests_for_host"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -720,9 +731,10 @@ public class SystemManager extends BaseManager { * @param pc PageControl * @return list of SystemOverviews. */ - public static DataResult virtualSystemsInSet(User user, - String setLabel, - PageControl pc) { + public static DataResult<VirtualSystemOverview> virtualSystemsInSet( + User user, + String setLabel, + PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "virtual_systems_in_set"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -754,7 +766,7 @@ public class SystemManager extends BaseManager { * @return list of SystemOverviews. */ public static DataResult<SystemOverview> systemsInGroup(Long sgid, - PageControl pc) { + PageControl pc) { SelectMode m = ModeFactory.getMode("System_queries", "systems_in_group"); Map params = new HashMap(); params.put("sgid", sgid); @@ -798,7 +810,7 @@ public class SystemManager extends BaseManager { public static DataResult<Errata> unscheduledErrata(User user, Long sid, PageControl pc) { SelectMode m = ModeFactory.getMode("Errata_queries", - "unscheduled_relevant_to_system"); + "unscheduled_relevant_to_system"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("sid", sid); @@ -815,7 +827,7 @@ public class SystemManager extends BaseManager { */ public static boolean hasUnscheduledErrata(User user, Long sid) { SelectMode m = ModeFactory.getMode("Errata_queries", - "unscheduled_relevant_to_system"); + "unscheduled_relevant_to_system"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("sid", sid); @@ -850,7 +862,7 @@ public class SystemManager extends BaseManager { while (i.hasNext()) { KickstartSessionDto next = (KickstartSessionDto)i.next(); if (!(next.getState().equals("complete") || - next.getState().equals("failed"))) { + next.getState().equals("failed"))) { return true; } } @@ -885,7 +897,7 @@ public class SystemManager extends BaseManager { * @return a list of ErrataOverviews */ public static DataResult<ErrataOverview> relevantErrata(User user, - Long sid, List<String> types) { + Long sid, List<String> types) { SelectMode m = ModeFactory.getMode("Errata_queries", "relevant_to_system_by_types"); Map params = new HashMap(); @@ -910,10 +922,10 @@ public class SystemManager extends BaseManager { * @return a list of ErrataOverviews */ public static DataResult<ErrataOverview> relevantCurrencyErrata(User user, - Long sid, String type, - String synopsis) { + Long sid, String type, + String synopsis) { SelectMode m = ModeFactory.getMode("Errata_queries", - "security_relevant_to_system_by_synopsis"); + "security_relevant_to_system_by_synopsis"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -962,7 +974,7 @@ public class SystemManager extends BaseManager { */ public static int countCriticalErrataForSystem(User user, Long sid) { SelectMode m = ModeFactory.getMode("Errata_queries", - "count_critical_errata_for_system"); + "count_critical_errata_for_system"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -981,7 +993,7 @@ public class SystemManager extends BaseManager { */ public static int countNoncriticalErrataForSystem(User user, Long sid) { SelectMode m = ModeFactory.getMode("Errata_queries", - "count_noncritical_errata_for_system"); + "count_noncritical_errata_for_system"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -999,7 +1011,7 @@ public class SystemManager extends BaseManager { * @return a list of ErrataOverviews */ public static DataResult errataInSet(User user, String label, - PageControl pc) { + PageControl pc) { SelectMode m = ModeFactory.getMode("Errata_queries", "in_set"); Map params = new HashMap(); @@ -1035,7 +1047,7 @@ public class SystemManager extends BaseManager { * @return a List of hydrated server objects. */ public static List<Server> hydrateServerFromIds(Collection<Long> serverIds, - User userIn) { + User userIn) { List <Server> servers = new ArrayList(serverIds.size()); for (Long id : serverIds) { servers.add(lookupByIdAndUser(id, userIn)); @@ -1061,7 +1073,7 @@ public class SystemManager extends BaseManager { * @throws InvalidCertificateException thrown if certificate is invalid. */ public static Server lookupByCert(ClientCertificate cert) - throws InvalidCertificateException { + throws InvalidCertificateException { return ServerFactory.lookupByCert(cert); } @@ -1072,10 +1084,10 @@ public class SystemManager extends BaseManager { * @param serverIn the server to query for * @return list of ActivationKeyDto containing the token id and name */ - public static DataResult getActivationKeys(Server serverIn) { + public static DataResult<ActivationKeyDto> getActivationKeys(Server serverIn) { SelectMode m = ModeFactory.getMode("General_queries", - "activation_keys_for_server"); + "activation_keys_for_server"); Map params = new HashMap(); params.put("server_id", serverIn.getId()); return makeDataResult(params, Collections.EMPTY_MAP, null, m); @@ -1209,7 +1221,7 @@ public class SystemManager extends BaseManager { * returned server. */ public static Server subscribeServerToChannel(User user, - Server server, Channel channel) { + Server server, Channel channel) { return subscribeServerToChannel(user, server, channel, false); } @@ -1226,9 +1238,9 @@ public class SystemManager extends BaseManager { * returned server. */ public static Server subscribeServerToChannel(User user, - Server server, - Channel channel, - boolean flush) { + Server server, + Channel channel, + boolean flush) { // do not allow non-satellite or non-proxy servers to // be subscribed to satellite or proxy channels respectively. @@ -1312,7 +1324,7 @@ public class SystemManager extends BaseManager { * @param channel The channel to unsubscribe from */ public static void unsubscribeServerFromChannel(User user, Server server, - Channel channel) { + Channel channel) { unsubscribeServerFromChannel(user, server, channel, false); } @@ -1345,7 +1357,7 @@ public class SystemManager extends BaseManager { * if you set this to true.. */ public static void unsubscribeServerFromChannel(User user, Server server, - Channel channel, boolean flush) { + Channel channel, boolean flush) { if (!isAvailableToUser(user, server.getId())) { //Throw an exception with a nice error message so the user //knows what went wrong. @@ -1374,7 +1386,7 @@ public class SystemManager extends BaseManager { * returned server. */ public static Server unsubscribeServerFromChannel(Server server, - Channel channel) { + Channel channel) { return unsubscribeServerFromChannel(server, channel, false); } @@ -1394,8 +1406,8 @@ public class SystemManager extends BaseManager { * returned server. */ public static Server unsubscribeServerFromChannel(Server server, - Channel channel, - boolean flush) { + Channel channel, + boolean flush) { if (channel == null) { //nothing to do ;) return server; @@ -1408,16 +1420,16 @@ public class SystemManager extends BaseManager { in.put("channel_id", channel.getId()); m.execute(in, new HashMap()); - /* - * This is f-ing hokey, but we need to be sure to refresh the - * server object since we modified it outside of hibernate :-/ - * This will update the server.channels set. - */ - if (flush) { - return (Server)HibernateFactory.reload(server); - } - HibernateFactory.getSession().refresh(server); - return server; + /* + * This is f-ing hokey, but we need to be sure to refresh the + * server object since we modified it outside of hibernate :-/ + * This will update the server.channels set. + */ + if (flush) { + return (Server)HibernateFactory.reload(server); + } + HibernateFactory.getSession().refresh(server); + return server; } @@ -1475,7 +1487,7 @@ public class SystemManager extends BaseManager { * client certificate. */ public static ClientCertificate createClientCertificate(Server server) - throws InstantiationException { + throws InstantiationException { ClientCertificate cert = new ClientCertificate(); // add members to this cert @@ -1517,7 +1529,7 @@ public class SystemManager extends BaseManager { * @throws InvalidProxyVersionException thrown if version is invalid. */ public static void activateProxy(Server server, String version) - throws ProxySystemIsSatelliteException, InvalidProxyVersionException { + throws ProxySystemIsSatelliteException, InvalidProxyVersionException { if (server.isSatellite()) { throw new ProxySystemIsSatelliteException(); @@ -1556,7 +1568,7 @@ public class SystemManager extends BaseManager { * @return ValidatorResult of errors and warnings. */ public static ValidatorResult entitleServer(Org orgIn, Long sid, - Entitlement ent) { + Entitlement ent) { Server server = ServerFactory.lookupByIdAndOrg(sid, orgIn); ValidatorResult result = new ValidatorResult(); @@ -1578,13 +1590,13 @@ public class SystemManager extends BaseManager { // are the 2 instances where we want to swap the old virt // with the new... if ((EntitlementManager.VIRTUALIZATION.equals(ent) && - hasEntitlement(sid, EntitlementManager.VIRTUALIZATION_PLATFORM))) { + hasEntitlement(sid, EntitlementManager.VIRTUALIZATION_PLATFORM))) { log.debug("removing VIRT_PLATFORM"); removeServerEntitlement(sid, EntitlementManager.VIRTUALIZATION_PLATFORM, false); } else if ((EntitlementManager.VIRTUALIZATION_PLATFORM.equals(ent) && - hasEntitlement(sid, EntitlementManager.VIRTUALIZATION))) { + hasEntitlement(sid, EntitlementManager.VIRTUALIZATION))) { log.debug("removing VIRT"); removeServerEntitlement(sid, EntitlementManager.VIRTUALIZATION, false); @@ -1621,13 +1633,13 @@ public class SystemManager extends BaseManager { } if (checkCounts) { Long availableEntitlements = - EntitlementManager.getAvailableEntitlements(ent, orgIn); + EntitlementManager.getAvailableEntitlements(ent, orgIn); log.debug("avail: " + availableEntitlements); if (availableEntitlements != null && availableEntitlements.longValue() < 1) { log.debug("Not enough slots. returning error"); result.addError(new ValidatorError(NO_SLOT_KEY, - ent.getHumanReadableLabel())); + ent.getHumanReadableLabel())); return result; } } @@ -1668,8 +1680,8 @@ public class SystemManager extends BaseManager { } if ((base != null) && - base.isRhelChannel() && - base.isReleaseXChannel(6)) { + base.isRhelChannel() && + base.isReleaseXChannel(6)) { // do some actions for RHEL6 } else { @@ -1726,7 +1738,7 @@ public class SystemManager extends BaseManager { // warn but allow the operation to proceed. else if (toolsChannel == null) { result.addWarning(new ValidatorWarning("system.entitle.novirtpackage", - ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); } else { List packageResults = ChannelManager.listLatestPackagesEqual( @@ -1741,7 +1753,7 @@ public class SystemManager extends BaseManager { } else { result.addError(new ValidatorError("system.entitle.novirtpackage", - ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); } } } @@ -1749,8 +1761,8 @@ public class SystemManager extends BaseManager { log.warn("Found multiple child channels with package: " + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME); result.addWarning(new ValidatorWarning( - "system.entitle.multiplechannelswithpackagepleaseinstall", - ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); + "system.entitle.multiplechannelswithpackagepleaseinstall", + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); } } @@ -1787,8 +1799,8 @@ public class SystemManager extends BaseManager { log.warn("Found multiple child channels with package: " + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME); result.addWarning(new ValidatorWarning( - "system.entitle.multiplechannelswithpackage", - ChannelManager.VIRT_CHANNEL_PACKAGE_NAME)); + "system.entitle.multiplechannelswithpackage", + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME)); } } } @@ -1812,7 +1824,7 @@ public class SystemManager extends BaseManager { * @param ent Level of Entitlement. */ public static void removeServerEntitlement(Long sid, - Entitlement ent) { + Entitlement ent) { removeServerEntitlement(sid, ent, true); } @@ -1824,8 +1836,8 @@ public class SystemManager extends BaseManager { * irrelevant if virtual entitlements are not found.. */ public static void removeServerEntitlement(Long sid, - Entitlement ent, - boolean repoll) { + Entitlement ent, + boolean repoll) { if (!hasEntitlement(sid, ent)) { if (log.isDebugEnabled()) { @@ -1880,10 +1892,10 @@ public class SystemManager extends BaseManager { out.put("retval", new Integer(Types.NUMERIC)); CallableMode m = ModeFactory.getCallableMode("System_queries", - "can_entitle_server"); + "can_entitle_server"); Map result = m.execute(in, out); boolean retval = BooleanUtils. - toBoolean(((Long) result.get("retval")).intValue()); + toBoolean(((Long) result.get("retval")).intValue()); log.debug("canEntitleServer.returning: " + retval); return retval; } @@ -1902,7 +1914,7 @@ public class SystemManager extends BaseManager { params.put("cid", channel.getId()); params.put("org_id", user.getOrg().getId()); SelectMode m = ModeFactory.getMode("System_queries", - "systems_subscribed_to_channel", SystemOverview.class); + "systems_subscribed_to_channel", SystemOverview.class); return m.execute(params); } @@ -1920,7 +1932,7 @@ public class SystemManager extends BaseManager { params.put("cid", channelId); SelectMode m = ModeFactory.getMode("System_queries", - "count_systems_subscribed_to_channel"); + "count_systems_subscribed_to_channel"); DataResult dr = makeDataResult(params, params, null, m); Map result = (Map) dr.get(0); @@ -1942,7 +1954,7 @@ public class SystemManager extends BaseManager { params.put("org_id", user.getOrg().getId()); SelectMode m = ModeFactory.getMode("System_queries", - "systems_subscribed_to_channel", Map.class); + "systems_subscribed_to_channel", Map.class); return m.execute(params); } @@ -2020,8 +2032,8 @@ public class SystemManager extends BaseManager { throw e; } ServerLock sl = new ServerLock(locker, - server, - reason); + server, + reason); server.setLock(sl); } @@ -2066,7 +2078,7 @@ public class SystemManager extends BaseManager { // Note that for FVEs, NULL == NOT FOUND if (isServerFveEligible(serverIn)) { Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn, - channelIn); + channelIn); if (availableFVEs != null && (availableFVEs.longValue() > 0)) { return true; } @@ -2144,8 +2156,8 @@ public class SystemManager extends BaseManager { // need to change down the road. if (0 > proposedVcpuSetting || proposedVcpuSetting > 32) { result.addError(new ValidatorError( - "systems.details.virt.vcpu.limit.msg", - new Object [] {"32", guest.getName()})); + "systems.details.virt.vcpu.limit.msg", + new Object [] {"32", guest.getName()})); } if (result.getErrors().isEmpty()) { @@ -2155,8 +2167,8 @@ public class SystemManager extends BaseManager { if (hostCpu != null && hostCpu.getNrCPU() != null) { if (proposedVcpuSetting > hostCpu.getNrCPU().intValue()) { result.addWarning(new ValidatorWarning( - "systems.details.virt.vcpu.exceeds.host.cpus", - new Object [] {host.getCpu().getNrCPU(), guest.getName()})); + "systems.details.virt.vcpu.exceeds.host.cpus", + new Object [] {host.getCpu().getNrCPU(), guest.getName()})); } } @@ -2164,15 +2176,15 @@ public class SystemManager extends BaseManager { // If the new value exceeds the setting the guest was started with, a // reboot will be required for the setting to take effect. VirtualInstanceState running = VirtualInstanceFactory.getInstance(). - getRunningState(); + getRunningState(); if (guest.getState() != null && guest.getState().getId().equals(running.getId())) { Integer currentGuestCpus = guest.getNumberOfCPUs(); if (currentGuestCpus != null && proposedVcpuSetting > - currentGuestCpus.intValue()) { + currentGuestCpus.intValue()) { result.addWarning(new ValidatorWarning( - "systems.details.virt.vcpu.increase.warning", - new Object [] {new Integer(proposedVcpuSetting), guest.getName()})); + "systems.details.virt.vcpu.increase.warning", + new Object [] {new Integer(proposedVcpuSetting), guest.getName()})); } } } @@ -2200,13 +2212,13 @@ public class SystemManager extends BaseManager { // Grab the host from the first guest in the list: Long firstGuestId = (Long)guestIds.get(0); Server host = (viFactory.lookupById(firstGuestId)). - getHostSystem(); + getHostSystem(); int proposedMemoryKb = proposedMemory * 1024; long netMemoryDifferenceKb = 0; long guestMemoryUsageKb = 0; // accumulate mem allocation of all running guests VirtualInstanceState running = VirtualInstanceFactory.getInstance(). - getRunningState(); + getRunningState(); log.debug("Adding guest memory:"); List warnings = new LinkedList(); @@ -2225,14 +2237,14 @@ public class SystemManager extends BaseManager { if (guestIds.contains(guest.getId())) { long guestMemoryDelta = proposedMemoryKb - - guest.getTotalMemory().longValue(); + guest.getTotalMemory().longValue(); netMemoryDifferenceKb += guestMemoryDelta; // Warn the user that a change to max memory will require a reboot // for the settings to take effect: warnings.add(new ValidatorWarning( - "systems.details.virt.memory.warning", - new Object [] {guest.getName()})); + "systems.details.virt.memory.warning", + new Object [] {guest.getName()})); } } else { @@ -2287,7 +2299,7 @@ public class SystemManager extends BaseManager { public static List<SystemOverview> listSystemsWithPackage(User user, String name, String version, String release) { SelectMode m = ModeFactory.getMode("System_queries", - "systems_with_package_nvr"); + "systems_with_package_nvr"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2307,7 +2319,7 @@ public class SystemManager extends BaseManager { */ public static List<SystemOverview> listSystemsWithPackage(User user, Long id) { SelectMode m = ModeFactory.getMode("System_queries", - "systems_with_package"); + "systems_with_package"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2325,7 +2337,7 @@ public class SystemManager extends BaseManager { */ public static List<SystemOverview> listSystemsWithNeededPackage(User user, Long id) { SelectMode m = ModeFactory.getMode("System_queries", - "systems_with_needed_package"); + "systems_with_needed_package"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2342,7 +2354,7 @@ public class SystemManager extends BaseManager { */ public static List<SystemOverview> listVirtualHosts(User user) { SelectMode m = ModeFactory.getMode("System_queries", - "virtual_hosts_for_user"); + "virtual_hosts_for_user"); Map params = new HashMap(); params.put("user_id", user.getId()); DataResult toReturn = m.execute(params); @@ -2360,7 +2372,7 @@ public class SystemManager extends BaseManager { */ public static int countSubscribedToChannelWithoutOrg(Long orgId, Long cid) { SelectMode m = ModeFactory.getMode("System_queries", - "count_systems_subscribed_to_channel_not_in_org"); + "count_systems_subscribed_to_channel_not_in_org"); Map params = new HashMap(); params.put("org_id", orgId); params.put("cid", cid); @@ -2380,8 +2392,8 @@ public class SystemManager extends BaseManager { */ public static DataResult subscribedInOrgTrust(long orgA, long orgB) { SelectMode m = - ModeFactory.getMode("System_queries", - "systems_subscribed_by_orgtrust"); + ModeFactory.getMode("System_queries", + "systems_subscribed_by_orgtrust"); Map params = new HashMap(); params.put("orgA", orgA); params.put("orgB", orgB); @@ -2396,8 +2408,8 @@ public class SystemManager extends BaseManager { */ public static DataResult sidsInOrgTrust(long orgA, long orgB) { SelectMode m = - ModeFactory.getMode("System_queries", - "sids_subscribed_by_orgtrust"); + ModeFactory.getMode("System_queries", + "sids_subscribed_by_orgtrust"); Map params = new HashMap(); params.put("orgA", orgA); params.put("orgB", orgB); @@ -2412,7 +2424,7 @@ public class SystemManager extends BaseManager { */ public static Long subscribedToChannelSize(User user, Long cid) { SelectMode m = ModeFactory.getMode("System_queries", - "systems_subscribed_to_channel_size"); + "systems_subscribed_to_channel_size"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2429,7 +2441,7 @@ public class SystemManager extends BaseManager { */ public static DataResult<CustomDataKeyOverview> listDataKeys(User user) { SelectMode m = ModeFactory.getMode("System_queries", - "custom_vals", CustomDataKeyOverview.class); + "custom_vals", CustomDataKeyOverview.class); Map params = new HashMap(); params.put("uid", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2467,16 +2479,16 @@ public class SystemManager extends BaseManager { * @return description of server information as well as a list of relevant packages */ public static DataResult ssmSystemPackagesToRemove(User user, - String packageSetLabel, - boolean shortened) { + String packageSetLabel, + boolean shortened) { SelectMode m; if (shortened) { m = ModeFactory.getMode("System_queries", - "system_set_remove_or_verify_packages_conf_short"); + "system_set_remove_or_verify_packages_conf_short"); } else { m = ModeFactory.getMode("System_queries", - "system_set_remove_or_verify_packages_conf"); + "system_set_remove_or_verify_packages_conf"); } Map<String, Object> params = new HashMap<String, Object>(3); @@ -2499,10 +2511,10 @@ public class SystemManager extends BaseManager { * @return description of server information as well as a list of all relevant packages */ public static DataResult ssmSystemPackagesToUpgrade(User user, - String packageSetLabel) { + String packageSetLabel) { SelectMode m = - ModeFactory.getMode("System_queries", "ssm_package_upgrades_conf"); + ModeFactory.getMode("System_queries", "ssm_package_upgrades_conf"); Map<String, Object> params = new HashMap<String, Object>(3); params.put("user_id", user.getId()); @@ -2561,7 +2573,7 @@ public class SystemManager extends BaseManager { * @return true if available, false otherwise */ public static boolean hasPackageAvailable(Server server, Long nameId, - Long archId, Long evrId) { + Long archId, Long evrId) { Map params = new HashMap(); params.put("server_id", server.getId()); params.put("eid", evrId); @@ -2575,7 +2587,7 @@ public class SystemManager extends BaseManager { params.put("aid", archId); } SelectMode m = - ModeFactory.getMode("System_queries", mode); + ModeFactory.getMode("System_queries", mode); DataResult toReturn = m.execute(params); return toReturn.size() > 0; } @@ -2586,7 +2598,7 @@ public class SystemManager extends BaseManager { * @param sid The id of the server in question * @return Returns a list of ServerPath objects. */ - public static DataResult getConnectionPath(Long sid) { + public static DataResult<ServerPath> getConnectionPath(Long sid) { SelectMode m = ModeFactory.getMode("System_queries", "proxy_path_for_server"); Map params = new HashMap(); params.put("sid", sid); @@ -2600,7 +2612,7 @@ public class SystemManager extends BaseManager { * @return list of maps with name_id, evr_id and arch_id */ public static List<Map<String, Long>> listInstalledPackage( - String packageName, Server server) { + String packageName, Server server) { SelectMode m = ModeFactory.getMode("System_queries", "list_installed_packages_for_name"); Map params = new HashMap(); @@ -2669,19 +2681,19 @@ public class SystemManager extends BaseManager { */ public static List<SystemOverview> listSystemsByName(User user, String name) { - SelectMode mode = ModeFactory.getMode("System_queries", "find_by_name"); - Map params = new HashMap(); - params.put("user_id", user.getId()); - params.put("name", name); - Map elabParams = new HashMap(); - DataResult result = makeDataResult(params, elabParams, null, mode); - result.elaborate(); - return result; + SelectMode mode = ModeFactory.getMode("System_queries", "find_by_name"); + Map params = new HashMap(); + params.put("user_id", user.getId()); + params.put("name", name); + Map elabParams = new HashMap(); + DataResult result = makeDataResult(params, elabParams, null, mode); + result.elaborate(); + return result; } private static DataResult<SystemOverview> listDuplicates(User user, - String query, String key) { + String query, String key) { SelectMode mode = ModeFactory.getMode("System_queries", query); Map params = new HashMap(); params.put("uid", user.getId()); @@ -2691,7 +2703,7 @@ public class SystemManager extends BaseManager { } private static List listDuplicates(User user, String query, - List ignored, Long inactiveHours) { + List ignored, Long inactiveHours) { Calendar cal = Calendar.getInstance(); cal.add(Calendar.HOUR, (0 - inactiveHours.intValue())); @@ -2737,7 +2749,7 @@ public class SystemManager extends BaseManager { * @return List of DuplicateSystemGrouping objects */ public static List listDuplicatesByIP(User user, long inactiveHours) { - List ignoreIps = new ArrayList(); + List<String> ignoreIps = new ArrayList<String>(); ignoreIps.add("127.0.0.1"); ignoreIps.add("127.0.0.01"); ignoreIps.add("0"); @@ -2827,7 +2839,7 @@ public class SystemManager extends BaseManager { * @return List of DuplicateSystemGrouping objects */ public static List<SystemOverview> listDuplicatesByHostname(User user, - String hostName) { + String hostName) { return listDuplicates(user, "duplicate_system_ids_hostname_key", hostName); }

1 0

Changes to 'refs/tags/spacewalk-proxy-1.8.14-1'
by Michael Mraka 23 Oct '12

23 Oct '12

Tag 'spacewalk-proxy-1.8.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-10-23 14:19 +0000 Tagging package [spacewalk-proxy] version [1.8.14-1] in directory [proxy/proxy/]. Changes since spacewalk-branding-1.8.6-1: Michael Mraka (2): _processFile() prototype has changed Automatic commit of package [spacewalk-proxy] release [1.8.14-1]. --- proxy/proxy/spacewalk-proxy.spec | 7 +++++-- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

2 commits - proxy/proxy rel-eng/packages
by Michael Mraka 23 Oct '12

23 Oct '12

proxy/proxy/spacewalk-proxy.spec | 7 +++++-- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 4db76197acc763ef78c510b3377f7bad7a3e0f9b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 23 16:19:43 2012 +0200 Automatic commit of package [spacewalk-proxy] release [1.8.14-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index cb92da7..56802b7 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 1.8.13 +Version: 1.8.14 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -330,6 +330,9 @@ fi %changelog +* Tue Oct 23 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.14-1 +- _processFile() prototype has changed + * Tue Oct 23 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.13-1 - _processFile() from uploadLib is static diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index f4afe35..ed9a321 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.8.13-1 proxy/proxy/ +1.8.14-1 proxy/proxy/ commit 22ce953deca5997b865639f8b1249a037e55cf1d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Oct 23 16:14:43 2012 +0200 _processFile() prototype has changed diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 85adc6d..cb92da7 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -13,7 +13,7 @@ Requires: httpd %if 0%{?fedora} > 15 || 0%{?rhel} > 5 # pylint check BuildRequires: spacewalk-pylint -BuildRequires: rhnpush >= 5.5.40 +BuildRequires: rhnpush >= 5.5.52 BuildRequires: spacewalk-backend-libs >= 1.7.24 BuildRequires: spacewalk-backend >= 1.7.24 %endif

1 0

Changes to 'refs/tags/spacewalk-branding-1.8.6-1'
by Tomas Lestach 23 Oct '12

23 Oct '12

Tag 'spacewalk-branding-1.8.6-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-10-23 12:09 +0000 Tagging package [spacewalk-branding] version [1.8.6-1] in directory [branding/]. Changes since spacewalk-proxy-1.8.13-1: Tomas Lestach (2): make the white image background transparent Automatic commit of package [spacewalk-branding] release [1.8.6-1]. --- branding/img/parent_node.gif |binary branding/spacewalk-branding.spec | 6 +++++- rel-eng/packages/spacewalk-branding | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

branding/spacewalk-branding.spec rel-eng/packages
by Tomas Lestach 23 Oct '12

23 Oct '12

branding/spacewalk-branding.spec | 6 +++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit c38001d598e51e25eabb8ee38e60dae7c5c00467 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Oct 23 14:09:24 2012 +0200 Automatic commit of package [spacewalk-branding] release [1.8.6-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index be4dcbf..eb93cd4 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 1.8.5 +Version: 1.8.6 Release: 1%{?dist} Summary: Spacewalk branding data @@ -82,6 +82,10 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Oct 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.6-1 +- make the white image background transparent +- Expose extra packages / systems with extra packages + * Fri Oct 19 2012 Jan Pazdziora 1.8.5-1 - Edit colors in highlightning of :hovered rows in list views - Highlightning of :hover row in list views diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index bf05dd6..2455a2c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -1.8.5-1 branding/ +1.8.6-1 branding/

1 0

branding/img
by Tomas Lestach 23 Oct '12

23 Oct '12

branding/img/parent_node.gif |binary 1 file changed New commits: commit 0fff6bcb7ecd3d9d52e401f18df2fa9c509925c7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Oct 23 14:06:12 2012 +0200 make the white image background transparent diff --git a/branding/img/parent_node.gif b/branding/img/parent_node.gif index ef89282c..bd6bf58 100644 Binary files a/branding/img/parent_node.gif and b/branding/img/parent_node.gif differ

1 0

Changes to 'refs/tags/spacewalk-setup-jabberd-1.7.0-1'
by Michael Mraka 23 Oct '12

23 Oct '12

Changes since spacewalk-schema-1.6.42-1: Milan Zazrivec (1): Bumping package versions for 1.7. --- backend/spacewalk-backend.spec | 2 +- branding/spacewalk-branding.spec | 2 +- client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 2 +- client/tools/spacewalk-koan/spacewalk-koan.spec | 2 +- client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 2 +- java/spacewalk-java.spec | 2 +- monitoring/PerlModules/NP/PersistentConnection/perl-NOCpulse-PersistentConnection.spec | 2 +- monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec | 2 +- monitoring/PerlModules/NP/SetID/perl-NOCpulse-SetID.spec | 2 +- monitoring/SatConfig/spread/SatConfig-spread.spec | 2 +- monitoring/SputLite/SputLite.spec | 2 +- monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 2 +- monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec | 2 +- projects/python-gzipstream/python-gzipstream.spec | 2 +- projects/python-hwdata/python-hwdata.spec | 2 +- proxy/installer/spacewalk-proxy-installer.spec | 2 +- proxy/proxy-docs/spacewalk-proxy-docs.spec | 2 +- proxy/proxy-html/spacewalk-proxy-html.spec | 2 +- proxy/proxy/spacewalk-proxy.spec | 2 +- reporting/spacewalk-reports.spec | 2 +- schema/spacewalk/spacewalk-schema.spec | 2 +- search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 2 +- spacecmd/spacecmd.spec | 2 +- spacewalk/admin/spacewalk-admin.spec | 2 +- spacewalk/certs-tools/spacewalk-certs-tools.spec | 2 +- spacewalk/config/spacewalk-config.spec | 2 +- spacewalk/package/spacewalk.spec | 2 +- spacewalk/setup/spacewalk-setup.spec | 2 +- spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 2 +- utils/spacewalk-utils.spec | 2 +- web/spacewalk-web.spec | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) ---

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2012