[jbossws-commits] JBossWS SVN: r4512 - in stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm: spi/protocol and 1 other directory.

Author: richard.opalka(a)jboss.com Date: 2007-09-03 13:22:47 -0400 (Mon, 03 Sep 2007) New Revision: 4512 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/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/ProviderImpl.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/AckRequested.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CloseSequence.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CreateSequenceResponse.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/SequenceAcknowledgement.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/TerminateSequence.java Log: adding WS-RM 2007/02 initial implementation except de/serialization support 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/AckRequestedImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested; import org.w3c.dom.Element; @@ -31,6 +32,8 @@ final class AckRequestedImpl implements AckRequested { + private String identifier; + AckRequestedImpl() { // allow inside package use only @@ -41,17 +44,15 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested#getMessage() */ - public long getMessage() + public long getMessageNumber() { - // TODO Auto-generated method stub - return 0; + return 0; // always return zero for this version of the RM protocol } /* @@ -59,17 +60,20 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested#setMessage(long) */ - public void setMessage(long lastMessageId) + public void setMessageNumber(long lastMessageNumber) { - // TODO Auto-generated method stub - + // do nothing for this version of the RM protocol } /* @@ -77,8 +81,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -86,8 +91,15 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } - + + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequence; import org.w3c.dom.Element; @@ -31,6 +32,9 @@ final class CloseSequenceImpl implements CloseSequence { + private String identifier; + private long lastMsgNumber; + CloseSequenceImpl() { // allow inside package use only @@ -41,17 +45,15 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequence#getLastMsgNumber() */ - public void getLastMsgNumber() + public long getLastMsgNumber() { - // TODO Auto-generated method stub - + return this.lastMsgNumber; } /* @@ -59,8 +61,12 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* @@ -68,8 +74,12 @@ */ public void setLastMsgNumber(long lastMsgNumber) { - // TODO Auto-generated method stub - + if (lastMsgNumber <= 0) + throw new IllegalArgumentException("Value must be greater than 0"); + if (this.lastMsgNumber > 0) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.lastMsgNumber = lastMsgNumber; } /* @@ -77,8 +87,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -86,8 +97,15 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CloseSequenceResponseImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequenceResponse; import org.w3c.dom.Element; @@ -31,6 +32,8 @@ final class CloseSequenceResponseImpl implements CloseSequenceResponse { + private String identifier; + CloseSequenceResponseImpl() { // allow inside package use only @@ -41,8 +44,7 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* @@ -50,8 +52,12 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* @@ -59,8 +65,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -68,8 +75,15 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,7 +21,9 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior; import org.w3c.dom.Element; /* @@ -30,6 +32,10 @@ */ final class CreateSequenceImpl implements CreateSequence { + + private String acksTo; + private String expires; + private Offer offer; CreateSequenceImpl() { @@ -41,8 +47,7 @@ */ public String getAcksTo() { - // TODO Auto-generated method stub - return null; + return this.acksTo; } /* @@ -50,8 +55,7 @@ */ public String getExpires() { - // TODO Auto-generated method stub - return null; + return this.expires; } /* @@ -59,8 +63,7 @@ */ public Offer getOffer() { - // TODO Auto-generated method stub - return null; + return this.offer; } /* @@ -68,8 +71,7 @@ */ public Offer newOffer() { - // TODO Auto-generated method stub - return null; + return new OfferImpl(); } /* @@ -77,8 +79,12 @@ */ public void setAcksTo(String address) { - // TODO Auto-generated method stub - + if ((address == null) || (address.trim().equals(""))) + throw new IllegalArgumentException("Address cannot be null nor empty string"); + if (this.acksTo != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.acksTo = address; } /* @@ -86,8 +92,12 @@ */ public void setExpires(String duration) { - // TODO Auto-generated method stub - + if ((duration == null) || (duration.trim().equals(""))) + throw new IllegalArgumentException("Duration cannot be null nor empty string"); + if (this.expires != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.expires = duration; } /* @@ -95,8 +105,14 @@ */ public void setOffer(Offer offer) { - // TODO Auto-generated method stub - + if (offer == null) + throw new IllegalArgumentException("Offer cannot be null"); + if (!(offer instanceof OfferImpl)) + throw new IllegalArgumentException(); + if (this.offer != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.offer = offer; } /* @@ -104,8 +120,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -113,8 +130,144 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.acksTo == null) + throw new IllegalStateException(); + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer + */ + private static final class OfferImpl implements CreateSequence.Offer + { + + private String endpoint; + private String duration; + private String identifier; + private IncompleteSequenceBehavior incompleteSequenceBehavior; + + private OfferImpl() + { + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#getEndpoint() + */ + public String getEndpoint() + { + return this.endpoint; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#getExpires() + */ + public String getExpires() + { + return this.duration; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#getIdentifier() + */ + public String getIdentifier() + { + return this.identifier; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#getIncompleteSequenceBehavior() + */ + public IncompleteSequenceBehavior getIncompleteSequenceBehavior() + { + return this.incompleteSequenceBehavior; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#setEndpoint(java.lang.String) + */ + public void setEndpoint(String address) + { + if ((address == null) || (address.trim().equals(""))) + throw new IllegalArgumentException("Address cannot be null nor empty string"); + if (this.endpoint != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.endpoint = address; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#setExpires(java.lang.String) + */ + public void setExpires(String duration) + { + if ((duration == null) || (duration.trim().equals(""))) + throw new IllegalArgumentException("Duration cannot be null nor empty string"); + if (this.duration != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.duration = duration; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#setIdentifier(java.lang.String) + */ + public void setIdentifier(String identifier) + { + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer#setIncompleteSequenceBehavior(org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior) + */ + public void setIncompleteSequenceBehavior(IncompleteSequenceBehavior incompleteSequenceBehavior) + { + if (incompleteSequenceBehavior == null) + throw new IllegalArgumentException("Sequence behavior type cannot be null"); + if (this.incompleteSequenceBehavior != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.incompleteSequenceBehavior = incompleteSequenceBehavior; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#fromXML(org.w3c.dom.Element) + */ + public void fromXML(Element e) + { + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#toXML() + */ + public Element toXML() + { + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); + } + + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + if (this.endpoint == null) + throw new IllegalStateException(); + } + + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/CreateSequenceResponseImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse; import org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior; import org.w3c.dom.Element; @@ -31,6 +32,11 @@ */ final class CreateSequenceResponseImpl implements CreateSequenceResponse { + + private String identifier; + private String expires; + private Accept accept; + private IncompleteSequenceBehavior incompleteSequenceBehavior; CreateSequenceResponseImpl() { @@ -42,17 +48,15 @@ */ public Accept getAccept() { - // TODO Auto-generated method stub - return null; + return this.accept; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#getDuration() */ - public String getDuration() + public String getExpires() { - // TODO Auto-generated method stub - return null; + return this.expires; } /* @@ -60,8 +64,7 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* @@ -69,8 +72,7 @@ */ public IncompleteSequenceBehavior getIncompleteSequenceBehavior() { - // TODO Auto-generated method stub - return null; + return this.incompleteSequenceBehavior; } /* @@ -78,8 +80,7 @@ */ public Accept newAccept() { - // TODO Auto-generated method stub - return null; + return new AcceptImpl(); } /* @@ -87,8 +88,14 @@ */ public void setAccept(Accept accept) { - // TODO Auto-generated method stub - + if (accept == null) + throw new IllegalArgumentException("Accept cannot be null"); + if (!(accept instanceof AcceptImpl)) + throw new IllegalArgumentException(); + if (this.accept != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.accept = accept; } /* @@ -96,8 +103,12 @@ */ public void setExpires(String duration) { - // TODO Auto-generated method stub - + if ((duration == null) || (duration.trim().equals(""))) + throw new IllegalArgumentException("Duration cannot be null nor empty string"); + if (this.expires != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.expires = duration; } /* @@ -105,17 +116,25 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#setIncompleteSequenceBehavior(org.jboss.ws.extensions.wsrm.spi.protocol.IncompleteSequenceBehavior) */ - public void setIncompleteSequenceBehavior(IncompleteSequenceBehavior incompletSequenceBehaviour) + public void setIncompleteSequenceBehavior(IncompleteSequenceBehavior incompleteSequenceBehavior) { - // TODO Auto-generated method stub - + if (incompleteSequenceBehavior == null) + throw new IllegalArgumentException("Sequence behavior type cannot be null"); + if (this.incompleteSequenceBehavior != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.incompleteSequenceBehavior = incompleteSequenceBehavior; } /* @@ -123,8 +142,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -132,8 +152,72 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept + */ + private static final class AcceptImpl implements CreateSequenceResponse.Accept + { + private String acksTo; + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept#getAcksTo() + */ + public String getAcksTo() + { + return this.acksTo; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept#setAcksTo(java.lang.String) + */ + public void setAcksTo(String address) + { + if ((address == null) || (address.trim().equals(""))) + throw new IllegalArgumentException("Address cannot be null nor empty string"); + if (this.acksTo != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.acksTo = address; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#fromXML(org.w3c.dom.Element) + */ + public void fromXML(Element e) + { + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#toXML() + */ + public Element toXML() + { + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); + } + + private void ensureLegalState() + { + if (this.acksTo == null) + throw new IllegalStateException(); + } + + } + } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/ProviderImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/ProviderImpl.java 2007-09-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/ProviderImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -48,7 +48,7 @@ * @see org.jboss.ws.extensions.wsrm.spi.Provider#getMessageFactory() */ @Override - public final MessageFactory getMessageFactory() + public MessageFactory getMessageFactory() { return MessageFactoryImpl.getInstance(); } @@ -57,7 +57,7 @@ * @see org.jboss.ws.extensions.wsrm.spi.Provider#getNamespaceURI() */ @Override - public final String getNamespaceURI() + public String getNamespaceURI() { return IMPLEMENTATION_VERSION; } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceAcknowledgementImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -22,7 +22,10 @@ package org.jboss.ws.extensions.wsrm.spec200702; import java.util.List; +import java.util.LinkedList; +import java.util.Collections; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement; import org.w3c.dom.Element; @@ -33,6 +36,12 @@ final class SequenceAcknowledgementImpl implements SequenceAcknowledgement { + private final List<Long> nacks = new LinkedList<Long>(); + private final List<AcknowledgementRange> acknowledgementRanges = new LinkedList<AcknowledgementRange>(); + private String identifier; + private boolean isFinal; + private boolean isNone; + SequenceAcknowledgementImpl() { // allow inside package use only @@ -41,10 +50,20 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#addAcknowledgementRange(org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange) */ - public void addAcknowledgementRange(AcknowledgementRange acknowledgementRange) + public void addAcknowledgementRange(AcknowledgementRange newAcknowledgementRange) { - // TODO Auto-generated method stub - + if ((newAcknowledgementRange == null) || (!(newAcknowledgementRange instanceof AcknowledgementRangeImpl))) + throw new IllegalArgumentException(); + if (this.nacks.size() != 0) + throw new IllegalStateException("There are already some nacks specified"); + if (this.isNone) + throw new IllegalStateException("There is already none specified"); + if ((newAcknowledgementRange.getLower() == 0) || (newAcknowledgementRange.getUpper() == 0)) + throw new IllegalArgumentException("Both, lower and upper values must be specified"); + for (AcknowledgementRange alreadyAccepted : acknowledgementRanges) + checkOverlap(alreadyAccepted, newAcknowledgementRange); + + this.acknowledgementRanges.add(newAcknowledgementRange); } /* @@ -52,8 +71,16 @@ */ public void addNack(long messageNumber) { - // TODO Auto-generated method stub + if (this.isFinal) + throw new IllegalStateException("There is already final specified"); + if (this.isNone) + throw new IllegalStateException("There is already none specified"); + if (this.acknowledgementRanges.size() != 0) + throw new IllegalStateException("There are already some acknowledgement ranges specified"); + if (this.nacks.contains(messageNumber)) + throw new IllegalArgumentException("There is already nack with value " + messageNumber + " specified"); + this.nacks.add(messageNumber); } /* @@ -61,8 +88,7 @@ */ public List<AcknowledgementRange> getAcknowledgementRanges() { - // TODO Auto-generated method stub - return null; + return Collections.unmodifiableList(acknowledgementRanges); } /* @@ -70,8 +96,7 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* @@ -79,8 +104,7 @@ */ public List<Long> getNacks() { - // TODO Auto-generated method stub - return null; + return Collections.unmodifiableList(nacks); } /* @@ -88,8 +112,7 @@ */ public boolean isFinal() { - // TODO Auto-generated method stub - return false; + return this.isFinal; } /* @@ -97,8 +120,7 @@ */ public boolean isNone() { - // TODO Auto-generated method stub - return false; + return this.isNone; } /* @@ -106,17 +128,18 @@ */ public AcknowledgementRange newAcknowledgementRange() { - // TODO Auto-generated method stub - return null; + return new AcknowledgementRangeImpl(); } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#setFinal(boolean) */ - public void setFinal(boolean isFinal) + public void setFinal() { - // TODO Auto-generated method stub + if (this.nacks.size() != 0) + throw new IllegalStateException("There are already some nacks specified"); + this.isFinal = true; } /* @@ -124,17 +147,25 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#setNone(boolean) */ - public void setNone(boolean isNone) + public void setNone() { - // TODO Auto-generated method stub - + if (this.acknowledgementRanges.size() != 0) + throw new IllegalStateException("There are already some acknowledgement ranges specified"); + if (this.nacks.size() != 0) + throw new IllegalStateException("There are already some nacks specified"); + + this.isNone = true; } /* @@ -142,17 +173,122 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } - + /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#toXML() */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + + private void ensureLegalState() + { + if ((this.acknowledgementRanges.size() == 0) && (this.nacks.size() == 0) && (!this.isNone)) + throw new IllegalStateException(); + } + private static void checkOverlap(AcknowledgementRange currentRange, AcknowledgementRange newRange) + { + if ((currentRange.getLower() <= newRange.getLower()) && (newRange.getLower() <= currentRange.getUpper())) + throw new IllegalArgumentException( + "Overlap detected: " + currentRange + " vs. " + newRange); + if ((currentRange.getLower() <= newRange.getUpper()) && (newRange.getUpper() <= currentRange.getUpper())) + throw new IllegalArgumentException( + "Overlap detected: " + currentRange + " vs. " + newRange); + } + + private static final class AcknowledgementRangeImpl implements SequenceAcknowledgement.AcknowledgementRange + { + + private long lower; + private long upper; + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange#getLower() + */ + public long getLower() + { + return this.lower; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange#getUpper() + */ + public long getUpper() + { + return this.upper; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange#setLower(long) + */ + public void setLower(long lower) + { + if (lower <= 0) + throw new IllegalArgumentException("Value must be greater than 0"); + if (this.lower > 0) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + if ((this.upper > 0) && (lower > this.upper)) + throw new IllegalArgumentException("Value must be lower or equal to " + this.upper); + + this.lower = lower; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange#setUpper(long) + */ + public void setUpper(long upper) + { + if (upper <= 0) + throw new IllegalArgumentException("Value must be greater than 0"); + if (this.upper > 0) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + if ((this.lower > 0) && (this.lower > upper)) + throw new IllegalArgumentException("Value must be greater or equal to " + this.lower); + + this.upper = upper; + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#fromXML(org.w3c.dom.Element) + */ + public void fromXML(Element e) + { + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); + } + + /* + * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#toXML() + */ + public Element toXML() + { + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); + } + + public String toString() + { + return "<" + lower + "; " + upper + ">"; + } + + private void ensureLegalState() + { + if (this.lower == 0) + throw new IllegalStateException(); + if (this.upper == 0) + throw new IllegalStateException(); + } + + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceFaultImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFault; import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFaultCode; import org.w3c.dom.Element; @@ -31,6 +32,9 @@ */ final class SequenceFaultImpl implements SequenceFault { + + private SequenceFaultCode faultCode; + private Exception detail; SequenceFaultImpl() { @@ -42,8 +46,7 @@ */ public Exception getDetail() { - // TODO Auto-generated method stub - return null; + return this.detail; } /* @@ -51,8 +54,7 @@ */ public SequenceFaultCode getFaultCode() { - // TODO Auto-generated method stub - return null; + return this.faultCode; } /* @@ -60,8 +62,12 @@ */ public void setDetail(Exception detail) { - // TODO Auto-generated method stub + if (detail == null) + throw new IllegalArgumentException("Detail cannot be null"); + if (this.detail != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + this.detail = detail; } /* @@ -69,8 +75,12 @@ */ public void setFaultCode(SequenceFaultCode faultCode) { - // TODO Auto-generated method stub + if (faultCode == null) + throw new IllegalArgumentException("Fault code cannot be null"); + if (this.faultCode != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + this.faultCode = faultCode; } /* @@ -78,8 +88,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -87,8 +98,15 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.faultCode == null) + throw new IllegalStateException(); + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/SequenceImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -23,6 +23,7 @@ import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence; import org.w3c.dom.Element; +import org.jboss.util.NotImplementedException; /* * @author richard.opalka(a)jboss.com @@ -30,6 +31,9 @@ */ final class SequenceImpl implements Sequence { + + private String identifier; + private long messageNumber; SequenceImpl() { @@ -41,8 +45,7 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* @@ -50,8 +53,7 @@ */ public long getMessageNumber() { - // TODO Auto-generated method stub - return 0; + return messageNumber; } /* @@ -59,8 +61,7 @@ */ public boolean isLastMessage() { - // TODO Auto-generated method stub - return false; + return false; // always return false for this version of the RM protocol } /* @@ -68,8 +69,12 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* @@ -77,8 +82,7 @@ */ public void setLastMessage(boolean lastMessage) { - // TODO Auto-generated method stub - + // do nothing for this version of the RM protocol } /* @@ -86,17 +90,22 @@ */ public void setMessageNumber(long messageNumber) { - // TODO Auto-generated method stub - + if (messageNumber <= 0) + throw new IllegalArgumentException("Value must be greater than 0"); + if (this.messageNumber > 0) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.messageNumber = messageNumber; } - + /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.XMLSerializable#fromXML(org.w3c.dom.Element) */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -104,8 +113,17 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + if (this.messageNumber == 0) + throw new IllegalStateException(); + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence; import org.w3c.dom.Element; @@ -31,6 +32,9 @@ final class TerminateSequenceImpl implements TerminateSequence { + private String identifier; + private long lastMsgNumber; + TerminateSequenceImpl() { // allow inside package use only @@ -41,17 +45,15 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence#getLastMsgNumber() */ - public void getLastMsgNumber() + public long getLastMsgNumber() { - // TODO Auto-generated method stub - + return this.lastMsgNumber; } /* @@ -59,8 +61,12 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* @@ -68,8 +74,12 @@ */ public void setLastMsgNumber(long lastMsgNumber) { - // TODO Auto-generated method stub - + if (lastMsgNumber <= 0) + throw new IllegalArgumentException("Value must be greater than 0"); + if (this.lastMsgNumber > 0) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.lastMsgNumber = lastMsgNumber; } /* @@ -77,8 +87,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -86,8 +97,15 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + } + } 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-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/TerminateSequenceResponseImpl.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -21,6 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.spec200702; +import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequenceResponse; import org.w3c.dom.Element; @@ -31,6 +32,8 @@ final class TerminateSequenceResponseImpl implements TerminateSequenceResponse { + private String identifier; + TerminateSequenceResponseImpl() { // allow inside package use only @@ -41,8 +44,7 @@ */ public String getIdentifier() { - // TODO Auto-generated method stub - return null; + return this.identifier; } /* @@ -50,8 +52,12 @@ */ public void setIdentifier(String identifier) { - // TODO Auto-generated method stub - + if ((identifier == null) || (identifier.trim().equals(""))) + throw new IllegalArgumentException("Identifier cannot be null nor empty string"); + if (this.identifier != null) + throw new UnsupportedOperationException("Value already set, cannot be overriden"); + + this.identifier = identifier; } /* @@ -59,8 +65,9 @@ */ public void fromXML(Element e) { - // TODO Auto-generated method stub - + // TODO: implement deserialization using object set methods + if (true) throw new NotImplementedException(); + ensureLegalState(); } /* @@ -68,8 +75,15 @@ */ public Element toXML() { - // TODO Auto-generated method stub - return null; + ensureLegalState(); + // TODO implement serialization using object instance fields + throw new NotImplementedException(); } + private void ensureLegalState() + { + if (this.identifier == null) + throw new IllegalStateException(); + } + } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/AckRequested.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/AckRequested.java 2007-09-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/AckRequested.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -57,13 +57,13 @@ * <b>MessageNumber</b> sent by the RM Source within a Sequence. If present, it MAY be treated * as a hint to the RM Destination as an optimization to the process of preparing to transmit a * <b>SequenceAcknowledgement</b>. - * @param lastMessageId + * @param lastMessageNumber */ - void setMessage(long lastMessageId); + void setMessageNumber(long lastMessageNumber); /** * Getter * @return last message number in the sequence */ - long getMessage(); + long getMessageNumber(); } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CloseSequence.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CloseSequence.java 2007-09-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CloseSequence.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -65,5 +65,5 @@ * Getter * @return last message number */ - void getLastMsgNumber(); + long getLastMsgNumber(); } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CreateSequenceResponse.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CreateSequenceResponse.java 2007-09-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/CreateSequenceResponse.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -78,7 +78,7 @@ * Getter * @return sequence duration */ - String getDuration(); + String getExpires(); /** * This element, if present, specifies the behavior that the destination will exhibit upon the closure or Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/SequenceAcknowledgement.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/SequenceAcknowledgement.java 2007-09-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/SequenceAcknowledgement.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -70,9 +70,8 @@ * Destination MUST include this element when the Sequence is closed. The RM Destination MUST * NOT include this element when sending a <b>Nack</b>; it can only be used when sending * <b>AcknowledgementRange</b> elements or a <b>None</b>. - * @param isFinal */ - void setFinal(boolean isFinal); + void setFinal(); /** * Getter @@ -85,9 +84,8 @@ * block if the RM Destination has not accepted any messages for the specified Sequence. The RM * Destination MUST NOT include this element if a sibling <b>AcknowledgementRange</b> or <b>Nack</b> * element is also present as a child of the <b>SequenceAcknowledgement</b>. - * @param isNone */ - void setNone(boolean isNone); + void setNone(); /** * Getter Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/TerminateSequence.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/TerminateSequence.java 2007-09-03 10:49:45 UTC (rev 4511) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/TerminateSequence.java 2007-09-03 17:22:47 UTC (rev 4512) @@ -74,5 +74,5 @@ * Getter * @return last message number */ - void getLastMsgNumber(); + long getLastMsgNumber(); }