From 10fe820a36708ee052e8fe0c5a0396482a658984 Mon Sep 17 00:00:00 2001 From: Andrea Gazzarini Date: Fri, 27 Feb 2009 13:31:18 +0000 Subject: QPID-1582 : Pausable Subscription Manager capability + WSDL Improvements. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748511 13f79535-47bb-0310-9956-ffa450edef68 --- java/management/client/src/main/java/muse.xml | 2 +- .../wsdm/capabilities/MBeanCapability.java | 5 +- .../qpid/management/wsdm/capabilities/Result.java | 64 ++-------------------- .../serializer/InvocationResultSerializer.java | 32 +---------- .../wsdm/muse/serializer/MapSerializer.java | 30 +++++----- .../client/src/main/java/wsdl/QManWsResource.wsdl | 2 - .../main/java/wsdl/WS-BaseNotification-1_3.wsdl | 13 ++--- 7 files changed, 33 insertions(+), 115 deletions(-) (limited to 'java') diff --git a/java/management/client/src/main/java/muse.xml b/java/management/client/src/main/java/muse.xml index cf651c34ac..4aac63ff3e 100644 --- a/java/management/client/src/main/java/muse.xml +++ b/java/management/client/src/main/java/muse.xml @@ -32,7 +32,7 @@ org.apache.muse.ws.resource.impl.WsResourceRouter log/muse.log - SEVERE + FINE org.apache.muse.core.routing.RouterFilePersistence diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java index b3ce0f0587..37ecc0c031 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/MBeanCapability.java @@ -179,10 +179,7 @@ public abstract class MBeanCapability extends AbstractWsResourceCapability params, signature); - return new Result( - output.getReturnCode(), - output.getStatusText(), - output.getOutputSection()); + return new Result(output.getOutputSection()); } catch (InstanceNotFoundException exception) { diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java index b8e22b4bc7..a00d2665ae 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/capabilities/Result.java @@ -29,11 +29,9 @@ import java.util.*; * * @author Andrea Gazzarini */ -public class Result +public final class Result { - private long _statusCode; - private String _statusText; - private Map _outputParameters; + private final Map _outputParameters; /** * Builds a new result DTO with the given parameters. @@ -42,53 +40,11 @@ public class Result * @param statusText the status message. * @param outputParameters the output parameters. */ - public Result(long statusCode, String statusText,Map outputParameters) + public Result(Map outputParameters) { - this._statusCode = statusCode; - this._statusText = statusText; this._outputParameters = outputParameters; } - - /** - * Returns the status code. - * - * @return the status code. - */ - public long getStatusCode() - { - return _statusCode; - } - - /** - * Sets the status code. - * - * @param statusCode the status code. - */ - void setStatusCode(long statusCode) - { - this._statusCode = statusCode; - } - - /** - * Returns the status text. - * - * @return the status text. - */ - public String getStatusText() - { - return _statusText; - } - - /** - * Sets the status text. - * - * @param statusText the status text. - */ - void setStatusText(String statusText) - { - this._statusText = statusText; - } - + /** * Returns the output parameterss. * @@ -98,14 +54,4 @@ public class Result { return _outputParameters; } - - /** - * Sets the output parameters. - * - * @param outputParameters the output parameters. - */ - void setOutputParameters(Map outputParameters) - { - this._outputParameters = outputParameters; - } -} +} \ No newline at end of file diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java index 0af570eacf..b819d52ad1 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/InvocationResultSerializer.java @@ -38,8 +38,6 @@ import org.w3c.dom.Element; */ public class InvocationResultSerializer implements Serializer { - private Serializer _longSerializer = SerializerRegistry.getInstance().getSerializer(long.class); - private Serializer _stringSerializer = SerializerRegistry.getInstance().getSerializer(String.class); private Serializer _mapSerializer = SerializerRegistry.getInstance().getSerializer(Map.class); /** @@ -51,26 +49,8 @@ public class InvocationResultSerializer implements Serializer @SuppressWarnings("unchecked") public Object fromXML(Element elementData) throws SoapFault { - long statusCode = 0; - String statusText = null; - Map outputSection = null; - - Element[] elements = XmlUtils.getAllElements(elementData); - for (Element element : elements) - { - if ("statusCode".equals(element.getNodeName())) - { - statusCode = (Long) _longSerializer.fromXML(element); - } else if ("statusText".equals(element.getNodeName())) - { - statusText = (String) _stringSerializer.fromXML(element); - } else if ("outputParameters".equals(element.getNodeName())) - { - outputSection = (Map) _mapSerializer.fromXML(element); - } - } - - return new Result(statusCode,statusText,outputSection); + Element outputParameters = XmlUtils.getFirstElement(elementData); + return new Result((Map) _mapSerializer.fromXML(outputParameters)); } /** @@ -95,17 +75,11 @@ public class InvocationResultSerializer implements Serializer { Result result = (Result) obj; Element root = XmlUtils.createElement(qname); - Element statusCode = SerializerRegistry.getInstance().getSerializer(long.class).toXML(result.getStatusCode(), new QName("statusCode")); - Element statusText = SerializerRegistry.getInstance().getSerializer(String.class).toXML(result.getStatusText(), new QName("statusText")); - - root.appendChild(statusCode); - root.appendChild(statusText); if (result.getOutputParameters() != null) { Element outputSection = SerializerRegistry.getInstance().getSerializer(Map.class).toXML(result.getOutputParameters(), new QName("outputParameters")); root.appendChild(outputSection); } - return root; - + return root; } } \ No newline at end of file diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java index 1d0d02c669..07e1dfdc56 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/serializer/MapSerializer.java @@ -62,25 +62,29 @@ public class MapSerializer implements Serializer public Object fromXML(Element xml) throws SoapFault { Map result = new HashMap(); - Element[] children = XmlUtils.getAllElements(xml); - Serializer objectDeserializer = SerializerRegistry.getInstance().getSerializer(Object.class); - for (Element entry : children) + if (xml != null) { - Element[] keysAndValues = XmlUtils.getAllElements(entry); - Object key = null; - Object value = null; - for (Element element : keysAndValues) + Element[] children = XmlUtils.getAllElements(xml); + Serializer objectDeserializer = SerializerRegistry.getInstance().getSerializer(Object.class); + + for (Element entry : children) { - if (Names.KEY.equals(element.getLocalName())) - { - key = _stringSerializer.fromXML(element); - } else if (Names.VALUE.equals(element.getLocalName())) + Element[] keysAndValues = XmlUtils.getAllElements(entry); + Object key = null; + Object value = null; + for (Element element : keysAndValues) { - value = objectDeserializer.fromXML(element); + if (Names.KEY.equals(element.getLocalName())) + { + key = _stringSerializer.fromXML(element); + } else if (Names.VALUE.equals(element.getLocalName())) + { + value = objectDeserializer.fromXML(element); + } } + result.put(key, value); } - result.put(key, value); } return result; } diff --git a/java/management/client/src/main/java/wsdl/QManWsResource.wsdl b/java/management/client/src/main/java/wsdl/QManWsResource.wsdl index 20df95e2b1..16169c9b78 100644 --- a/java/management/client/src/main/java/wsdl/QManWsResource.wsdl +++ b/java/management/client/src/main/java/wsdl/QManWsResource.wsdl @@ -115,8 +115,6 @@ - - diff --git a/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl b/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl index 8764c18fc9..d53bf60f3a 100644 --- a/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl +++ b/java/management/client/src/main/java/wsdl/WS-BaseNotification-1_3.wsdl @@ -424,23 +424,22 @@ This document and the information contained herein is provided on an "AS IS" bas - + - +--> - - + + - - + +