[jbossws-commits] JBossWS SVN: r4557 - in stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm: spec200502 and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2007-09-12 12:12:45 -0400 (Wed, 12 Sep 2007) New Revision: 4557 Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/Serializer.java Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AbstractSerializable.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceFaultSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationRepository.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/AckRequestedImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceResponseImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceAcknowledgementImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceFaultImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/TerminateSequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/AckRequestedImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceResponseImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceResponseImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceAcknowledgementImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceFaultImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceResponseImpl.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/Serializable.java Log: refactoring Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AbstractSerializable.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AbstractSerializable.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AbstractSerializable.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -28,7 +28,7 @@ import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** - * Utility class which should be used by all WS-RM protocol providers. + * Utility class which should be subclassed by all WS-RM protocol providers. * @author richard.opalka(a)jboss.com * @see org.jboss.ws.extensions.wsrm.spi.protocol.Serializable */ @@ -37,7 +37,7 @@ protected AbstractSerializable() { - // intended to be overriden + // intended to be subclassed } /* @@ -58,6 +58,10 @@ SerializationRepository.serialize(this, soapMessage); } + /** + * Each subclass must implement this method + * @return RM provider to be used for de/serialization purposes + */ public abstract Provider getProvider(); } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/AckRequestedSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -37,28 +37,37 @@ import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>AckRequested</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class AckRequestedSerializer +final class AckRequestedSerializer implements Serializer { + private static final Serializer INSTANCE = new AckRequestedSerializer(); + private AckRequestedSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>AckRequested</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(AckRequested object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + AckRequested o = (AckRequested)object; try { SOAPHeader soapHeader = soapMessage.getSOAPPart().getEnvelope().getHeader(); @@ -72,7 +81,7 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(ackRequestedElement, identifierQName, ackRequestedQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); // read optional wsrm:MessageNumber element QName messageNumberQName = wsrmConstants.getMessageNumberQName(); @@ -81,7 +90,7 @@ { String messageNumberString = getRequiredTextContent(messageNumberElement, messageNumberQName); long messageNumberValue = stringToLong(messageNumberString, "Unable to parse MessageNumber element text content"); - object.setMessageNumber(messageNumberValue); + o.setMessageNumber(messageNumberValue); } } catch (SOAPException se) @@ -100,9 +109,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(AckRequested object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + AckRequested o = (AckRequested)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -117,14 +127,14 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - ackRequestedElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + ackRequestedElement.addChildElement(identifierQName).setValue(o.getIdentifier()); - if (object.getMessageNumber() != 0) + if (o.getMessageNumber() != 0) { // write optional wsrm:MessageNumber element QName messageNumberQName = wsrmConstants.getMessageNumberQName(); SOAPElement messageNumberElement = ackRequestedElement.addChildElement(messageNumberQName); - messageNumberElement.setValue(String.valueOf(object.getMessageNumber())); + messageNumberElement.setValue(String.valueOf(o.getMessageNumber())); } } catch (SOAPException se) Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceResponseSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -35,28 +35,37 @@ import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequenceResponse; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>CloseSequenceResponse</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class CloseSequenceResponseSerializer +final class CloseSequenceResponseSerializer implements Serializer { + private static final Serializer INSTANCE = new CloseSequenceResponseSerializer(); + private CloseSequenceResponseSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>CloseSequenceResponse</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(CloseSequenceResponse object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CloseSequenceResponse o = (CloseSequenceResponse)object; try { SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody(); @@ -70,7 +79,7 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(closeSequenceResponseElement, identifierQName, closeSequenceResponseQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); } catch (SOAPException se) { @@ -88,9 +97,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(CloseSequenceResponse object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CloseSequenceResponse o = (CloseSequenceResponse)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -105,7 +115,7 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - closeSequenceResponseElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + closeSequenceResponseElement.addChildElement(identifierQName).setValue(o.getIdentifier()); } catch (SOAPException se) { Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CloseSequenceSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -37,28 +37,37 @@ import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>CloseSequence</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class CloseSequenceSerializer +final class CloseSequenceSerializer implements Serializer { + private static final Serializer INSTANCE = new CloseSequenceSerializer(); + private CloseSequenceSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>CloseSequence</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(CloseSequence object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CloseSequence o = (CloseSequence)object; try { SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody(); @@ -72,7 +81,7 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(closeSequenceElement, identifierQName, closeSequenceQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); // read optional wsrm:LastMsgNumber element QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName(); @@ -81,7 +90,7 @@ { String lastMsgNumberString = getRequiredTextContent(lastMsgNumberElement, lastMsgNumberQName); long lastMsgNumberValue = stringToLong(lastMsgNumberString, "Unable to parse LastMsgNumber element text content"); - object.setLastMsgNumber(lastMsgNumberValue); + o.setLastMsgNumber(lastMsgNumberValue); } } catch (SOAPException se) @@ -100,9 +109,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(CloseSequence object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CloseSequence o = (CloseSequence)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -117,14 +127,14 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - closeSequenceElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + closeSequenceElement.addChildElement(identifierQName).setValue(o.getIdentifier()); - if (object.getLastMsgNumber() != 0) + if (o.getLastMsgNumber() != 0) { // write optional wsrm:LastMsgNumber element QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName(); SOAPElement lastMsgNumberElement = closeSequenceElement.addChildElement(lastMsgNumberQName); - lastMsgNumberElement.setValue(String.valueOf(object.getLastMsgNumber())); + lastMsgNumberElement.setValue(String.valueOf(o.getLastMsgNumber())); } } catch (SOAPException se) Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceResponseSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -39,31 +39,40 @@ import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse; import org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>CreateSequenceResponse</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class CreateSequenceResponseSerializer +final class CreateSequenceResponseSerializer implements Serializer { private static final AddressingConstants ADDRESSING_CONSTANTS = AddressingBuilder.getAddressingBuilder().newAddressingConstants(); + private static final Serializer INSTANCE = new CreateSequenceResponseSerializer(); + private CreateSequenceResponseSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>CreateSequenceResponse</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(CreateSequenceResponse object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CreateSequenceResponse o = (CreateSequenceResponse)object; try { SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody(); @@ -77,7 +86,7 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(createSequenceResponseElement, identifierQName, createSequenceResponseQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); // read optional wsrm:Expires element QName expiresQName = wsrmConstants.getExpiresQName(); @@ -85,7 +94,7 @@ if (expiresElement != null) { String duration = getRequiredTextContent(expiresElement, expiresQName); - object.setExpires(duration); + o.setExpires(duration); } // read optional wsrm:IncompleteSequenceBehavior element @@ -94,7 +103,7 @@ if (behaviorElement != null) { String behaviorString = getRequiredTextContent(behaviorElement, behaviorQName); - object.setIncompleteSequenceBehavior(IncompleteSequenceBehavior.getValue(behaviorString)); + o.setIncompleteSequenceBehavior(IncompleteSequenceBehavior.getValue(behaviorString)); } // read optional wsrm:Accept element @@ -102,7 +111,7 @@ SOAPElement acceptElement = getOptionalElement(createSequenceResponseElement, acceptQName, createSequenceResponseQName); if (acceptElement != null) { - CreateSequenceResponse.Accept accept = object.newAccept(); + CreateSequenceResponse.Accept accept = o.newAccept(); // read required wsrm:AcksTo element QName acksToQName = wsrmConstants.getAcksToQName(); @@ -113,7 +122,7 @@ accept.setAcksTo(acksToAddress); // set created accept - object.setAccept(accept); + o.setAccept(accept); } } catch (SOAPException se) @@ -132,9 +141,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(CreateSequenceResponse object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CreateSequenceResponse o = (CreateSequenceResponse)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -149,25 +159,25 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - createSequenceResponseElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + createSequenceResponseElement.addChildElement(identifierQName).setValue(o.getIdentifier()); - if (object.getExpires() != null) + if (o.getExpires() != null) { // write optional wsrm:Expires element QName expiresQName = wsrmConstants.getExpiresQName(); - createSequenceResponseElement.addChildElement(expiresQName).setValue(object.getExpires()); + createSequenceResponseElement.addChildElement(expiresQName).setValue(o.getExpires()); } - if (object.getIncompleteSequenceBehavior() != null) + if (o.getIncompleteSequenceBehavior() != null) { // write optional wsrm:IncompleteSequenceBehavior element - IncompleteSequenceBehavior behavior = object.getIncompleteSequenceBehavior(); + IncompleteSequenceBehavior behavior = o.getIncompleteSequenceBehavior(); QName behaviorQName = wsrmConstants.getIncompleteSequenceBehaviorQName(); SOAPElement behaviorElement = createSequenceResponseElement.addChildElement(behaviorQName); behaviorElement.setValue(behavior.toString()); } - if (object.getAccept() != null) + if (o.getAccept() != null) { // write optional wsrm:Accept element QName acceptQName = wsrmConstants.getAcceptQName(); @@ -178,7 +188,7 @@ QName addressQName = ADDRESSING_CONSTANTS.getAddressQName(); acceptElement.addChildElement(acksToQName) .addChildElement(addressQName) - .setValue(object.getAccept().getAcksTo()); + .setValue(o.getAccept().getAcksTo()); } } catch (SOAPException se) Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/CreateSequenceSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -39,31 +39,40 @@ import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence; import org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>CreateSequence</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class CreateSequenceSerializer +final class CreateSequenceSerializer implements Serializer { private static final AddressingConstants ADDRESSING_CONSTANTS = AddressingBuilder.getAddressingBuilder().newAddressingConstants(); + private static final Serializer INSTANCE = new CreateSequenceSerializer(); + private CreateSequenceSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>CreateSequence</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(CreateSequence object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CreateSequence o = (CreateSequence)object; try { SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody(); @@ -79,7 +88,7 @@ QName addressQName = ADDRESSING_CONSTANTS.getAddressQName(); SOAPElement acksToAddressElement = getRequiredElement(acksToElement, addressQName, acksToQName); String acksToAddress = getRequiredTextContent(acksToAddressElement, addressQName); - object.setAcksTo(acksToAddress); + o.setAcksTo(acksToAddress); // read optional wsrm:Expires element QName expiresQName = wsrmConstants.getExpiresQName(); @@ -87,7 +96,7 @@ if (expiresElement != null) { String duration = getRequiredTextContent(expiresElement, expiresQName); - object.setExpires(duration); + o.setExpires(duration); } // read optional wsrm:Offer element @@ -95,7 +104,7 @@ SOAPElement offerElement = getOptionalElement(createSequenceElement, offerQName, createSequenceQName); if (offerElement != null) { - CreateSequence.Offer offer = object.newOffer(); + CreateSequence.Offer offer = o.newOffer(); // read required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); @@ -131,7 +140,7 @@ } // set created offer - object.setOffer(offer); + o.setOffer(offer); } } catch (SOAPException se) @@ -150,9 +159,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(CreateSequence object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + CreateSequence o = (CreateSequence)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -170,18 +180,18 @@ QName addressQName = ADDRESSING_CONSTANTS.getAddressQName(); createSequenceElement.addChildElement(acksToQName) .addChildElement(addressQName) - .setValue(object.getAcksTo()); + .setValue(o.getAcksTo()); - if (object.getExpires() != null) + if (o.getExpires() != null) { // write optional wsrm:Expires element QName expiresQName = wsrmConstants.getExpiresQName(); - createSequenceElement.addChildElement(expiresQName).setValue(object.getExpires()); + createSequenceElement.addChildElement(expiresQName).setValue(o.getExpires()); } - if (object.getOffer() != null) + if (o.getOffer() != null) { - CreateSequence.Offer offer = object.getOffer(); + CreateSequence.Offer offer = o.getOffer(); // write optional wsrm:Offer element QName offerQName = wsrmConstants.getOfferQName(); Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceAcknowledgementSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -38,6 +38,7 @@ import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; import java.util.List; @@ -45,23 +46,31 @@ * <b>SequenceAcknowledgement</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class SequenceAcknowledgementSerializer +final class SequenceAcknowledgementSerializer implements Serializer { + private static final Serializer INSTANCE = new SequenceAcknowledgementSerializer(); + private SequenceAcknowledgementSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>SequenceAcknowledgement</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(SequenceAcknowledgement object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + SequenceAcknowledgement o = (SequenceAcknowledgement)object; try { SOAPHeader soapHeader = soapMessage.getSOAPPart().getEnvelope().getHeader(); @@ -75,14 +84,14 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(sequenceAckElement, identifierQName, sequenceAckQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); // read optional wsrm:Final element QName finalQName = wsrmConstants.getFinalQName(); SOAPElement finalElement = getOptionalElement(sequenceAckElement, finalQName, sequenceAckQName); if (finalElement != null) { - object.setFinal(); + o.setFinal(); } // read optional wsrm:None element @@ -90,7 +99,7 @@ SOAPElement noneElement = getOptionalElement(sequenceAckElement, noneQName, sequenceAckQName); if (noneElement != null) { - object.setNone(); + o.setNone(); } // read optional wsrm:Nack elements @@ -99,7 +108,7 @@ for (SOAPElement nackElement : nackElements) { String messageId = getRequiredTextContent(nackElement, nackQName); - object.addNack(stringToLong(messageId, "Unable to parse Nack element text content")); + o.addNack(stringToLong(messageId, "Unable to parse Nack element text content")); } // read optional wsrm:AcknowledgementRange elements @@ -112,7 +121,7 @@ for (SOAPElement ackRangeElement : ackRangeElements) { - SequenceAcknowledgement.AcknowledgementRange ackRange = object.newAcknowledgementRange(); + SequenceAcknowledgement.AcknowledgementRange ackRange = o.newAcknowledgementRange(); // read required wsrm:Upper attribute String upper = getRequiredTextContent(ackRangeElement, upperQName, ackRangeQName); @@ -123,7 +132,7 @@ ackRange.setLower(stringToLong(lower, "Unable to parse Lower attribute text content")); // set created acknowledgement range - object.addAcknowledgementRange(ackRange); + o.addAcknowledgementRange(ackRange); } } } @@ -143,9 +152,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(SequenceAcknowledgement object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + SequenceAcknowledgement o = (SequenceAcknowledgement)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -160,23 +170,23 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - sequenceAckElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + sequenceAckElement.addChildElement(identifierQName).setValue(o.getIdentifier()); - if (object.isFinal()) + if (o.isFinal()) { // write optional wsrm:Final element QName finalQName = wsrmConstants.getFinalQName(); sequenceAckElement.addChildElement(finalQName); } - if (object.isNone()) + if (o.isNone()) { // write optional wsrm:None element QName noneQName = wsrmConstants.getNoneQName(); sequenceAckElement.addChildElement(noneQName); } - List<Long> nacks = object.getNacks(); + List<Long> nacks = o.getNacks(); if (nacks.size() != 0) { QName nackQName = wsrmConstants.getNackQName(); @@ -188,7 +198,7 @@ } } - List<SequenceAcknowledgement.AcknowledgementRange> ackRanges = object.getAcknowledgementRanges(); + List<SequenceAcknowledgement.AcknowledgementRange> ackRanges = o.getAcknowledgementRanges(); if (ackRanges.size() != 0) { QName acknowledgementRangeQName = wsrmConstants.getAcknowledgementRangeQName(); Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceFaultSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceFaultSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceFaultSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -26,27 +26,34 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.spi.Provider; -import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFault; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>SequenceFault</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class SequenceFaultSerializer +final class SequenceFaultSerializer implements Serializer { + private static final Serializer INSTANCE = new SequenceFaultSerializer(); + private SequenceFaultSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>SequenceFault</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(SequenceFault object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { throw new NotImplementedException(); @@ -58,7 +65,7 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(SequenceFault object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { throw new NotImplementedException(); Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SequenceSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -37,28 +37,37 @@ import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; /** * <b>Sequence</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class SequenceSerializer +final class SequenceSerializer implements Serializer { + private static final Serializer INSTANCE = new SequenceSerializer(); + private SequenceSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>Sequence</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(Sequence object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + Sequence o = (Sequence)object; try { SOAPHeader soapHeader = soapMessage.getSOAPPart().getEnvelope().getHeader(); @@ -72,21 +81,21 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(sequenceElement, identifierQName, sequenceQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); // read required wsrm:MessageNumber element QName messageNumberQName = wsrmConstants.getMessageNumberQName(); SOAPElement messageNumberElement = getRequiredElement(sequenceElement, messageNumberQName, sequenceQName); String messageNumberString = getRequiredTextContent(messageNumberElement, messageNumberQName); long messageNumberValue = stringToLong(messageNumberString, "Unable to parse MessageNumber element text content"); - object.setMessageNumber(messageNumberValue); + o.setMessageNumber(messageNumberValue); // read optional wsrm:LastMessage element QName lastMessageQName = wsrmConstants.getLastMessageQName(); SOAPElement lastMessageElement = getOptionalElement(sequenceElement, lastMessageQName, sequenceQName); if (lastMessageElement != null) { - object.setLastMessage(); + o.setLastMessage(); } } catch (SOAPException se) @@ -105,9 +114,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(Sequence object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + Sequence o = (Sequence)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -122,14 +132,14 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - sequenceElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + sequenceElement.addChildElement(identifierQName).setValue(o.getIdentifier()); // write required wsrm:MessageNumber element QName messageNumberQName = wsrmConstants.getMessageNumberQName(); SOAPElement messageNumberElement = sequenceElement.addChildElement(messageNumberQName); - messageNumberElement.setValue(String.valueOf(object.getMessageNumber())); + messageNumberElement.setValue(String.valueOf(o.getMessageNumber())); - if (object.isLastMessage()) + if (o.isLastMessage()) { // write optional wsrm:LastMessage element QName lastMessageQName = wsrmConstants.getLastMessageQName(); Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationRepository.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationRepository.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/SerializationRepository.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -22,7 +22,6 @@ package org.jboss.ws.extensions.wsrm.common.serialization; import org.jboss.ws.extensions.wsrm.ReliableMessagingException; -import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequence; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequenceResponse; @@ -31,10 +30,15 @@ import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFault; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequenceResponse; + import javax.xml.soap.SOAPMessage; +import java.util.Map; +import java.util.HashMap; + /** * Utility class used for de/serialization * @author richard.opalka(a)jboss.com @@ -42,81 +46,67 @@ final class SerializationRepository { + private static final Map<Class<? extends Serializable>, Serializer> SERIALIZER_REGISTRY; + + static + { + SERIALIZER_REGISTRY = new HashMap<Class<? extends Serializable>, Serializer>(); + SERIALIZER_REGISTRY.put(AckRequested.class, AckRequestedSerializer.getInstance()); + SERIALIZER_REGISTRY.put(CloseSequence.class, CloseSequenceSerializer.getInstance()); + SERIALIZER_REGISTRY.put(CloseSequenceResponse.class, CloseSequenceResponseSerializer.getInstance()); + SERIALIZER_REGISTRY.put(CreateSequence.class, CreateSequenceSerializer.getInstance()); + SERIALIZER_REGISTRY.put(CreateSequenceResponse.class, CreateSequenceResponseSerializer.getInstance()); + SERIALIZER_REGISTRY.put(SequenceAcknowledgement.class, SequenceAcknowledgementSerializer.getInstance()); + SERIALIZER_REGISTRY.put(SequenceFault.class, SequenceFaultSerializer.getInstance()); + SERIALIZER_REGISTRY.put(Sequence.class, SequenceSerializer.getInstance()); + SERIALIZER_REGISTRY.put(TerminateSequence.class, TerminateSequenceSerializer.getInstance()); + SERIALIZER_REGISTRY.put(TerminateSequenceResponse.class, TerminateSequenceResponseSerializer.getInstance()); + } + private SerializationRepository() { - // forbidden inheritance + // no instances } - public static void serialize(AbstractSerializable object, SOAPMessage soapMessage) throws ReliableMessagingException + /** + * Serialize passed <b>object</b> data to the <b>soapMessage</b> + * @param object to be serialized + * @param soapMessage where to write data + * @throws ReliableMessagingException if something went wrong + */ + public static void serialize(AbstractSerializable object, SOAPMessage soapMessage) + throws ReliableMessagingException { - Provider provider = object.getProvider(); - - if (object instanceof AckRequested) - AckRequestedSerializer - .serialize((AckRequested)object, provider, soapMessage); - if (object instanceof CloseSequence) - CloseSequenceSerializer - .serialize((CloseSequence)object, provider, soapMessage); - if (object instanceof CloseSequenceResponse) - CloseSequenceResponseSerializer - .serialize((CloseSequenceResponse)object, provider, soapMessage); - if (object instanceof CreateSequence) - CreateSequenceSerializer - .serialize((CreateSequence)object, provider, soapMessage); - if (object instanceof CreateSequenceResponse) - CreateSequenceResponseSerializer - .serialize((CreateSequenceResponse)object, provider, soapMessage); - if (object instanceof SequenceAcknowledgement) - SequenceAcknowledgementSerializer - .serialize((SequenceAcknowledgement)object, provider, soapMessage); - if (object instanceof SequenceFault) - SequenceFaultSerializer - .serialize((SequenceFault)object, provider, soapMessage); - if (object instanceof Sequence) - SequenceSerializer - .serialize((Sequence)object, provider, soapMessage); - if (object instanceof TerminateSequence) - TerminateSequenceSerializer - .serialize((TerminateSequence)object, provider, soapMessage); - if (object instanceof TerminateSequenceResponse) - TerminateSequenceResponseSerializer - .serialize((TerminateSequenceResponse)object, provider, soapMessage); + getSerializer(object).serialize(object, object.getProvider(), soapMessage); } - public static void deserialize(AbstractSerializable object, SOAPMessage soapMessage) throws ReliableMessagingException + /** + * Initialize passed <b>object</b> using data in <b>soapMessage</b> + * @param object to be initialized + * @param soapMessage from which to read the data + * @throws ReliableMessagingException if something went wrong + */ + public static void deserialize(AbstractSerializable object, SOAPMessage soapMessage) + throws ReliableMessagingException { - Provider provider = object.getProvider(); + getSerializer(object).deserialize(object, object.getProvider(), soapMessage); + } + + /** + * Lookups the serializer associated with the passed <b>object</b> + * @param object to lookup serializer for + * @return serializer to be used + * @throws IllegalArgumentException if passed object has no defined serializer + */ + private static Serializer getSerializer(Serializable object) + { + for (Class<? extends Serializable> serializable : SERIALIZER_REGISTRY.keySet()) + { + if (serializable.isAssignableFrom(object.getClass())) + return SERIALIZER_REGISTRY.get(serializable); + } - if (object instanceof AckRequested) - AckRequestedSerializer - .deserialize((AckRequested)object, provider, soapMessage); - if (object instanceof CloseSequence) - CloseSequenceSerializer - .deserialize((CloseSequence)object, provider, soapMessage); - if (object instanceof CloseSequenceResponse) - CloseSequenceResponseSerializer - .deserialize((CloseSequenceResponse)object, provider, soapMessage); - if (object instanceof CreateSequence) - CreateSequenceSerializer - .deserialize((CreateSequence)object, provider, soapMessage); - if (object instanceof CreateSequenceResponse) - CreateSequenceResponseSerializer - .deserialize((CreateSequenceResponse)object, provider, soapMessage); - if (object instanceof SequenceAcknowledgement) - SequenceAcknowledgementSerializer - .deserialize((SequenceAcknowledgement)object, provider, soapMessage); - if (object instanceof SequenceFault) - SequenceFaultSerializer - .deserialize((SequenceFault)object, provider, soapMessage); - if (object instanceof Sequence) - SequenceSerializer - .deserialize((Sequence)object, provider, soapMessage); - if (object instanceof TerminateSequence) - TerminateSequenceSerializer - .deserialize((TerminateSequence)object, provider, soapMessage); - if (object instanceof TerminateSequenceResponse) - TerminateSequenceResponseSerializer - .deserialize((TerminateSequenceResponse)object, provider, soapMessage); + throw new IllegalArgumentException(); } } Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/Serializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/Serializer.java (rev 0) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/Serializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.extensions.wsrm.common.serialization; + +import javax.xml.soap.SOAPMessage; + +import org.jboss.ws.extensions.wsrm.spi.Provider; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; + +/** + * Each WS-RM message de/serializer must implement this interface + * @author richard.opalka(a)jboss.com + */ +interface Serializer +{ + + /** + * Serialize the specified <b>object</b> using passed RM <b>provider</b> to the <b>soapMessage</b> + * @param object to be serialized + * @param provider RM provider to be used + * @param soapMessage where to write the data + */ + void serialize(Serializable object, Provider provider, SOAPMessage soapMessage); + + /** + * Deserialize the specified <b>object</b> using passed RM <b>provider</b> from the <b>soapMessage</b> + * @param object to be deserialized + * @param provider RM provider to be used + * @param soapMessage from which to read the data + */ + void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage); + +} Property changes on: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/Serializer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceResponseSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -34,29 +34,38 @@ import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequenceResponse; /** * <b>TerminateSequenceResponse</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class TerminateSequenceResponseSerializer +final class TerminateSequenceResponseSerializer implements Serializer { + private static final Serializer INSTANCE = new TerminateSequenceResponseSerializer(); + private TerminateSequenceResponseSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>TerminateSequenceResponse</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(TerminateSequenceResponse object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + TerminateSequenceResponse o = (TerminateSequenceResponse)object; try { SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody(); @@ -70,7 +79,7 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(terminateSequenceResponseElement, identifierQName, terminateSequenceResponseQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); } catch (SOAPException se) { @@ -88,9 +97,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(TerminateSequenceResponse object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + TerminateSequenceResponse o = (TerminateSequenceResponse)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -105,7 +115,7 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - terminateSequenceResponseElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + terminateSequenceResponseElement.addChildElement(identifierQName).setValue(o.getIdentifier()); } catch (SOAPException se) { Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/TerminateSequenceSerializer.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -36,29 +36,38 @@ import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.spi.Constants; import org.jboss.ws.extensions.wsrm.spi.Provider; +import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence; /** * <b>TerminateSequence</b> object de/serializer * @author richard.opalka(a)jboss.com */ -final class TerminateSequenceSerializer +final class TerminateSequenceSerializer implements Serializer { + private static final Serializer INSTANCE = new TerminateSequenceSerializer(); + private TerminateSequenceSerializer() { - // no instances + // hide constructor } + static Serializer getInstance() + { + return INSTANCE; + } + /** * Deserialize <b>TerminateSequence</b> using <b>provider</b> from the <b>soapMessage</b> * @param object to be deserialized * @param provider wsrm provider to be used for deserialization process * @param soapMessage soap message from which object will be deserialized */ - public static void deserialize(TerminateSequence object, Provider provider, SOAPMessage soapMessage) + public final void deserialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + TerminateSequence o = (TerminateSequence)object; try { SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody(); @@ -72,7 +81,7 @@ QName identifierQName = wsrmConstants.getIdentifierQName(); SOAPElement identifierElement = getRequiredElement(terminateSequenceElement, identifierQName, terminateSequenceQName); String identifier = getRequiredTextContent(identifierElement, identifierQName); - object.setIdentifier(identifier); + o.setIdentifier(identifier); // read optional wsrm:LastMsgNumber element QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName(); @@ -81,7 +90,7 @@ { String lastMsgNumberString = getRequiredTextContent(lastMsgNumberElement, lastMsgNumberQName); long lastMsgNumberValue = stringToLong(lastMsgNumberString, "Unable to parse LastMsgNumber element text content"); - object.setLastMsgNumber(lastMsgNumberValue); + o.setLastMsgNumber(lastMsgNumberValue); } } catch (SOAPException se) @@ -100,9 +109,10 @@ * @param provider wsrm provider to be used for serialization process * @param soapMessage soap message to which object will be serialized */ - public static void serialize(TerminateSequence object, Provider provider, SOAPMessage soapMessage) + public final void serialize(Serializable object, Provider provider, SOAPMessage soapMessage) throws ReliableMessagingException { + TerminateSequence o = (TerminateSequence)object; try { SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); @@ -117,14 +127,14 @@ // write required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); - terminateSequenceElement.addChildElement(identifierQName).setValue(object.getIdentifier()); + terminateSequenceElement.addChildElement(identifierQName).setValue(o.getIdentifier()); - if (object.getLastMsgNumber() != 0) + if (o.getLastMsgNumber() != 0) { // write optional wsrm:LastMsgNumber element QName lastMsgNumberQName = wsrmConstants.getLastMsgNumberQName(); SOAPElement lastMsgNumberElement = terminateSequenceElement.addChildElement(lastMsgNumberQName); - lastMsgNumberElement.setValue(String.valueOf(object.getLastMsgNumber())); + lastMsgNumberElement.setValue(String.valueOf(o.getLastMsgNumber())); } } catch (SOAPException se) Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/AckRequestedImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/AckRequestedImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/AckRequestedImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200502; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested; @@ -131,7 +132,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200502; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence; @@ -181,7 +182,7 @@ public void validate() { if (this.acksTo == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("AcksTo must be set"); } /* Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceResponseImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceResponseImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/CreateSequenceResponseImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200502; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse; @@ -195,7 +196,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier must be set"); } /* Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceAcknowledgementImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceAcknowledgementImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceAcknowledgementImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -25,6 +25,7 @@ import java.util.LinkedList; import java.util.Collections; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement; @@ -213,8 +214,10 @@ public void validate() { + if (this.identifier == null) + throw new ReliableMessagingException("Identifier not set"); if ((this.acknowledgementRanges.size() == 0) && (this.nacks.size() == 0)) - throw new IllegalStateException(); + throw new ReliableMessagingException("AcknowledgementRange or Nack must be set"); } private static void checkOverlap(AcknowledgementRange currentRange, AcknowledgementRange newRange) Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceFaultImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceFaultImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceFaultImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200502; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFault; @@ -137,7 +138,7 @@ public void validate() { if (this.faultCode == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("FaultCode must be set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/SequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200502; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence; @@ -151,9 +152,9 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier must be set"); if (this.messageNumber == 0) - throw new IllegalStateException(); + throw new ReliableMessagingException("MessageNumber must be set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/TerminateSequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/TerminateSequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/TerminateSequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200502; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence; @@ -122,7 +123,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/AckRequestedImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/AckRequestedImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/AckRequestedImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested; @@ -122,7 +123,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequence; @@ -131,7 +132,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceResponseImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceResponseImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceResponseImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequenceResponse; @@ -106,7 +107,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence; @@ -181,7 +182,7 @@ public void validate() { if (this.acksTo == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("AcksTo must be set"); } /* Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceResponseImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceResponseImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceResponseImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse; @@ -209,7 +210,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier must be set"); } /* Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceAcknowledgementImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceAcknowledgementImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceAcknowledgementImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -25,6 +25,7 @@ import java.util.LinkedList; import java.util.Collections; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; @@ -235,8 +236,10 @@ public void validate() { + if (this.identifier == null) + throw new ReliableMessagingException("Identifier not set"); if ((this.acknowledgementRanges.size() == 0) && (this.nacks.size() == 0) && (!this.isNone)) - throw new IllegalStateException(); + throw new ReliableMessagingException("AcknowledgementRange or Nack or None must be set"); } private static void checkOverlap(AcknowledgementRange currentRange, AcknowledgementRange newRange) Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceFaultImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceFaultImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceFaultImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFault; @@ -137,7 +138,7 @@ public void validate() { if (this.faultCode == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("FaultCode must be set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence; @@ -147,9 +148,9 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier must be set"); if (this.messageNumber == 0) - throw new IllegalStateException(); + throw new ReliableMessagingException("MessageNumber must be set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence; @@ -131,7 +132,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceResponseImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceResponseImpl.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceResponseImpl.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.ws.extensions.wsrm.ReliableMessagingException; import org.jboss.ws.extensions.wsrm.common.serialization.AbstractSerializable; import org.jboss.ws.extensions.wsrm.spi.Provider; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequenceResponse; @@ -106,7 +107,7 @@ public void validate() { if (this.identifier == null) - throw new IllegalStateException(); + throw new ReliableMessagingException("Identifier not set"); } } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/Serializable.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/Serializable.java 2007-09-12 16:10:57 UTC (rev 4556) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/Serializable.java 2007-09-12 16:12:45 UTC (rev 4557) @@ -36,18 +36,20 @@ /** * Serialize object instance to SOAP message * @param soapMessage + * @throws ReliableMessagingException is something went wrong */ void serializeTo(SOAPMessage soapMessage) throws ReliableMessagingException; /** * Deserialize object instance from SOAP message - * @param soapMessage + * @param soapMessage ReliableMessagingException is something went wrong */ void deserializeFrom(SOAPMessage soapMessage) throws ReliableMessagingException; /** * Validate object state if everything is all right + * @throws ReliableMessagingException if object is in incorrect state */ - void validate(); + void validate() throws ReliableMessagingException; }