Attachment 368798 Details for Bug 535766 – RHQ-2428-patch.txt

RHQ-2428-patch.txt

RHQ-2428-patch.txt (text/plain), 4.20 KB, created by Simeon Pinder on 2009-09-18 22:49:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simeon Pinder

Created: 2009-09-18 22:49:00 UTC

Size: 4.20 KB

patch

obsolete

>Index: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/WebServiceTypeAdapter.java
>===================================================================
>--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/WebServiceTypeAdapter.java	(revision 5192)
>+++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/WebServiceTypeAdapter.java	(working copy)
>@@ -1,9 +1,12 @@
> package org.rhq.enterprise.server.jaxb;
> 
>+import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.Map;
> 
> import javax.jws.WebResult;
>+import javax.xml.bind.annotation.XmlAccessType;
>+import javax.xml.bind.annotation.XmlAccessorType;
> import javax.xml.bind.annotation.XmlType;
> import javax.xml.bind.annotation.adapters.XmlAdapter;
> 
>@@ -20,32 +23,50 @@
>  *
>  */
> @XmlType(namespace = ServerVersion.namespace)
>-public class WebServiceTypeAdapter extends XmlAdapter<Object[], Map<Integer, Configuration>> {
>+public class WebServiceTypeAdapter extends XmlAdapter<WsResourceConfigurationMapWrapper, Map<Integer, Configuration>> {
> 
>     @WebResult(targetNamespace = ServerVersion.namespace)
>-    public Object[] marshal(Map<Integer, Configuration> opaque) throws Exception {
>-        Object[] bag = null;
>+    public WsResourceConfigurationMapWrapper marshal(Map<Integer, Configuration> opaque) throws Exception {
>+        WsResourceConfigurationMapWrapper bag = new WsResourceConfigurationMapWrapper();
>         if (opaque != null) {
>-            int i = 0;
>-            bag = new Object[2 * opaque.size()];
>             for (Map.Entry<Integer, Configuration> mapEntry : opaque.entrySet()) {
>-                bag[i++] = mapEntry.getKey();
>-                bag[i++] = mapEntry.getValue();
>+                WsResourceConfigurationMap map = new WsResourceConfigurationMap(mapEntry.getKey(), mapEntry.getValue());
>+                bag.map.add(map);
>             }
>-        } else {
>-            bag = new Object[0];
>         }
>         return bag;
>     }
> 
>     @WebResult(targetNamespace = ServerVersion.namespace)
>-    public Map<Integer, Configuration> unmarshal(Object[] marshallable) throws Exception {
>+    public Map<Integer, Configuration> unmarshal(WsResourceConfigurationMapWrapper marshallable) throws Exception {
>         Map<Integer, Configuration> map = new HashMap<Integer, Configuration>();
>         if (marshallable != null) {
>-            for (int i = 0; i < marshallable.length; i += 2) {
>-                map.put((Integer) marshallable[i], (Configuration) marshallable[i + 1]);
>+            for (WsResourceConfigurationMap entry : marshallable.map) {
>+                map.put(entry.key, entry.value);
>             }
>         }
>         return map;
>     }
> }
>+
>+@XmlType(namespace = ServerVersion.namespace)
>+@XmlAccessorType(XmlAccessType.FIELD)
>+class WsResourceConfigurationMapWrapper {
>+    public ArrayList<WsResourceConfigurationMap> map = new ArrayList<WsResourceConfigurationMap>();
>+}
>+
>+@XmlType(namespace = ServerVersion.namespace)
>+@XmlAccessorType(XmlAccessType.FIELD)
>+class WsResourceConfigurationMap {
>+    public Integer key = null;
>+    public Configuration value = null;
>+
>+    //default no arg constructor for JAXB/java bean requirement. do not remove.
>+    public WsResourceConfigurationMap() {
>+    }
>+
>+    public WsResourceConfigurationMap(Integer key, Configuration value) {
>+        this.key = key;
>+        this.value = value;
>+    }
>+}
>Index: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/ServerVersion.java
>===================================================================
>--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/ServerVersion.java	(revision 5192)
>+++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/ServerVersion.java	(working copy)
>@@ -43,7 +43,7 @@
>     private String build;
> 
>     //This value must be set by build system just before Build Time.
>-    public static final String namespace = "http://www.rhq-project.org/2.3/2009/9/Webservices.xsd";
>+    public static final String namespace = "http://www.rhq-project.org/2.3_0_GA_CP/Webservices.xsd";
> 
>     //    private final String namespace = "@ws-namespace@";
> 
>

Actions: View

Attachments on bug 535766: 368798