diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java index 158ae0d86a..032c0cdf02 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java @@ -26,8 +26,10 @@ import org.apache.qpid.proton.engine.Connection; import org.apache.qpid.proton.engine.Delivery; import org.apache.qpid.proton.engine.EndpointState; import org.apache.qpid.proton.engine.Link; +import org.apache.qpid.proton.engine.Record; import org.apache.qpid.proton.engine.Session; import org.apache.qpid.proton.engine.Transport; +import org.apache.qpid.proton.reactor.Reactor; /** * Unmodifiable Connection wrapper used to prevent test code from accidentally @@ -187,4 +189,14 @@ public class UnmodifiableConnection implements Connection { public Transport getTransport() { return new UnmodifiableTransport(connection.getTransport()); } + + @Override + public Record attachments() { + return connection.attachments(); + } + + @Override + public Reactor getReactor() { + return connection.getReactor(); + } } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java index fd9966536d..71cacaf07d 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java @@ -20,6 +20,7 @@ import org.apache.qpid.proton.amqp.transport.DeliveryState; import org.apache.qpid.proton.engine.Delivery; import org.apache.qpid.proton.engine.Link; import org.apache.qpid.proton.engine.Receiver; +import org.apache.qpid.proton.engine.Record; import org.apache.qpid.proton.engine.Sender; /** @@ -144,4 +145,19 @@ public class UnmodifiableDelivery implements Delivery { public boolean isBuffered() { return delivery.isBuffered(); } + + @Override + public Record attachments() { + return delivery.attachments(); + } + + @Override + public DeliveryState getDefaultDeliveryState() { + return delivery.getDefaultDeliveryState(); + } + + @Override + public void setDefaultDeliveryState(DeliveryState state) { + throw new UnsupportedOperationException("Cannot alter the Delivery"); + } } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java index fd44dcd7c4..fbdfb61235 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java @@ -27,6 +27,7 @@ import org.apache.qpid.proton.engine.Delivery; import org.apache.qpid.proton.engine.EndpointState; import org.apache.qpid.proton.engine.Link; import org.apache.qpid.proton.engine.Receiver; +import org.apache.qpid.proton.engine.Record; import org.apache.qpid.proton.engine.Sender; import org.apache.qpid.proton.engine.Session; @@ -245,4 +246,13 @@ public class UnmodifiableLink implements Link { public void detach() { throw new UnsupportedOperationException("Cannot alter the Link state"); } + + @Override + public boolean detached() { + return link.detached(); + } + + public Record attachments() { + return link.attachments(); + } } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java index 6a73e0f96f..31b045208a 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java @@ -22,6 +22,7 @@ import org.apache.qpid.proton.amqp.transport.ErrorCondition; import org.apache.qpid.proton.engine.Connection; import org.apache.qpid.proton.engine.EndpointState; import org.apache.qpid.proton.engine.Receiver; +import org.apache.qpid.proton.engine.Record; import org.apache.qpid.proton.engine.Sender; import org.apache.qpid.proton.engine.Session; @@ -131,4 +132,19 @@ public class UnmodifiableSession implements Session { public int getOutgoingBytes() { return session.getOutgoingBytes(); } + + @Override + public Record attachments() { + return session.attachments(); + } + + @Override + public long getOutgoingWindow() { + return session.getOutgoingWindow(); + } + + @Override + public void setOutgoingWindow(long outgoingWindowSize) { + throw new UnsupportedOperationException("Cannot alter the Session"); + } } diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java index 3d05d50f36..8c663c36f7 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import org.apache.qpid.proton.amqp.transport.ErrorCondition; import org.apache.qpid.proton.engine.Connection; import org.apache.qpid.proton.engine.EndpointState; +import org.apache.qpid.proton.engine.Record; import org.apache.qpid.proton.engine.Sasl; import org.apache.qpid.proton.engine.Ssl; import org.apache.qpid.proton.engine.SslDomain; @@ -245,4 +246,19 @@ public class UnmodifiableTransport implements Transport { public void unbind() { throw new UnsupportedOperationException("Cannot alter the Transport"); } + + @Override + public Record attachments() { + return transport.attachments(); + } + + @Override + public long getFramesInput() { + return transport.getFramesInput(); + } + + @Override + public long getFramesOutput() { + return transport.getFramesOutput(); + } } diff --git a/pom.xml b/pom.xml index 9a793e1dfe..791b27453d 100755 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ 1.1.2 1.4.0 3.4.6 - 0.9.1 + 0.10 0.6.0 4.0.29.Final 1.3