Changes to 'refs/tags/spacecmd-2.1.11-1'
by Michael Mraka
Tag 'spacecmd-2.1.11-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 11:58 +0000
Tagging package [spacecmd] version [2.1.11-1] in directory [spacecmd/].
Changes since spacewalk-backend-2.1.25-1:
David Juran (1):
spacecmd: Fix session validation
Michael Mraka (1):
Automatic commit of package [spacecmd] release [2.1.11-1].
Silvio Moioli (1):
Serializers for Taskomatic: log serialization errors
---
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java | 10 +++++-----
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java | 10 +++++-----
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java | 10 +++++-----
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java | 10 +++++-----
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/misc.py | 2 +-
7 files changed, 26 insertions(+), 23 deletions(-)
---
10 years, 6 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Michael Mraka
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/misc.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 9e80ddcd08c8b67a1cd013f118135badf5b1496c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 2 13:58:12 2013 +0200
Automatic commit of package [spacecmd] release [2.1.11-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index d50effe..f7438dd 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.10-1 spacecmd/
+2.1.11-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index d98321c..75e2158 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.10
+Version: 2.1.11
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1
+- spacecmd: Fix session validation
+
* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1
- removed trailing whitespaces
commit 524dfd5bd855b90f174b57238bcca1df76b24fce
Author: David Juran <djuran(a)redhat.com>
Date: Tue Oct 1 15:26:02 2013 +0200
spacecmd: Fix session validation
Turns out that although spacewalk (Red Hat Satellite 5.5) takes a
session argument for the api.getApiNamespaces() API call, this session is not
validated, i.e. the call will succeed no matter if the session is
valid or not. Which makes this particular call quite a bad choice
validating the session... Trying now to use user.listAssignableRoles
instead
diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py
index dff6fb3..f2769d5 100644
--- a/spacecmd/src/lib/misc.py
+++ b/spacecmd/src/lib/misc.py
@@ -307,7 +307,7 @@ def do_login(self, args):
try:
logging.debug('Using cached credentials from %s' % session_file)
- self.client.api.getApiNamespaces(self.session)
+ self.client.user.listAssignableRoles(self.session)
except:
logging.warning('Cached credentials are invalid')
self.current_user = ''
10 years, 6 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java | 10 +++++-----
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java | 10 +++++-----
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java | 10 +++++-----
java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java | 10 +++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit c29e224dcffdfcfc51d5108a3f0ac096b75fecb1
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Oct 2 10:57:11 2013 +0200
Serializers for Taskomatic: log serialization errors
diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java
index 6a0f459..68be48d 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoBunchSerializer.java
@@ -14,13 +14,13 @@
*/
package com.redhat.rhn.taskomatic.serializer;
+import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer;
import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import com.redhat.rhn.taskomatic.TaskoBunch;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -29,7 +29,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* TaskoBunchSerializer
* @version $Rev$
*/
-public class TaskoBunchSerializer implements XmlRpcCustomSerializer {
+public class TaskoBunchSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -41,12 +41,12 @@ public class TaskoBunchSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ public void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
TaskoBunch bunch = (TaskoBunch) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", bunch.getName());
helper.add("description", bunch.getDescription());
diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java
index 0ae373a..4a8ae6b 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoRunSerializer.java
@@ -14,13 +14,13 @@
*/
package com.redhat.rhn.taskomatic.serializer;
+import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer;
import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import com.redhat.rhn.taskomatic.TaskoRun;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -29,7 +29,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* TaskoRunSerializer
* @version $Rev$
*/
-public class TaskoRunSerializer implements XmlRpcCustomSerializer {
+public class TaskoRunSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -41,12 +41,12 @@ public class TaskoRunSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ public void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
TaskoRun run = (TaskoRun) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", run.getId());
helper.add("schedule_id", run.getScheduleId());
diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java
index 0c57d53..fd87ee1 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoScheduleSerializer.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.taskomatic.serializer;
+import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer;
import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import com.redhat.rhn.taskomatic.TaskoSchedule;
@@ -22,7 +23,6 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -31,7 +31,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* TaskoScheduleSerializer
* @version $Rev$
*/
-public class TaskoScheduleSerializer implements XmlRpcCustomSerializer {
+public class TaskoScheduleSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -43,12 +43,12 @@ public class TaskoScheduleSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ public void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
TaskoSchedule schedule = (TaskoSchedule) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", schedule.getId());
helper.add("job_label", schedule.getJobLabel());
diff --git a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java
index 4eea009..b10b848 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/serializer/TaskoTemplateSerializer.java
@@ -14,13 +14,13 @@
*/
package com.redhat.rhn.taskomatic.serializer;
+import com.redhat.rhn.frontend.xmlrpc.serializer.RhnXmlRpcCustomSerializer;
import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import com.redhat.rhn.taskomatic.TaskoTemplate;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -29,7 +29,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* TaskoTemplateSerializer
* @version $Rev$
*/
-public class TaskoTemplateSerializer implements XmlRpcCustomSerializer {
+public class TaskoTemplateSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -41,12 +41,12 @@ public class TaskoTemplateSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ public void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
TaskoTemplate template = (TaskoTemplate) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", template.getTask().getName());
helper.writeTo(output);
10 years, 6 months
Changes to 'refs/tags/spacewalk-backend-2.1.25-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 09:23 +0000
Tagging package [spacewalk-backend] version [2.1.25-1] in directory [backend/].
Changes since spacewalk-java-2.1.51-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [2.1.25-1].
Silvio Moioli (1):
Added an Ivy dependency needed for tests
Tomas Kasparek (1):
fixing indentation - expandtabs vs noexpandtab
---
backend/spacewalk-backend.spec | 6 +++++-
java/ivy.xml | 1 +
rel-eng/packages/spacewalk-backend | 2 +-
reporting/reports/data/inventory | 4 ++--
4 files changed, 9 insertions(+), 4 deletions(-)
---
10 years, 6 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit abc2b96640358ef8399de8b425724c60fd59d071
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 2 11:23:37 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.25-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index debc811..5938859 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.24
+Version: 2.1.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1
+- 923338 - replace application code with database lookup to prevent conflicting
+ inserts
+
* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.24-1
- make pylint 1.0 happy about map/filter on lambda
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 85991cd..7bfb0f0 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.24-1 backend/
+2.1.25-1 backend/
10 years, 6 months
java/ivy.xml
by Silvio Moioli
java/ivy.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 74b01fa48661ca307154a9351b9702a3ff8a9a2b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Oct 2 09:25:11 2013 +0200
Added an Ivy dependency needed for tests
diff --git a/java/ivy.xml b/java/ivy.xml
index 73aec4f..eb0f698 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -19,6 +19,7 @@
<dependency org="redhat" name="commons-discovery" rev="0.2" />
<dependency org="redhat" name="commons-el" rev="1.0" />
<dependency org="redhat" name="commons-httpclient" rev="3.0" />
+ <dependency org="redhat" name="commons-io" rev="1.3.2" />
<dependency org="redhat" name="commons-lang" rev="2.1" />
<dependency org="redhat" name="commons-logging" rev="1.0.4" />
<dependency org="redhat" name="commons-validator" rev="1.1.4" />
10 years, 6 months
reporting/reports
by Tomáš Kašpárek
reporting/reports/data/inventory | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4a73dc7bb914c51c1c4fd79e8d0d9f534a72e76c
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Oct 2 08:23:58 2013 +0200
fixing indentation - expandtabs vs noexpandtab
diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory
index 1bdc406..6165e96 100644
--- a/reporting/reports/data/inventory
+++ b/reporting/reports/data/inventory
@@ -29,7 +29,7 @@ columns:
virtual_host:i System identifier of host, if system is a guest
architecture Architecture of the system
is_virtualized Information whether system is virtualized or not
- virt_type System virtualization type
+ virt_type System virtualization type
osad_status OSAD status
hardware Hardware information
@@ -79,7 +79,7 @@ sql:
) as architecture,
(case when (select rhnVirtualInstance.virtual_system_id from rhnVirtualInstance where rhnVirtualInstance.virtual_system_id=rhnserver.id) is null then 'No' else 'Yes' end
) as is_virtualized,
- (select rvit.name from rhnvirtualinstance rvi inner join rhnvirtualinstanceinfo rvii on rvi.id = rvii.instance_id inner join rhnvirtualinstancetype rvit on rvii.instance_type = rvit.id where rvi.virtual_system_id = rhnserver.id) as virt_type,
+ (select rvit.name from rhnvirtualinstance rvi inner join rhnvirtualinstanceinfo rvii on rvi.id = rvii.instance_id inner join rhnvirtualinstancetype rvit on rvii.instance_type = rvit.id where rvi.virtual_system_id = rhnserver.id) as virt_type,
(nvl((select rhnpushclientstate.label from rhnpushclient join rhnpushclientstate on rhnpushclient.state_id=rhnpushclientstate.id where rhnpushclient.server_id=rhnServer.id), 'Not enabled')) as osad_status,
get_hw_info_as_clob(rhnserver.id, '; ') as hardware
from rhnserver left outer join
10 years, 6 months
Changes to 'refs/tags/spacewalk-java-2.1.51-1'
by Grant Gainey
Tag 'spacewalk-java-2.1.51-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-10-01 20:51 +0000
Tagging package [spacewalk-java] version [2.1.51-1] in directory [java/].
Changes since spacewalk-reports-2.1.13-1:
Grant Gainey (2):
Refactoring that lets us log serialization errors
Automatic commit of package [spacewalk-java] release [2.1.51-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 19 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java | 23 +---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java | 29 ++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java | 16 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java | 16 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 21 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java | 19 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java | 57 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java | 19 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java | 20 ---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 25 ++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java | 23 +---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java | 21 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java | 9 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java | 9 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java | 9 -
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
88 files changed, 601 insertions(+), 641 deletions(-)
---
10 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 2bf94b2eb5bb31d04356b6e57fdf64f72874bcd0
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Oct 1 16:51:53 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.51-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e2cd294..b685668 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.50
+Version: 2.1.51
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 01 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.51-1
+- Refactoring that lets us log serialization errors * Added
+ RhnXmlRpcCustomSerializer base class * Refactored all Serializers to extend
+ from RhnXmlRpcCustomSerializer * Refactored SerializerFactory to be
+ less...clever
+
* Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.50-1
- removed trailing whitespaces
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b46ce36..53e4724 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.50-1 java/
+2.1.51-1 java/
10 years, 6 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 19 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java | 23 +---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java | 29 ++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java | 16 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java | 16 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 21 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java | 17 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java | 19 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java | 57 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java | 19 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java | 20 ---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 25 ++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java | 23 +---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java | 15 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java | 21 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java | 13 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java | 9 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java | 9 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java | 9 -
86 files changed, 593 insertions(+), 639 deletions(-)
New commits:
commit 1fddc7359c54dcfae38505c55a6074144685e2f5
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Oct 1 16:49:40 2013 -0400
Refactoring that lets us log serialization errors
* Added RhnXmlRpcCustomSerializer base class
* Refactored all Serializers to extend from RhnXmlRpcCustomSerializer
* Refactored SerializerFactory to be less...clever
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java
index 50d4e15..9e25c09 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ActivationKeySerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.token.ActivationKey;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.token.ActivationKey;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ActivationKeySerializer
@@ -49,7 +48,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("boolean", "disabled")
* #struct_end()
*/
-public class ActivationKeySerializer implements XmlRpcCustomSerializer {
+public class ActivationKeySerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -59,10 +58,10 @@ public class ActivationKeySerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ActivationKey key = (ActivationKey)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
TokenSerializer.populateTokenInfo(key.getToken(), helper);
helper.add("key", key.getKey());
helper.writeTo(output);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java
index c0bf754..a7550fb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/BigDecimalSerializer.java
@@ -18,7 +18,6 @@ import java.io.IOException;
import java.io.Writer;
import java.math.BigDecimal;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -31,7 +30,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* @xmlrpc.doc
* #param ("int")
*/
-public class BigDecimalSerializer implements XmlRpcCustomSerializer {
+public class BigDecimalSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -43,8 +42,8 @@ public class BigDecimalSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
BigDecimal bd = (BigDecimal) value;
output.write("<i4>");
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java
index bb31f69..b7c4dd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelArchSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.channel.ChannelArch;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.channel.ChannelArch;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ChannelArchSerializer serializes ChannelArch object to XMLRPC.
* @version $Rev$
@@ -33,7 +32,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "label")
* #struct_end()
*/
-public class ChannelArchSerializer implements XmlRpcCustomSerializer {
+public class ChannelArchSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -42,11 +41,11 @@ public class ChannelArchSerializer implements XmlRpcCustomSerializer {
/** {@inheritDoc}
* @throws IOException */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ChannelArch arch = (ChannelArch) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", arch.getName());
helper.add("label", arch.getLabel());
helper.writeTo(output);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java
index 8c0e398..9a4bf4c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelFamilySystemGroupSerializer.java
@@ -14,19 +14,18 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ChannelFamilySystem;
-import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ChannelFamilySystem;
+import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ChannelArchSerializer serializes ChannelArch object to XMLRPC.
* @version $Rev$
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #array_single("int", "systems")
* #struct_end()
*/
-public class ChannelFamilySystemGroupSerializer implements XmlRpcCustomSerializer {
+public class ChannelFamilySystemGroupSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -47,12 +46,12 @@ public class ChannelFamilySystemGroupSerializer implements XmlRpcCustomSerialize
/** {@inheritDoc}
* @throws IOException */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ChannelFamilySystemGroup group = (ChannelFamilySystemGroup) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", group.getId());
helper.add("label", group.getLabel());
helper.add("name", group.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java
index 083b3ae..54f0459 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelOverviewSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ChannelOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ChannelOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* ChannelOverviewSerializer
@@ -41,7 +40,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "total_flex")
* #struct_end()
*/
-public class ChannelOverviewSerializer implements XmlRpcCustomSerializer {
+public class ChannelOverviewSerializer extends RhnXmlRpcCustomSerializer {
/**
*
@@ -54,9 +53,9 @@ public class ChannelOverviewSerializer implements XmlRpcCustomSerializer {
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
ChannelOverview group = (ChannelOverview) value;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
index e11e1d1..ad843f5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -68,7 +67,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #struct_end()
*
*/
-public class ChannelSerializer implements XmlRpcCustomSerializer {
+public class ChannelSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -80,9 +79,9 @@ public class ChannelSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
Channel c = (Channel) value;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java
index a02c695..41af4d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelTreeNodeSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ChannelTreeNode;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ChannelTreeNode;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ChannelTreeNodeSerializer: Converts a ChannelTreeNode object for
* representation as an XMLRPC struct.
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "arch_name")
* #struct_end()
*/
-public class ChannelTreeNodeSerializer implements XmlRpcCustomSerializer {
+public class ChannelTreeNodeSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -52,11 +51,11 @@ public class ChannelTreeNodeSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ChannelTreeNode ctn = (ChannelTreeNode)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", ctn.getId());
helper.add("label", ctn.getChannelLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java
index bb5446a..fe0f504 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelDtoSerializer.java
@@ -14,17 +14,16 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.config.ConfigChannelType;
-import com.redhat.rhn.frontend.dto.ConfigChannelDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.config.ConfigChannelType;
+import com.redhat.rhn.frontend.dto.ConfigChannelDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigChannelDtoSerializer
@@ -42,7 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* $ConfigChannelTypeSerializer
* #struct_end()
*/
-public class ConfigChannelDtoSerializer implements XmlRpcCustomSerializer {
+public class ConfigChannelDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -54,10 +53,10 @@ public class ConfigChannelDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ConfigChannelDto dto = (ConfigChannelDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", dto.getId().longValue());
helper.add("label", dto.getLabel());
helper.add("name", dto.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java
index 6175757..84982ef 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.config.ConfigChannel;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.config.ConfigChannel;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigurationChannelSerializer
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* $ConfigChannelTypeSerializer
* #struct_end()
*/
-public class ConfigChannelSerializer implements XmlRpcCustomSerializer {
+public class ConfigChannelSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
@@ -53,10 +52,10 @@ public class ConfigChannelSerializer implements XmlRpcCustomSerializer {
* {@inheritDoc}
* @throws IOException
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ConfigChannel chan = (ConfigChannel) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", chan.getId());
helper.add("label", chan.getLabel());
helper.add("name", chan.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java
index 1f27974..53c986b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigChannelTypeSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.config.ConfigChannelType;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.config.ConfigChannelType;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigChannelTypeSerializer
@@ -37,15 +36,15 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "priority")
* #struct_end()
*/
-public class ConfigChannelTypeSerializer implements XmlRpcCustomSerializer {
+public class ConfigChannelTypeSerializer extends RhnXmlRpcCustomSerializer {
/**
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
ConfigChannelType type = (ConfigChannelType) value;
helper.add("id", type.getId());
helper.add("label", type.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java
index dc8da45..b0d46bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ConfigFileDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ConfigFileDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigFileDtoSerializer
@@ -41,7 +40,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc($date, "last_modified","Last Modified Date")
* #struct_end()
*/
-public class ConfigFileDtoSerializer implements XmlRpcCustomSerializer {
+public class ConfigFileDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,12 +50,12 @@ public class ConfigFileDtoSerializer implements XmlRpcCustomSerializer {
}
/**
- * {@inheritDoc}builtInSerializer
+ * {@inheritDoc}serializer
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ConfigFileDto dto = (ConfigFileDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("type", dto.getType());
helper.add("path", dto.getPath());
helper.add("last_modified", dto.getModified());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java
index ebc55ed..cc84a02 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java
@@ -15,18 +15,17 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.config.ConfigChannelType;
-import com.redhat.rhn.frontend.dto.ConfigFileDto;
-import com.redhat.rhn.frontend.dto.ConfigFileNameDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.config.ConfigChannelType;
+import com.redhat.rhn.frontend.dto.ConfigFileDto;
+import com.redhat.rhn.frontend.dto.ConfigFileNameDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigFileDtoSerializer
@@ -49,7 +48,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc($date, "last_modified","Last Modified Date")
* #struct_end()
*/
-public class ConfigFileNameDtoSerializer implements XmlRpcCustomSerializer {
+public class ConfigFileNameDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -61,11 +60,11 @@ public class ConfigFileNameDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ConfigFileNameDto dto = (ConfigFileNameDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("type", dto.getConfigFileType());
helper.add("path", dto.getPath());
ConfigChannelType type =
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java
index fb4faa1..02816fe 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java
@@ -14,23 +14,22 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.FaultException;
-import com.redhat.rhn.common.util.StringUtil;
-import com.redhat.rhn.domain.config.ConfigRevision;
-import com.redhat.rhn.domain.config.EncodedConfigRevision;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.codec.binary.Base64;
-
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.text.DecimalFormat;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.codec.binary.Base64;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.FaultException;
+import com.redhat.rhn.common.util.StringUtil;
+import com.redhat.rhn.domain.config.ConfigRevision;
+import com.redhat.rhn.domain.config.EncodedConfigRevision;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigRevisionSerializer
@@ -69,7 +68,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* "Macro end delimiter for a config file. Present for text files only.")
* #struct_end()
*/
-public class ConfigRevisionSerializer implements XmlRpcCustomSerializer {
+public class ConfigRevisionSerializer extends RhnXmlRpcCustomSerializer {
public static final String CONTENTS = "contents";
public static final String CONTENTS_ENC64 = "contents_enc64";
@@ -97,10 +96,10 @@ public class ConfigRevisionSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ConfigRevision rev = (ConfigRevision) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
if (rev.getConfigFileType() != null) {
helper.add(TYPE, rev.getConfigFileType().getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java
index 06e5b27..1a736bd 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigSystemDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ConfigSystemDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ConfigSystemDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ConfigSystemDtoSerializer
@@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "name")
* #struct_end()
*/
-public class ConfigSystemDtoSerializer implements XmlRpcCustomSerializer {
+public class ConfigSystemDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -45,12 +44,12 @@ public class ConfigSystemDtoSerializer implements XmlRpcCustomSerializer {
}
/**
- * {@inheritDoc}builtInSerializer
+ * {@inheritDoc}serializer
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ConfigSystemDto dto = (ConfigSystemDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", dto.getId());
helper.add("name", dto.getName());
helper.writeTo(output);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java
index a4aba0c..fd115ad 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceFilterSerializer.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -37,7 +36,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #struct_end()
*
*/
-public class ContentSourceFilterSerializer implements XmlRpcCustomSerializer {
+public class ContentSourceFilterSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -49,9 +48,9 @@ public class ContentSourceFilterSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
ContentSourceFilter filter = (ContentSourceFilter) value;
helper.add("sortOrder", filter.getSortOrder());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java
index d13f79f..2032222 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ContentSourceSerializer.java
@@ -17,8 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -39,7 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #struct_end()
*
*/
-public class ContentSourceSerializer implements XmlRpcCustomSerializer {
+public class ContentSourceSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,9 +49,9 @@ public class ContentSourceSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
ContentSource repo = (ContentSource) value;
helper.add("id", repo.getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
index 7ff30a0..9770162 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CpuSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.CPU;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.CPU;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* CpuSerializer
@@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class CpuSerializer implements XmlRpcCustomSerializer {
+public class CpuSerializer extends RhnXmlRpcCustomSerializer {
/**
*
@@ -56,9 +55,9 @@ public class CpuSerializer implements XmlRpcCustomSerializer {
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
CPU cpu = (CPU) value;
helper.add("cache", cpu.getCache());
helper.add("family", cpu.getFamily());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java
index 8efee42..1c8ff7a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.CryptoKeyDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.CryptoKeyDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* Serializes instances of {@link com.redhat.rhn.frontend.dto.CryptoKeyDto}.
*
@@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "type")
* #struct_end()
*/
-public class CryptoKeyDtoSerializer implements XmlRpcCustomSerializer {
+public class CryptoKeyDtoSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -43,7 +42,7 @@ public class CryptoKeyDtoSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer)
+ protected void doSerialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer)
throws XmlRpcException, IOException {
if (!(o instanceof CryptoKeyDto)) {
throw new XmlRpcException("Object of incorrect type to be serialized. " +
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java
index 3634c90..85b1334 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* Serializes instances of
* {@link com.redhat.rhn.domain.kickstart.crypto.CryptoKey}.
@@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "content")
* #struct_end()
*/
-public class CryptoKeySerializer implements XmlRpcCustomSerializer {
+public class CryptoKeySerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -45,7 +44,7 @@ public class CryptoKeySerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer)
+ protected void doSerialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer)
throws XmlRpcException, IOException {
if (!(o instanceof CryptoKey)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java
index 0b20fa4..e25ce9e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyTypeSerializer.java
@@ -14,23 +14,22 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* CryptoKeyTypeSerializer: Converts a CryptoKeyType object for representation
* as an XMLRPC struct.
* @version $Rev$
*
*/
-public class CryptoKeyTypeSerializer implements XmlRpcCustomSerializer {
+public class CryptoKeyTypeSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -42,11 +41,11 @@ public class CryptoKeyTypeSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
CryptoKeyType ckt = (CryptoKeyType)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", ckt.getId());
helper.add("label", ckt.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java
index 0600d85..fc029bf 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CustomDataKeySerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.CustomDataKeyOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.CustomDataKeyOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* CustomDataKeySerializer: Converts a CustomDataKeyOverview object for
* representation as an XMLRPC struct.
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("dateTime.iso8601", "last_modified")
* #struct_end()
*/
-public class CustomDataKeySerializer implements XmlRpcCustomSerializer {
+public class CustomDataKeySerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,11 +50,11 @@ public class CustomDataKeySerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
CustomDataKeyOverview key = (CustomDataKeyOverview)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", key.getId());
helper.add("label", key.getLabel());
helper.add("description", key.getDescription());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java
index 572a00f..fc76482 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DeviceSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.Device;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.Device;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* DeviceSerializer
@@ -40,17 +39,17 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "pcitype")
* #struct_end()
*/
-public class DeviceSerializer implements XmlRpcCustomSerializer {
+public class DeviceSerializer extends RhnXmlRpcCustomSerializer {
/**
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
Device dev = (Device) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("device", dev.getDevice());
helper.add("device_class", dev.getDeviceClass());
helper.add("driver", dev.getDriver());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
index 4c2917e..23f110a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.channel.DistChannelMap;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.channel.DistChannelMap;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* DistChannelMapSerializer
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "org_specific", "'Y' organization specific, 'N' default")
* #struct_end()
*/
-public class DistChannelMapSerializer implements XmlRpcCustomSerializer {
+public class DistChannelMapSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -50,11 +49,11 @@ public class DistChannelMapSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
DistChannelMap dstChannelMap = (DistChannelMap) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("os", dstChannelMap.getOs());
helper.add("release", dstChannelMap.getRelease());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java
index 460a8b0..a03f14b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DmiSerializer.java
@@ -15,18 +15,17 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.Dmi;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.lang.StringUtils;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.Dmi;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* DmiSerializer
@@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "bios_version", "(optional)")
* #struct_end()
*/
-public class DmiSerializer implements XmlRpcCustomSerializer {
+public class DmiSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -54,9 +53,9 @@ public class DmiSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper bean = new SerializerHelper(builtInSerializer);
+ SerializerHelper bean = new SerializerHelper(serializer);
Dmi dmi = (Dmi) value;
bean.add("vendor", StringUtils.defaultString(dmi.getVendor()));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java
index 5ec5e81..2429483 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.entitlement.Entitlement;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.entitlement.Entitlement;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* EntitlementSerializer
@@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "type")
* #struct_end()
*/
-public class EntitlementSerializer implements XmlRpcCustomSerializer {
+public class EntitlementSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,10 +47,10 @@ public class EntitlementSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
Entitlement ent = (Entitlement) value;
helper.add("label", ent.getLabel());
helper.add("name", ent.getHumanReadableLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java
index 588efe6..c263e99 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/EntitlementServerGroupSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.EntitlementServerGroup;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.EntitlementServerGroup;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* EntitlementServerGroupSerializer
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "total_slots")
* #struct_end()
*/
-public class EntitlementServerGroupSerializer implements XmlRpcCustomSerializer {
+public class EntitlementServerGroupSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -50,9 +49,9 @@ public class EntitlementServerGroupSerializer implements XmlRpcCustomSerializer
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
EntitlementServerGroup group = (EntitlementServerGroup) value;
helper.add("name", group.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java
index c56d631..142f4fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ErrataOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ErrataOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* ErrataOverviewSerializer
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "advisory_name", "Name such as RHSA, etc")
* #struct_end()
*/
-public class ErrataOverviewSerializer implements XmlRpcCustomSerializer {
+public class ErrataOverviewSerializer extends RhnXmlRpcCustomSerializer {
/**
*
@@ -53,11 +52,11 @@ public class ErrataOverviewSerializer implements XmlRpcCustomSerializer {
* {@inheritDoc}
* @throws IOException
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ErrataOverview errata = (ErrataOverview) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", errata.getId());
helper.add("issue_date", errata.getIssueDate());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java
index db672fd..133f866 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java
@@ -14,17 +14,16 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.domain.errata.Errata;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.errata.Errata;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* ErrataSerializer
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "advisory_synopsis", "Summary of the erratum.")
* #struct_end()
*/
-public class ErrataSerializer implements XmlRpcCustomSerializer {
+public class ErrataSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,11 +50,11 @@ public class ErrataSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
Errata errata = (Errata) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", errata.getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java
index 7342ca2..d87a5a9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FileListSerializer.java
@@ -14,19 +14,18 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.common.FileList;
-import com.redhat.rhn.domain.config.ConfigFileName;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
import java.util.LinkedList;
import java.util.List;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.common.FileList;
+import com.redhat.rhn.domain.config.ConfigFileName;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* FileListSerializer: Converts a FileList object for representation
* as an XMLRPC struct.
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_array("file_names", "string", "name")
* #struct_end()
*/
-public class FileListSerializer implements XmlRpcCustomSerializer {
+public class FileListSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -50,11 +49,11 @@ public class FileListSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
FileList fl = (FileList)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", fl.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java
index 4f0d356..84745e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.FilePreservationDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.FilePreservationDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* FilePreservationDtoSerializer
* @version $Rev$
@@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("dateTime.iso8601", "last_modified")
* #struct_end()
*/
-public class FilePreservationDtoSerializer implements XmlRpcCustomSerializer {
+public class FilePreservationDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -46,10 +45,10 @@ public class FilePreservationDtoSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
FilePreservationDto fs = (FilePreservationDto)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", fs.getLabel());
helper.add("id", fs.getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java
index 7c6976e..4f4a649 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/HistoryEventSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.HistoryEvent;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.HistoryEvent;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* HistoryEventSerializer
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
*
*
*/
-public class HistoryEventSerializer implements XmlRpcCustomSerializer {
+public class HistoryEventSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -52,10 +51,10 @@ public class HistoryEventSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
HistoryEvent event = (HistoryEvent) value;
helper.add("summary", event.getSummary());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java
index ce32d67..1ee48cd 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterOrgSerializer.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -35,7 +34,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop("int", "localOrgId")
* #struct_end()
*/
-public class IssMasterOrgSerializer implements XmlRpcCustomSerializer {
+public class IssMasterOrgSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -47,7 +46,7 @@ public class IssMasterOrgSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer)
+ protected void doSerialize(Object obj, Writer writer, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SerializerHelper helper = new SerializerHelper(serializer);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java
index 5cbc75f..77f5c01 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssMasterSerializer.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -36,7 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop("boolean", "isCurrentMaster")
* #struct_end()
*/
-public class IssMasterSerializer implements XmlRpcCustomSerializer {
+public class IssMasterSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,7 +47,7 @@ public class IssMasterSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer)
+ protected void doSerialize(Object obj, Writer writer, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SerializerHelper helper = new SerializerHelper(serializer);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java
index 466d4c0..9fbd1a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/IssSlaveSerializer.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -36,7 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop("boolean", "allowAllOrgs")
* #struct_end()
*/
-public class IssSlaveSerializer implements XmlRpcCustomSerializer {
+public class IssSlaveSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,7 +47,7 @@ public class IssSlaveSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer)
+ protected void doSerialize(Object obj, Writer writer, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SerializerHelper helper = new SerializerHelper(serializer);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java
index 50870d0..8bb4fb6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java
@@ -15,16 +15,15 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartCommand;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartCommand;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartAdvancedOptionsSerializer: Converts a KickstartCommand object for
* representation as an XMLRPC struct.
@@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "arguments")
* #struct_end()
*/
-public class KickstartAdvancedOptionsSerializer implements XmlRpcCustomSerializer {
+public class KickstartAdvancedOptionsSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -49,11 +48,11 @@ public class KickstartAdvancedOptionsSerializer implements XmlRpcCustomSerialize
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartCommand cmd = (KickstartCommand)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", cmd.getCommandName().getName());
helper.add("arguments", cmd.getArguments());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java
index 0e74f60..2c85a40 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandNameSerializer.java
@@ -14,23 +14,22 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartCommandName;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartCommandName;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartCommandNameSerializer: Converts a KickstartCommandName object for
* representation as an XMLRPC struct.
* @version $Rev$
*
*/
-public class KickstartCommandNameSerializer implements XmlRpcCustomSerializer {
+public class KickstartCommandNameSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -42,11 +41,11 @@ public class KickstartCommandNameSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartCommandName kn = (KickstartCommandName)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", kn.getId());
helper.add("name", kn.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java
index d0abbba..58043d9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartCommandSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartCommand;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartCommand;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartCommandSerializer: Converts a KickstartCommand object for representation
* as an XMLRPC struct.
@@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "arguments")
* #struct_end()
*/
-public class KickstartCommandSerializer implements XmlRpcCustomSerializer {
+public class KickstartCommandSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,11 +47,11 @@ public class KickstartCommandSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartCommand kc = (KickstartCommand)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", kc.getId());
helper.add("arguments", kc.getArguments());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java
index be86d74..9d6484a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ActivationKeySerializer
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "update_type")
* #struct_end()
*/
-public class KickstartDtoSerializer implements XmlRpcCustomSerializer {
+public class KickstartDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -50,10 +49,10 @@ public class KickstartDtoSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartDto ks = (KickstartDto)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("label", ks.getLabel());
helper.add("active", ks.isActive());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java
index 57f06c8..f3dd5c3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartInstallTypeSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartInstallType;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartInstallType;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartTreeSerializer
@@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "name")
* #struct_end()
*/
-public class KickstartInstallTypeSerializer implements XmlRpcCustomSerializer {
+public class KickstartInstallTypeSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -50,12 +49,12 @@ public class KickstartInstallTypeSerializer implements XmlRpcCustomSerializer {
* {@inheritDoc}
* @throws IOException
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartInstallType type = (KickstartInstallType) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", type.getId());
helper.add("label", type.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java
index 84ef0ff..a8815c3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartIpRangeSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartIpRange;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartIpRange;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartIpRangeSerializer
@@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "min", "The min ip of the range")
* #struct_end()
*/
-public class KickstartIpRangeSerializer implements XmlRpcCustomSerializer {
+public class KickstartIpRangeSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -46,10 +45,10 @@ public class KickstartIpRangeSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartIpRange range = (KickstartIpRange)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("ksLabel", range.getKsdata().getLabel());
helper.add("min", range.getMinString());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java
index 376077d..5ff153e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* Serializer for {@link KickstartOptionValue} objects.
*
@@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*/
-public class KickstartOptionValueSerializer implements XmlRpcCustomSerializer {
+public class KickstartOptionValueSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -45,7 +44,7 @@ public class KickstartOptionValueSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer)
+ protected void doSerialize(Object o, Writer writer, XmlRpcSerializer xmlRpcSerializer)
throws XmlRpcException, IOException {
if (!(o instanceof KickstartOptionValue)) {
throw new XmlRpcException("Object of incorrect type to be serialized. " +
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java
index 040e513..8fb2b46 100755
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartScript;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartScript;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* ErrataOverviewSerializer
@@ -44,7 +43,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("boolean", "template", "True if templating using cobbler is enabled")
* #struct_end()
*/
-public class KickstartScriptSerializer implements XmlRpcCustomSerializer {
+public class KickstartScriptSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -56,11 +55,11 @@ public class KickstartScriptSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartScript script = (KickstartScript) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", script.getId());
helper.add("contents", script.getDataContents());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java
index f80e55e..beeea41 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeDetailSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDetail;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.kickstart.KickstartableTreeDetail;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartTreeDetailSerializer
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* $KickstartInstallTypeSerializer
* #struct_end()
*/
-public class KickstartTreeDetailSerializer implements XmlRpcCustomSerializer {
+public class KickstartTreeDetailSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -52,12 +51,12 @@ public class KickstartTreeDetailSerializer implements XmlRpcCustomSerializer {
* {@inheritDoc}
* @throws IOException
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartableTreeDetail treeDetail = (KickstartableTreeDetail) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", treeDetail.getId());
helper.add("label", treeDetail.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java
index bd51ff5..195896e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartTreeSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.KickstartableTree;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.KickstartableTree;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* KickstartTreeSerializer
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "channel_id")
* #struct_end()
*/
-public class KickstartTreeSerializer implements XmlRpcCustomSerializer {
+public class KickstartTreeSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,12 +50,12 @@ public class KickstartTreeSerializer implements XmlRpcCustomSerializer {
* {@inheritDoc}
* @throws IOException
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
KickstartableTree tree = (KickstartableTree)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", tree.getId());
helper.add("label", tree.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java
index 0d0ff3b..97422d6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ManagedServerGroupSerializer.java
@@ -14,17 +14,16 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.ManagedServerGroup;
-import com.redhat.rhn.domain.server.ServerGroup;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.ManagedServerGroup;
+import com.redhat.rhn.domain.server.ServerGroup;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ManagedServerGroupSerializer is a custom serializer for the XMLRPC library.
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class ManagedServerGroupSerializer implements XmlRpcCustomSerializer {
+public class ManagedServerGroupSerializer extends RhnXmlRpcCustomSerializer {
public static final String CURRENT_MEMBERS = "system_count";
@@ -55,23 +54,23 @@ public class ManagedServerGroupSerializer implements XmlRpcCustomSerializer {
* instead of traversing the entire object graph.
* @param value ServerGroup object.
* @param output Buffer to serialize the object to.
- * @param builtInSerializer basic XMLRPC serializer
+ * @param serializer basic XMLRPC serializer
* @throws XmlRpcException thrown if a problem occurs with serializing
* the value.
* @throws IOException thrown if a problem occurs with serializing
* the value.
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ServerGroup sg = (ServerGroup) value;
- SerializerHelper serializer = new SerializerHelper(builtInSerializer);
- serializer.add("id", sg.getId());
- serializer.add("name", sg.getName());
- serializer.add("description", sg.getDescription());
- serializer.add(CURRENT_MEMBERS, sg.getCurrentMembers());
- serializer.add("org_id", sg.getOrg().getId());
- serializer.writeTo(output);
+ SerializerHelper helper = new SerializerHelper(serializer);
+ helper.add("id", sg.getId());
+ helper.add("name", sg.getName());
+ helper.add("description", sg.getDescription());
+ helper.add(CURRENT_MEMBERS, sg.getCurrentMembers());
+ helper.add("org_id", sg.getOrg().getId());
+ helper.writeTo(output);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
index 9868f8b..b1e856a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* MultiOrgEntitlementsDtoSerializer
* @version $Rev$
@@ -42,8 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "unallocated_flex")
* #struct_end()
*/
-public class MultiOrgEntitlementsDtoSerializer implements
- XmlRpcCustomSerializer {
+public class MultiOrgEntitlementsDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -56,10 +54,10 @@ public class MultiOrgEntitlementsDtoSerializer implements
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
MultiOrgEntitlementsDto dto = (MultiOrgEntitlementsDto) value;
helper.add("name", dto.getName());
helper.add("label", dto.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java
index aeaa4cc..2cede27 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgUserOverviewSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.MultiOrgUserOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.MultiOrgUserOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* MultiOrgAllUserOverviewSerializer
@@ -38,8 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("boolean", "is_org_admin")
* #struct_end()
*/
-public class MultiOrgUserOverviewSerializer implements
- XmlRpcCustomSerializer {
+public class MultiOrgUserOverviewSerializer extends RhnXmlRpcCustomSerializer {
/**
*
@@ -53,10 +51,10 @@ public class MultiOrgUserOverviewSerializer implements
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper se = new SerializerHelper(builtInSerializer);
+ SerializerHelper se = new SerializerHelper(serializer);
MultiOrgUserOverview dto = (MultiOrgUserOverview) value;
se.add("login", dto.getLogin());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java
index 6f8c63a..7142922 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java
@@ -14,18 +14,17 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.NetworkDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.lang.StringUtils;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.NetworkDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* NetworkDtoSerializer
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* successfully checked in")
* #struct_end()
*/
-public class NetworkDtoSerializer implements XmlRpcCustomSerializer {
+public class NetworkDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -50,10 +49,10 @@ public class NetworkDtoSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
NetworkDto net = (NetworkDto)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("systemId", net.getId());
String name = net.getName();
if (StringUtils.isBlank(name)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
index 87a274a..d1ec53f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
@@ -14,22 +14,21 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.NetworkInterface;
-import com.redhat.rhn.domain.server.ServerNetAddress6;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.lang.StringUtils;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.NetworkInterface;
+import com.redhat.rhn.domain.server.ServerNetAddress6;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* NetworkInterfaceSerializer
@@ -55,7 +54,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer {
+public class NetworkInterfaceSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -65,14 +64,14 @@ public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
NetworkInterface device = (NetworkInterface)value;
- SerializerHelper devMap = new SerializerHelper(builtInSerializer);
+ SerializerHelper devMap = new SerializerHelper(serializer);
ArrayList ipv6List = new ArrayList();
for (ServerNetAddress6 addr : device.getIPv6Addresses()) {
-// SerializerHelper m = new SerializerHelper(builtInSerializer);
+// SerializerHelper m = new SerializerHelper(serializer);
Map m = new HashMap();
m.put("address", StringUtils.defaultString(addr.getAddress()));
m.put("netmask", StringUtils.defaultString(addr.getNetmask()));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java
index 74d50cc..4702d78 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NoteSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.server.Note;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.server.Note;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("date", "updated", "Date of the last note update")
* #struct_end()
*/
-public class NoteSerializer implements XmlRpcCustomSerializer {
+public class NoteSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -53,10 +52,10 @@ public class NoteSerializer implements XmlRpcCustomSerializer {
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
Note note = (Note) value;
helper.add("id", note.getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java
index 0357d71..6b8a577 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ObjectSerializer.java
@@ -14,21 +14,20 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ObjectSerializer
* @version $Rev$
*/
-public class ObjectSerializer implements XmlRpcCustomSerializer {
+public class ObjectSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -40,9 +39,9 @@ public class ObjectSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper s = new SerializerHelper(builtInSerializer);
+ SerializerHelper s = new SerializerHelper(serializer);
s.add("value", String.valueOf(value));
s.writeTo(output);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java
index 4a7b6a8..a19251a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgChannelFamilySerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.OrgChannelFamily;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.OrgChannelFamily;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* OrgChannelFamilySerializer
@@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "used_flex")
* #struct_end()
*/
-public class OrgChannelFamilySerializer implements XmlRpcCustomSerializer {
+public class OrgChannelFamilySerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -55,10 +54,10 @@ public class OrgChannelFamilySerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
OrgChannelFamily dto = (OrgChannelFamily) value;
helper.add("name", dto.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
index 5943bcf..3916fd5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.OrgDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.OrgDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* OrgDtoSerializer
@@ -46,7 +45,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* "Number of configuration channels in the organization. (optional)")
* #struct_end()
*/
-public class OrgDtoSerializer implements XmlRpcCustomSerializer {
+public class OrgDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -60,10 +59,10 @@ public class OrgDtoSerializer implements XmlRpcCustomSerializer {
*
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
OrgDto dto = (OrgDto) value;
helper.add("id", dto.getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java
index 0ae114c..4d205ea 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgEntitlementDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.OrgEntitlementDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.OrgEntitlementDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* OrgEntitlementDtoSerializer
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "unallocated")
* #struct_end()
*/
-public class OrgEntitlementDtoSerializer implements XmlRpcCustomSerializer {
+public class OrgEntitlementDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
@@ -51,10 +50,10 @@ public class OrgEntitlementDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
OrgEntitlementDto dto = (OrgEntitlementDto) value;
helper.add("label", dto.getEntitlement().getLabel());
helper.add("name", dto.getEntitlement().getHumanReadableLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java
index 8c91a9b..9e97b69 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSerializer.java
@@ -14,23 +14,22 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.org.Org;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* OrgSerializer is a custom serializer for the XMLRPC library.
* It converts an Org to an XMLRPC <struct>.
* @version $Rev$
*/
-public class OrgSerializer implements XmlRpcCustomSerializer {
+public class OrgSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -38,7 +37,7 @@ public class OrgSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer serializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SerializerHelper helper = new SerializerHelper(serializer);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java
index 0f6c64b..beb3e8f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgSoftwareEntitlementDtoSerializer.java
@@ -14,17 +14,16 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.org.OrgFactory;
-import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* OrgSoftwareEntitlementDto
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "free")
* #struct_end()
*/
-public class OrgSoftwareEntitlementDtoSerializer implements XmlRpcCustomSerializer {
+public class OrgSoftwareEntitlementDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -52,10 +51,10 @@ public class OrgSoftwareEntitlementDtoSerializer implements XmlRpcCustomSerializ
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
OrgSoftwareEntitlementDto dto = (OrgSoftwareEntitlementDto) value;
helper.add("org_id", dto.getOrg().getId());
helper.add("org_name", dto.getOrg().getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java
index 70dffd1..e3253ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.OrgTrustOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.OrgTrustOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* OrgSerializer is a custom serializer for the XMLRPC library.
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #array_end()
* @version $Rev$
*/
-public class OrgTrustOverviewSerializer implements XmlRpcCustomSerializer {
+public class OrgTrustOverviewSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class<OrgTrustOverview> getSupportedClass() {
@@ -46,7 +45,7 @@ public class OrgTrustOverviewSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer serializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SerializerHelper helper = new SerializerHelper(serializer);
OrgTrustOverview tr = (OrgTrustOverview) value;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
index 5485cce..0bf464d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.PackageDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.PackageDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* PackageSerializer
@@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class PackageDtoSerializer implements XmlRpcCustomSerializer {
+public class PackageDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -55,11 +54,11 @@ public class PackageDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
PackageDto pack = (PackageDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", pack.getName());
helper.add("version", pack.getVersion());
helper.add("release", pack.getRelease());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java
index 86ee6a7..20b4c86 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageKeySerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.rhnpackage.PackageKey;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.rhnpackage.PackageKey;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* PackageKeySerializer
@@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "type")
* #struct_end()
*/
-public class PackageKeySerializer implements XmlRpcCustomSerializer {
+public class PackageKeySerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -45,10 +44,10 @@ public class PackageKeySerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
PackageKey key = (PackageKey)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("key", key.getKey());
helper.add("type", key.getType().getLabel());
helper.writeTo(output);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java
index e7ad2b4..b5934ff 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageMetadataSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.PackageMetadata;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.PackageMetadata;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* Converts PackageMetadata to an XMLRPC <struct>.
* @version $Rev$
@@ -47,7 +46,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
*
*
*/
-public class PackageMetadataSerializer implements XmlRpcCustomSerializer {
+public class PackageMetadataSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -55,11 +54,11 @@ public class PackageMetadataSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
PackageMetadata pkg = (PackageMetadata)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("package_name_id", pkg.getId());
helper.add("package_name", pkg.getName());
helper.add("package_arch", pkg.getArch());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java
index 4d7b701..5de5e16 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.rhnpackage.PackageNevra;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.rhnpackage.PackageNevra;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ServerSerializer: Converts a Server object for representation as an XMLRPC struct.
@@ -40,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "arch")
* #struct_end()
*/
-public class PackageNevraSerializer implements XmlRpcCustomSerializer {
+public class PackageNevraSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -52,11 +51,11 @@ public class PackageNevraSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
PackageNevra pack = (PackageNevra)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", pack.getName().getName());
helper.add("epoch", pack.getEvr().getEpoch());
helper.add("version", pack.getEvr().getVersion());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java
index 364adfa..b381c36 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSerializer.java
@@ -14,18 +14,17 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.PackageOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.lang.StringUtils;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.PackageOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* PackageOverviewSerializer
* @version $Rev$
@@ -43,7 +42,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "provider")
* #struct_end()
*/
-public class PackageOverviewSerializer implements XmlRpcCustomSerializer {
+public class PackageOverviewSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
@@ -52,10 +51,10 @@ public class PackageOverviewSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
PackageOverview pO = (PackageOverview)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", pO.getId());
helper.add("name", pO.getPackageName());
helper.add("summary", pO.getSummary());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java
index e339d10..e4ffb33 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageProviderSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.rhnpackage.PackageProvider;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.rhnpackage.PackageProvider;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* PackageKeySerializer
@@ -37,7 +36,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_array_end()
* #struct_end()
*/
-public class PackageProviderSerializer implements XmlRpcCustomSerializer {
+public class PackageProviderSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -47,10 +46,10 @@ public class PackageProviderSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
PackageProvider prov = (PackageProvider)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", prov.getName());
helper.add("keys", prov.getKeys());
helper.writeTo(output);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java
index 90fb3e0..5b91046 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java
@@ -14,19 +14,18 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.domain.rhnpackage.Package;
-import com.redhat.rhn.domain.rhnpackage.PackageFactory;
-import com.redhat.rhn.domain.rhnpackage.PackageKey;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.rhnpackage.Package;
+import com.redhat.rhn.domain.rhnpackage.PackageFactory;
+import com.redhat.rhn.domain.rhnpackage.PackageKey;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* PackageSerializer
@@ -47,7 +46,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class PackageSerializer implements XmlRpcCustomSerializer {
+public class PackageSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -59,11 +58,11 @@ public class PackageSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
Package pack = (Package) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", pack.getPackageName().getName());
helper.add("version", pack.getPackageEvr().getVersion());
helper.add("release", pack.getPackageEvr().getRelease());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java
index cd6488a..6edeef2 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ProfileOverviewDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ProfileOverviewDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ProfileOverviewDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ProfileOverviewDtoSerializer
@@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "channel")
* #struct_end()
*/
-public class ProfileOverviewDtoSerializer implements XmlRpcCustomSerializer {
+public class ProfileOverviewDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,10 +47,10 @@ public class ProfileOverviewDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ProfileOverviewDto dto = (ProfileOverviewDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", dto.getId().longValue());
helper.add("name", dto.getName());
helper.add("channel", dto.getChannelName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java
index 749367f..6849adb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnTimeZoneSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.user.RhnTimeZone;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.user.RhnTimeZone;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* RhnTimeZoneSerializer will serialize an RhnTimeZone object to XMLRPC
* syntax.
@@ -36,7 +35,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "olson_name", "Name as identified by the Olson database.")
* #struct_end()
*/
-public class RhnTimeZoneSerializer implements XmlRpcCustomSerializer {
+public class RhnTimeZoneSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class getSupportedClass() {
@@ -44,11 +43,11 @@ public class RhnTimeZoneSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
RhnTimeZone tz = (RhnTimeZone) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("time_zone_id", new Integer(tz.getTimeZoneId()));
helper.add("olson_name", tz.getOlsonName());
helper.writeTo(output);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java
new file mode 100644
index 0000000..359c522
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RhnXmlRpcCustomSerializer.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2013 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.xmlrpc.serializer;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import redstone.xmlrpc.XmlRpcCustomSerializer;
+import redstone.xmlrpc.XmlRpcException;
+import redstone.xmlrpc.XmlRpcSerializer;
+
+/**
+ * Parent class of all XmlRpcSerializers. This exists because redstone.xmlrpc silently
+ * eats exceptions thrown by the specific Serializer instances, and we'd like to log
+ * that when it happens, so we can fix it.
+ *
+ * @author ggainey
+ *
+ */
+public abstract class RhnXmlRpcCustomSerializer implements XmlRpcCustomSerializer {
+
+ /**
+ * {@inheritDoc}
+ */
+ public void serialize(Object obj, Writer writer, XmlRpcSerializer serializer)
+ throws XmlRpcException, IOException {
+ try {
+ doSerialize(obj, writer, serializer);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ throw new XmlRpcException(
+ "ERROR IN SERIALIZER FOR " + getSupportedClass().getName(), e);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public abstract Class getSupportedClass();
+
+ protected abstract void doSerialize(Object obj, Writer writer,
+ XmlRpcSerializer serializer) throws XmlRpcException, IOException;
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java
index 9f6659b..c247bc4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ScheduledAction;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ScheduledAction;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ScheduleActionSerializer
* @version $Rev$
@@ -42,7 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("int", "inProgressSystems", "Number of systems that are in progress.")
* #struct_end()
*/
-public class ScheduleActionSerializer implements XmlRpcCustomSerializer {
+public class ScheduleActionSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -52,10 +51,10 @@ public class ScheduleActionSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ScheduledAction action = (ScheduledAction)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", action.getId());
helper.add("name", action.getActionName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java
index 558a77e..173a374 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ActionedSystem;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ActionedSystem;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ScheduleSystemSerializer
* @version $Rev$
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* this will contain the failure text.")
* #struct_end()
*/
-public class ScheduleSystemSerializer implements XmlRpcCustomSerializer {
+public class ScheduleSystemSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -49,10 +48,10 @@ public class ScheduleSystemSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ActionedSystem action = (ActionedSystem)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("server_id", action.getId());
helper.add("server_name", action.getServerName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java
index 7727eda..b87cae1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java
@@ -14,19 +14,18 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.common.util.StringUtil;
-import com.redhat.rhn.domain.action.script.ScriptResult;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
-import org.apache.commons.codec.binary.Base64;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.codec.binary.Base64;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.common.util.StringUtil;
+import com.redhat.rhn.domain.action.script.ScriptResult;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* Converts a ScriptResult to an XMLRPC <struct>.
@@ -44,7 +43,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class ScriptResultSerializer implements XmlRpcCustomSerializer {
+public class ScriptResultSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -54,10 +53,10 @@ public class ScriptResultSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ScriptResult scriptResult = (ScriptResult)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("serverId", scriptResult.getServerId());
helper.add("startDate", scriptResult.getStartDate());
helper.add("stopDate", scriptResult.getStopDate());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java
index cb724ed..2bfc940 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerFactory.java
@@ -30,9 +30,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer;
public class SerializerFactory {
private List<XmlRpcCustomSerializer> serializers;
- private static final String INTERFACE_NAME =
- "redstone.xmlrpc.XmlRpcCustomSerializer";
-
/** private constructor */
public SerializerFactory() {
serializers = new ArrayList<XmlRpcCustomSerializer>();
@@ -48,12 +45,11 @@ public class SerializerFactory {
}
private void initialize() {
- String[] excludes = new String[1];
- excludes[0] = "Test";
List<Class> classes = SerializerRegistry.getSerializationClasses();
+
for (Class clazz : classes) {
try {
- if (doesClassImplement(clazz, INTERFACE_NAME)) {
+ if (XmlRpcCustomSerializer.class.isAssignableFrom(clazz)) {
Object s = clazz.newInstance();
serializers.add((XmlRpcCustomSerializer)s);
}
@@ -63,16 +59,4 @@ public class SerializerFactory {
}
}
}
-
- private boolean doesClassImplement(Class clazz, String interfaceName) {
- Class[] interfaces = clazz.getInterfaces();
- boolean found = false;
- for (int i = 0; i < interfaces.length; i++) {
- if (interfaces[i].getName().equals(interfaceName)) {
- found = true;
- break;
- }
- }
- return found;
- }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java
index 8cbd889..81d38ec 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java
@@ -14,17 +14,16 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.action.Action;
-import com.redhat.rhn.domain.action.server.ServerAction;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.action.Action;
+import com.redhat.rhn.domain.action.server.ServerAction;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ActivationKeySerializer
@@ -64,7 +63,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* executes at the client machine. (optional)")
* #struct_end()
*/
-public class ServerActionSerializer implements XmlRpcCustomSerializer {
+public class ServerActionSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -74,11 +73,11 @@ public class ServerActionSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ServerAction sAct = (ServerAction) value;
Action act = sAct.getParentAction();
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("failed_count", act.getFailedCount());
helper.add("modified", act.getModified().toString());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java
index 8e825a4..84a5f31 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerPathSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.ServerPath;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.ServerPath;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ServerPathSerializer: Converts a ServerPathSerializer object for representation as an
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "hostname", "Proxy host name")
* #struct_end()
*/
-public class ServerPathSerializer implements XmlRpcCustomSerializer {
+public class ServerPathSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,12 +50,12 @@ public class ServerPathSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ServerPath serverPath = (ServerPath)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("position", serverPath.getPosition());
helper.add("id", serverPath.getId());
helper.add("hostname", serverPath.getHostname());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
index 97813a8..3473765 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
@@ -14,25 +14,24 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.domain.entitlement.Entitlement;
-import com.redhat.rhn.domain.server.Network;
-import com.redhat.rhn.domain.server.Server;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-import com.redhat.rhn.manager.entitlement.EntitlementManager;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
import java.io.Writer;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
+import org.apache.commons.lang.StringUtils;
+
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.entitlement.Entitlement;
+import com.redhat.rhn.domain.server.Network;
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+import com.redhat.rhn.manager.entitlement.EntitlementManager;
+
/**
* ServerSerializer: Converts a Server object for representation as an XMLRPC struct.
@@ -72,7 +71,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* for virtual guests only (optional)")
* #struct_end()
*/
-public class ServerSerializer implements XmlRpcCustomSerializer {
+public class ServerSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -84,12 +83,12 @@ public class ServerSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
Server server = (Server)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", server.getId());
helper.add("profile_name", server.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java
index 59e0d9e..ef08de9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java
@@ -14,23 +14,22 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.config.ConfigChannel;
-import com.redhat.rhn.domain.server.EntitlementServerGroup;
-import com.redhat.rhn.domain.server.ServerGroup;
-import com.redhat.rhn.domain.server.ServerSnapshot;
-import com.redhat.rhn.domain.server.SnapshotTag;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
import java.util.HashSet;
import java.util.Set;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.config.ConfigChannel;
+import com.redhat.rhn.domain.server.EntitlementServerGroup;
+import com.redhat.rhn.domain.server.ServerGroup;
+import com.redhat.rhn.domain.server.ServerSnapshot;
+import com.redhat.rhn.domain.server.SnapshotTag;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ServerSerializer: Converts a Server object for representation as an XMLRPC struct.
@@ -56,7 +55,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* reason (optional).")
* #struct_end()
*/
-public class ServerSnapshotSerializer implements XmlRpcCustomSerializer {
+public class ServerSnapshotSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -68,12 +67,12 @@ public class ServerSnapshotSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
ServerSnapshot snap = (ServerSnapshot)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", snap.getId());
helper.add("reason", snap.getReason());
helper.add("created", snap.getCreated());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java
index eb1df4e..237c09f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SnippetSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* SnippetSerializer
@@ -38,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "file", "The local path to the file containing this snippet.")
* #struct_end()
*/
-public class SnippetSerializer implements XmlRpcCustomSerializer {
+public class SnippetSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,10 +47,10 @@ public class SnippetSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
CobblerSnippet snippet = (CobblerSnippet)value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("name", snippet.getName());
helper.add("contents", snippet.getContents());
helper.add("fragment", snippet.getFragment());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java
index ff56828..c2febf4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemEntitlementsDtoSerializer.java
@@ -15,16 +15,15 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.SystemEntitlementsDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.SystemEntitlementsDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* SystemEntitlementsDtoSerializer
* @version $Rev$
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("int", "free")
* #struct_end()
*/
-public class SystemEntitlementsDtoSerializer implements XmlRpcCustomSerializer {
+public class SystemEntitlementsDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -51,9 +50,9 @@ public class SystemEntitlementsDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
SystemEntitlementsDto dto = (SystemEntitlementsDto) value;
helper.add("label", dto.getLabel());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java
index 746a9d5..73c2cf5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemOverviewSerializer.java
@@ -15,16 +15,15 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.SystemOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.SystemOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* SystemOverviewSerializer
@@ -41,7 +40,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
*
*
*/
-public class SystemOverviewSerializer implements XmlRpcCustomSerializer {
+public class SystemOverviewSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -53,11 +52,11 @@ public class SystemOverviewSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SystemOverview system = (SystemOverview) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", system.getId());
helper.add("name", system.getName());
helper.add("last_checkin", system.getLastCheckinDate());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java
index 408294e..d44f1e8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SystemSearchResultSerializer.java
@@ -14,15 +14,14 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.SystemSearchResult;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+
+import com.redhat.rhn.frontend.dto.SystemSearchResult;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
/**
*
* SystemSearchResultSerializer
@@ -44,7 +43,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class SystemSearchResultSerializer implements XmlRpcCustomSerializer {
+public class SystemSearchResultSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -56,11 +55,11 @@ public class SystemSearchResultSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer) throws XmlRpcException,
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer) throws XmlRpcException,
IOException {
SystemSearchResult result = (SystemSearchResult) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("id", result.getId());
helper.add("name", result.getName());
helper.add("last_checkin", result.getLastCheckinDate());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java
index 625ec12..8d7aed1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TokenSerializer.java
@@ -15,13 +15,6 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.server.ServerGroup;
-import com.redhat.rhn.domain.server.ServerGroupType;
-import com.redhat.rhn.domain.token.Token;
-import com.redhat.rhn.domain.token.TokenPackage;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
import java.util.HashMap;
@@ -29,10 +22,16 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.server.ServerGroup;
+import com.redhat.rhn.domain.server.ServerGroupType;
+import com.redhat.rhn.domain.token.Token;
+import com.redhat.rhn.domain.token.TokenPackage;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* ActivationKeySerializer
* @version $Rev$
@@ -56,7 +55,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("boolean", "disabled")
* #struct_end()
*/
-public class TokenSerializer implements XmlRpcCustomSerializer {
+public class TokenSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -66,9 +65,9 @@ public class TokenSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
populateTokenInfo((Token)value, helper);
helper.writeTo(output);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java
index e97319b..f1ac762 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java
@@ -14,16 +14,15 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.TrustedOrgDto;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.TrustedOrgDto;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
* TrustedOrgDtoSerializer is a custom serializer for the XMLRPC library.
* It converts an TrustedOrgDto to an XMLRPC <struct>.
@@ -35,7 +34,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
* @version $Rev$
*/
-public class TrustedOrgDtoSerializer implements XmlRpcCustomSerializer {
+public class TrustedOrgDtoSerializer extends RhnXmlRpcCustomSerializer {
/** {@inheritDoc} */
public Class<TrustedOrgDto> getSupportedClass() {
@@ -43,7 +42,7 @@ public class TrustedOrgDtoSerializer implements XmlRpcCustomSerializer {
}
/** {@inheritDoc} */
- public void serialize(Object value, Writer output, XmlRpcSerializer serializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
SerializerHelper helper = new SerializerHelper(serializer);
TrustedOrgDto tr = (TrustedOrgDto) value;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java
index 24f1c0a..a4cabbf 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/UserSerializer.java
@@ -15,16 +15,15 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* UserSerializer a serializer for the User class
@@ -39,7 +38,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* false if the user is disabled")
* #struct_end()
*/
-public class UserSerializer implements XmlRpcCustomSerializer {
+public class UserSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
@@ -50,9 +49,9 @@ public class UserSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
User user = (User) value;
helper.add("id", user.getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java
index 4845f77..c2625f4 100755
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java
@@ -15,16 +15,15 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.dto.VirtualSystemOverview;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
-
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
+import com.redhat.rhn.frontend.dto.VirtualSystemOverview;
+import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+
/**
*
* VirtualSystemOverviewSerializer
@@ -42,7 +41,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #struct_end()
*
*/
-public class VirtualSystemOverviewSerializer implements XmlRpcCustomSerializer {
+public class VirtualSystemOverviewSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -54,11 +53,11 @@ public class VirtualSystemOverviewSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output, XmlRpcSerializer builtInSerializer)
+ protected void doSerialize(Object value, Writer output, XmlRpcSerializer serializer)
throws XmlRpcException, IOException {
VirtualSystemOverview system = (VirtualSystemOverview) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("uuid", system.getUuid());
helper.add("id", system.getSystemId());
helper.add("guest_name", system.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java
index 3bde2fa..60a9f8a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfRuleResultDtoSerializer.java
@@ -18,7 +18,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -36,7 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop_desc("string", "idents", "Comma separated list of XCCDF idents.")
* #struct_end()
*/
-public class XccdfRuleResultDtoSerializer implements XmlRpcCustomSerializer {
+public class XccdfRuleResultDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -48,10 +47,10 @@ public class XccdfRuleResultDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer) throws XmlRpcException, IOException {
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer) throws XmlRpcException, IOException {
XccdfRuleResultDto dto = (XccdfRuleResultDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
helper.add("idref", dto.getDocumentIdref());
helper.add("result", dto.getLabel());
helper.add("idents", dto.getIdentsString());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java
index 2b5a56d..25f618d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultDtoSerializer.java
@@ -18,7 +18,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -37,7 +36,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop_desc($date, "completed", "Scan completion time")
* #struct_end()
*/
-public class XccdfTestResultDtoSerializer implements XmlRpcCustomSerializer {
+public class XccdfTestResultDtoSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -49,10 +48,10 @@ public class XccdfTestResultDtoSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer) throws XmlRpcException, IOException {
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer) throws XmlRpcException, IOException {
XccdfTestResultDto dto = (XccdfTestResultDto) value;
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
addToHelper(helper, "xid", dto.getXid());
addToHelper(helper, "profile", dto.getProfile());
addToHelper(helper, "path", dto.getPath());
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java
index cf5f45e..888c03f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java
@@ -18,7 +18,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
import java.io.IOException;
import java.io.Writer;
-import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcSerializer;
@@ -51,7 +50,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop_desc("bool", "deletable", "Indicates whether the scan can be deleted.")
* #struct_end()
*/
-public class XccdfTestResultSerializer implements XmlRpcCustomSerializer {
+public class XccdfTestResultSerializer extends RhnXmlRpcCustomSerializer {
/**
* {@inheritDoc}
@@ -63,15 +62,15 @@ public class XccdfTestResultSerializer implements XmlRpcCustomSerializer {
/**
* {@inheritDoc}
*/
- public void serialize(Object value, Writer output,
- XmlRpcSerializer builtInSerializer) throws XmlRpcException, IOException {
+ protected void doSerialize(Object value, Writer output,
+ XmlRpcSerializer serializer) throws XmlRpcException, IOException {
XccdfTestResult testResult = (XccdfTestResult) value;
ScapActionDetails actionDetails = testResult.getScapActionDetails();
XccdfBenchmark benchmark = testResult.getBenchmark();
XccdfProfile profile = testResult.getProfile();
Action parentAction = actionDetails.getParentAction();
- SerializerHelper helper = new SerializerHelper(builtInSerializer);
+ SerializerHelper helper = new SerializerHelper(serializer);
addToHelper(helper, "xid", testResult.getId());
addToHelper(helper, "sid", testResult.getServer().getId());
addToHelper(helper, "path", actionDetails.getPath());
10 years, 6 months