Just a quick glance over the diff shows a log.debug calls with multiple
concatenations:
- log.debug("procedure: " + procedureName + " ags: " + args);
+ log.debug("procedure: " + procedureName + " args: " + args);
(included both lines to be fair; this wasn't a new addition, just a typo
correction)
I'm guessing the invokeMethod in which these are found is going to be
fairly integral to the code, so just a reminder that (at least I think)
we decided it'd be best to wrap these in the isDebug calls when dealing
with a number of concatenations (someone feel free to correct me if I am
remembering the ultimate end of that thread incorrectly).
-------- Original Message --------
Subject: 2 commits - java/code spacewalk/setup
Date: Tue, 7 Apr 2009 15:22:18 +0000 (UTC)
From: Partha Aji <[email protected]>
Reply-To: Mailing list for spacewalk commits.
<[email protected]>
To: [email protected]
java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
| 4
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java
| 2
java/code/src/org/cobbler/CobblerConnection.java
| 49 ----------
java/code/src/org/cobbler/CobblerObject.java
| 28 +----
java/code/src/org/cobbler/Distro.java
| 2
java/code/src/org/cobbler/Profile.java
| 2
java/code/src/org/cobbler/SystemRecord.java
| 3
java/code/src/org/cobbler/test/MockConnection.java
| 10 --
spacewalk/setup/spacewalk-setup.spec
| 5 -
9 files changed, 22 insertions(+), 83 deletions(-)
New commits:
commit a2dc92473e3ad278f7bfcf89c4052714797ca704
Author: Partha Aji <[email protected]>
Date: Tue Apr 7 11:22:04 2009 -0400
Removing the last bastions of 1.4 code.. Where logic went like if
cobbler version < 1.6 do one set else do other wise...
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java
index 63539f2..0a155eb 100644
---
a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java
+++
b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java
@@ -63,7 +63,7 @@ public class CobblerXMLRPCHelper implements
XMLRPCInvoker {
* @throws XmlRpcFault if expected error occurs
*/
public Object invokeMethod(String procedureName, List args) throws
XmlRpcFault {
- log.debug("procedure: " + procedureName + " Orig ags: " + args);
+ log.debug("procedure: " + procedureName + " Orig args: " + args);
Object retval;
try {
retval = client.invoke(procedureName, args);
diff --git a/java/code/src/org/cobbler/CobblerConnection.java
b/java/code/src/org/cobbler/CobblerConnection.java
index 8ec8b74..f8dcee4 100644
--- a/java/code/src/org/cobbler/CobblerConnection.java
+++ b/java/code/src/org/cobbler/CobblerConnection.java
@@ -19,12 +19,10 @@ import org.apache.log4j.Logger;
import java.net.MalformedURLException;
import java.util.Arrays;
-import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import redstone.xmlrpc.XmlRpcClient;
-import redstone.xmlrpc.XmlRpcFault;
/**
*
@@ -36,11 +34,9 @@ import redstone.xmlrpc.XmlRpcFault;
* @version $Rev$
*/
public class CobblerConnection {
- private static final double COBBLER_VERSION = 1.6;
private XmlRpcClient client;
private String actualUrl;
private static Logger log = Logger.getLogger(CobblerConnection.class);
- private Double version;
private String token;
protected CobblerConnection() {
@@ -55,7 +51,7 @@ public class CobblerConnection {
public CobblerConnection(String url) {
try {
- actualUrl = adjustUrl(url);
+ actualUrl = url + "/cobbler_api";
client = new XmlRpcClient(actualUrl, false);
}
catch (MalformedURLException e) {
@@ -115,7 +111,7 @@ public class CobblerConnection {
* @return Object returned.
*/
private Object invokeMethod(String procedureName, List args) {
- log.debug("procedure: " + procedureName + " ags: " + args);
+ log.debug("procedure: " + procedureName + " args: " + args);
Object retval;
try {
retval = client.invoke(procedureName, args);
@@ -169,45 +165,4 @@ public class CobblerConnection {
public String getUrl() {
return actualUrl;
}
-
- /**
- * Gets the cobbler version
- * @return the cobbler version.
- */
- private double getVersion() {
- if (version == null) {
- version = (Double)invokeMethod("version");
- }
- return version;
- }
-
- /**
- * a hack to check if the api version is > 1.6
- * for some things are different after..
- * @return true if the client connection is 1.6 or greater.
- */
- public boolean is16OrGreater() {
- return getVersion() >= COBBLER_VERSION;
- }
-
- private String adjustUrl(String urlIn) {
- String url = urlIn + "/cobbler_api";
- try {
- XmlRpcClient baseClient = new XmlRpcClient(url, false);
- Double result = (Double)baseClient.invoke("version",
Collections.EMPTY_LIST);
- if (result >= COBBLER_VERSION) {
- return url;
- }
- return url + "_rw";
- }
- catch (MalformedURLException e) {
- throw new XmlRpcException(e);
- }
- catch (redstone.xmlrpc.XmlRpcException e) {
- throw new XmlRpcException(e);
- }
- catch (XmlRpcFault e) {
- throw new XmlRpcException(e);
- }
- }
}
diff --git a/java/code/src/org/cobbler/CobblerObject.java
b/java/code/src/org/cobbler/CobblerObject.java
index 7c0b42c..8927be3 100644
--- a/java/code/src/org/cobbler/CobblerObject.java
+++ b/java/code/src/org/cobbler/CobblerObject.java
@@ -57,33 +57,23 @@ public abstract class CobblerObject {
* @param client the Cobbler Connection
* @param id the UID of the distro/profile/system record
* @param findMethod the find xmlrpc method, eg: find_distro
- * @param listMethod the list xmlrpc method, eg: get_distros
* @return true if the cobbler object was found.
*/
protected static Map<String, Object>
lookupDataMapById(CobblerConnection client,
- String id, String findMethod, String
listMethod) {
+ String id, String findMethod) {
if (id == null) {
return null;
}
- if (client.is16OrGreater()) {
- Map<String, String> criteria = new HashMap<String, String>();
- criteria.put(UID, id);
- List<Map<String, Object>> objects = (List<Map<String, Object>>)
- client.invokeTokenMethod(findMethod, criteria);
- if (!objects.isEmpty()) {
- return objects.get(0);
- }
- return null;
- }
- List<Map<String, Object>> cobblerObjects = (List<Map<String,
Object>>)
-
client.invokeMethod(listMethod);
- for (Map <String, Object> map : cobblerObjects) {
-
- if (id.equals(map.get(UID))) {
- return map;
- }
+
+ Map<String, String> criteria = new HashMap<String, String>();
+ criteria.put(UID, id);
+ List<Map<String, Object>> objects = (List<Map<String, Object>>)
+ client.invokeTokenMethod(findMethod,
criteria);
+ if (!objects.isEmpty()) {
+ return objects.get(0);
}
return null;
+
}
/**
diff --git a/java/code/src/org/cobbler/Distro.java
b/java/code/src/org/cobbler/Distro.java
index 4e92961..bee6edf 100644
--- a/java/code/src/org/cobbler/Distro.java
+++ b/java/code/src/org/cobbler/Distro.java
@@ -77,7 +77,7 @@ public class Distro extends CobblerObject {
*/
public static Distro lookupById(CobblerConnection client, String id) {
return handleLookup(client, lookupDataMapById(client,
- id, "find_distro", "get_distros"));
+ id, "find_distro"));
}
private static Distro handleLookup(CobblerConnection client, Map
distroMap) {
diff --git a/java/code/src/org/cobbler/Profile.java
b/java/code/src/org/cobbler/Profile.java
index f77e5bc..03c922d 100644
--- a/java/code/src/org/cobbler/Profile.java
+++ b/java/code/src/org/cobbler/Profile.java
@@ -90,7 +90,7 @@ public class Profile extends CobblerObject {
*/
public static Profile lookupById(CobblerConnection client, String
id) {
return handleLookup(client, lookupDataMapById(client, id,
- "find_profile", "get_profiles"));
+ "find_profile"));
}
private static Profile handleLookup(CobblerConnection client, Map
profileMap) {
diff --git a/java/code/src/org/cobbler/SystemRecord.java
b/java/code/src/org/cobbler/SystemRecord.java
index 4b6d292..b946700 100644
--- a/java/code/src/org/cobbler/SystemRecord.java
+++ b/java/code/src/org/cobbler/SystemRecord.java
@@ -73,8 +73,7 @@ public class SystemRecord extends CobblerObject {
* @return the system record matching the given uid or null
*/
public static SystemRecord lookupById(CobblerConnection client,
String id) {
- return handleLookup(client,
- lookupDataMapById(client, id, "find_system",
"get_systems"));
+ return handleLookup(client, lookupDataMapById(client, id,
"find_system"));
}
private static SystemRecord handleLookup(CobblerConnection client,
Map sysMap) {
diff --git a/java/code/src/org/cobbler/test/MockConnection.java
b/java/code/src/org/cobbler/test/MockConnection.java
index d25adb1..76d4064 100644
--- a/java/code/src/org/cobbler/test/MockConnection.java
+++ b/java/code/src/org/cobbler/test/MockConnection.java
@@ -239,15 +239,7 @@ public class MockConnection extends CobblerConnection {
}
return "";
}
-
- /**
- * {...@inheritdoc}
- */
- @Override
- public boolean is16OrGreater() {
- return false;
- }
-
+
private Map findByName(String name, List<Map> maps) {
for (Map map : maps) {
if (name.equals(map.get("name"))) {
diff --git a/spacewalk/setup/spacewalk-setup.spec
b/spacewalk/setup/spacewalk-setup.spec
index 6df3bb3..430ba81 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -24,7 +24,7 @@ Requires: spacewalk-admin
Requires: spacewalk-certs-tools
Requires: perl-Satcon
Requires: spacewalk-backend-tools
-Requires: cobbler >= 1.4.3
+Requires: cobbler >= 1.6.3
Requires: PyYAML
Requires: jabberd
@@ -94,6 +94,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+ * Mon Apr 6 2009 Partha Aji <[email protected]> 0.6.1-1
+ - moved the cobbler requirement to 1.6.3 or greater as required by sat.
+
* Mon Apr 06 2009 Miroslav Suchý <[email protected]> 0.6.1-1
- replace snail with worm ([email protected])
- 391771 - removing usermod from install-db.sh, we should do it in
%pre of some
commit 5aacbe0d1bae4d661aa1ce14d929a4fc6c254062
Author: Partha Aji <[email protected]>
Date: Mon Apr 6 20:49:02 2009 -0400
Made the configuraiton manager instance static final instead of
just static.. Made no sense for it to be static...
diff --git
a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
index 1ce40eb..cf07316 100644
---
a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
+++
b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
@@ -76,7 +76,7 @@ public class ConfigurationManager extends BaseManager {
private static Logger log = Logger
.getLogger(ConfigurationManager.class);
- private static ConfigurationManager instance = new
ConfigurationManager();
+ private static final ConfigurationManager INSTANCE = new
ConfigurationManager();
// Used as keys into the Map returned by a file-content-validation
error
// see validateContent()
@@ -107,7 +107,7 @@ public class ConfigurationManager extends BaseManager {
* @return the static object of this class.
*/
public static ConfigurationManager getInstance() {
- return instance;
+ return INSTANCE;
}
/**
--
Jason Dobies
RHN Satellite / Spacewalk
RHCE# 805008743336126
Freenode: jdob @ #spacewalk #spacewalk-devel
_______________________________________________
spacewalk-commits mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/spacewalk-commits
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
