You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/13 14:52:54 UTC
svn commit: r1522905 [3/3] - in /qpid/jms/trunk: ./
src/main/java/org/apache/qpid/jms/engine/
src/main/java/org/apache/qpid/jms/impl/ src/test/java/org/apache/qpid/jms/
src/test/java/org/apache/qpid/jms/impl/
src/test/java/org/apache/qpid/jms/test/test...
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,8 +32,11 @@ import org.hamcrest.Matcher;
*/
public class EndMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_ERROR = 0;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ ERROR,
+ }
public EndMatcher()
{
@@ -41,7 +44,7 @@ public class EndMatcher extends FrameWit
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000017L),
Symbol.valueOf("amqp:end:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -54,14 +57,19 @@ public class EndMatcher extends FrameWit
public EndMatcher withError(Matcher<?> m)
{
- getMatchers().put(FIELD_ERROR, m);
+ getMatchers().put(Field.ERROR, m);
return this;
}
public Object getReceivedError()
{
- return getReceivedFields().get(FIELD_ERROR);
+ return getReceivedFields().get(Field.ERROR);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,18 +32,21 @@ import org.hamcrest.Matcher;
*/
public class FlowMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_NEXT_INCOMING_ID = 0;
- private static final int FIELD_INCOMING_WINDOW = 1;
- private static final int FIELD_NEXT_OUTGOING_ID = 2;
- private static final int FIELD_OUTGOING_WINDOW = 3;
- private static final int FIELD_HANDLE = 4;
- private static final int FIELD_DELIVERY_COUNT = 5;
- private static final int FIELD_LINK_CREDIT = 6;
- private static final int FIELD_AVAILABLE = 7;
- private static final int FIELD_DRAIN = 8;
- private static final int FIELD_ECHO = 9;
- private static final int FIELD_PROPERTIES = 10;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ NEXT_INCOMING_ID,
+ INCOMING_WINDOW,
+ NEXT_OUTGOING_ID,
+ OUTGOING_WINDOW,
+ HANDLE,
+ DELIVERY_COUNT,
+ LINK_CREDIT,
+ AVAILABLE,
+ DRAIN,
+ ECHO,
+ PROPERTIES,
+ }
public FlowMatcher()
{
@@ -51,7 +54,7 @@ public class FlowMatcher extends FrameWi
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000013L),
Symbol.valueOf("amqp:flow:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -64,124 +67,129 @@ public class FlowMatcher extends FrameWi
public FlowMatcher withNextIncomingId(Matcher<?> m)
{
- getMatchers().put(FIELD_NEXT_INCOMING_ID, m);
+ getMatchers().put(Field.NEXT_INCOMING_ID, m);
return this;
}
public FlowMatcher withIncomingWindow(Matcher<?> m)
{
- getMatchers().put(FIELD_INCOMING_WINDOW, m);
+ getMatchers().put(Field.INCOMING_WINDOW, m);
return this;
}
public FlowMatcher withNextOutgoingId(Matcher<?> m)
{
- getMatchers().put(FIELD_NEXT_OUTGOING_ID, m);
+ getMatchers().put(Field.NEXT_OUTGOING_ID, m);
return this;
}
public FlowMatcher withOutgoingWindow(Matcher<?> m)
{
- getMatchers().put(FIELD_OUTGOING_WINDOW, m);
+ getMatchers().put(Field.OUTGOING_WINDOW, m);
return this;
}
public FlowMatcher withHandle(Matcher<?> m)
{
- getMatchers().put(FIELD_HANDLE, m);
+ getMatchers().put(Field.HANDLE, m);
return this;
}
public FlowMatcher withDeliveryCount(Matcher<?> m)
{
- getMatchers().put(FIELD_DELIVERY_COUNT, m);
+ getMatchers().put(Field.DELIVERY_COUNT, m);
return this;
}
public FlowMatcher withLinkCredit(Matcher<?> m)
{
- getMatchers().put(FIELD_LINK_CREDIT, m);
+ getMatchers().put(Field.LINK_CREDIT, m);
return this;
}
public FlowMatcher withAvailable(Matcher<?> m)
{
- getMatchers().put(FIELD_AVAILABLE, m);
+ getMatchers().put(Field.AVAILABLE, m);
return this;
}
public FlowMatcher withDrain(Matcher<?> m)
{
- getMatchers().put(FIELD_DRAIN, m);
+ getMatchers().put(Field.DRAIN, m);
return this;
}
public FlowMatcher withEcho(Matcher<?> m)
{
- getMatchers().put(FIELD_ECHO, m);
+ getMatchers().put(Field.ECHO, m);
return this;
}
public FlowMatcher withProperties(Matcher<?> m)
{
- getMatchers().put(FIELD_PROPERTIES, m);
+ getMatchers().put(Field.PROPERTIES, m);
return this;
}
public Object getReceivedNextIncomingId()
{
- return getReceivedFields().get(FIELD_NEXT_INCOMING_ID);
+ return getReceivedFields().get(Field.NEXT_INCOMING_ID);
}
public Object getReceivedIncomingWindow()
{
- return getReceivedFields().get(FIELD_INCOMING_WINDOW);
+ return getReceivedFields().get(Field.INCOMING_WINDOW);
}
public Object getReceivedNextOutgoingId()
{
- return getReceivedFields().get(FIELD_NEXT_OUTGOING_ID);
+ return getReceivedFields().get(Field.NEXT_OUTGOING_ID);
}
public Object getReceivedOutgoingWindow()
{
- return getReceivedFields().get(FIELD_OUTGOING_WINDOW);
+ return getReceivedFields().get(Field.OUTGOING_WINDOW);
}
public Object getReceivedHandle()
{
- return getReceivedFields().get(FIELD_HANDLE);
+ return getReceivedFields().get(Field.HANDLE);
}
public Object getReceivedDeliveryCount()
{
- return getReceivedFields().get(FIELD_DELIVERY_COUNT);
+ return getReceivedFields().get(Field.DELIVERY_COUNT);
}
public Object getReceivedLinkCredit()
{
- return getReceivedFields().get(FIELD_LINK_CREDIT);
+ return getReceivedFields().get(Field.LINK_CREDIT);
}
public Object getReceivedAvailable()
{
- return getReceivedFields().get(FIELD_AVAILABLE);
+ return getReceivedFields().get(Field.AVAILABLE);
}
public Object getReceivedDrain()
{
- return getReceivedFields().get(FIELD_DRAIN);
+ return getReceivedFields().get(Field.DRAIN);
}
public Object getReceivedEcho()
{
- return getReceivedFields().get(FIELD_ECHO);
+ return getReceivedFields().get(Field.ECHO);
}
public Object getReceivedProperties()
{
- return getReceivedFields().get(FIELD_PROPERTIES);
+ return getReceivedFields().get(Field.PROPERTIES);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,17 +32,20 @@ import org.hamcrest.Matcher;
*/
public class OpenMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_CONTAINER_ID = 0;
- private static final int FIELD_HOSTNAME = 1;
- private static final int FIELD_MAX_FRAME_SIZE = 2;
- private static final int FIELD_CHANNEL_MAX = 3;
- private static final int FIELD_IDLE_TIME_OUT = 4;
- private static final int FIELD_OUTGOING_LOCALES = 5;
- private static final int FIELD_INCOMING_LOCALES = 6;
- private static final int FIELD_OFFERED_CAPABILITIES = 7;
- private static final int FIELD_DESIRED_CAPABILITIES = 8;
- private static final int FIELD_PROPERTIES = 9;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ CONTAINER_ID,
+ HOSTNAME,
+ MAX_FRAME_SIZE,
+ CHANNEL_MAX,
+ IDLE_TIME_OUT,
+ OUTGOING_LOCALES,
+ INCOMING_LOCALES,
+ OFFERED_CAPABILITIES,
+ DESIRED_CAPABILITIES,
+ PROPERTIES,
+ }
public OpenMatcher()
{
@@ -50,7 +53,7 @@ public class OpenMatcher extends FrameWi
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000010L),
Symbol.valueOf("amqp:open:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -63,113 +66,118 @@ public class OpenMatcher extends FrameWi
public OpenMatcher withContainerId(Matcher<?> m)
{
- getMatchers().put(FIELD_CONTAINER_ID, m);
+ getMatchers().put(Field.CONTAINER_ID, m);
return this;
}
public OpenMatcher withHostname(Matcher<?> m)
{
- getMatchers().put(FIELD_HOSTNAME, m);
+ getMatchers().put(Field.HOSTNAME, m);
return this;
}
public OpenMatcher withMaxFrameSize(Matcher<?> m)
{
- getMatchers().put(FIELD_MAX_FRAME_SIZE, m);
+ getMatchers().put(Field.MAX_FRAME_SIZE, m);
return this;
}
public OpenMatcher withChannelMax(Matcher<?> m)
{
- getMatchers().put(FIELD_CHANNEL_MAX, m);
+ getMatchers().put(Field.CHANNEL_MAX, m);
return this;
}
public OpenMatcher withIdleTimeOut(Matcher<?> m)
{
- getMatchers().put(FIELD_IDLE_TIME_OUT, m);
+ getMatchers().put(Field.IDLE_TIME_OUT, m);
return this;
}
public OpenMatcher withOutgoingLocales(Matcher<?> m)
{
- getMatchers().put(FIELD_OUTGOING_LOCALES, m);
+ getMatchers().put(Field.OUTGOING_LOCALES, m);
return this;
}
public OpenMatcher withIncomingLocales(Matcher<?> m)
{
- getMatchers().put(FIELD_INCOMING_LOCALES, m);
+ getMatchers().put(Field.INCOMING_LOCALES, m);
return this;
}
public OpenMatcher withOfferedCapabilities(Matcher<?> m)
{
- getMatchers().put(FIELD_OFFERED_CAPABILITIES, m);
+ getMatchers().put(Field.OFFERED_CAPABILITIES, m);
return this;
}
public OpenMatcher withDesiredCapabilities(Matcher<?> m)
{
- getMatchers().put(FIELD_DESIRED_CAPABILITIES, m);
+ getMatchers().put(Field.DESIRED_CAPABILITIES, m);
return this;
}
public OpenMatcher withProperties(Matcher<?> m)
{
- getMatchers().put(FIELD_PROPERTIES, m);
+ getMatchers().put(Field.PROPERTIES, m);
return this;
}
public Object getReceivedContainerId()
{
- return getReceivedFields().get(FIELD_CONTAINER_ID);
+ return getReceivedFields().get(Field.CONTAINER_ID);
}
public Object getReceivedHostname()
{
- return getReceivedFields().get(FIELD_HOSTNAME);
+ return getReceivedFields().get(Field.HOSTNAME);
}
public Object getReceivedMaxFrameSize()
{
- return getReceivedFields().get(FIELD_MAX_FRAME_SIZE);
+ return getReceivedFields().get(Field.MAX_FRAME_SIZE);
}
public Object getReceivedChannelMax()
{
- return getReceivedFields().get(FIELD_CHANNEL_MAX);
+ return getReceivedFields().get(Field.CHANNEL_MAX);
}
public Object getReceivedIdleTimeOut()
{
- return getReceivedFields().get(FIELD_IDLE_TIME_OUT);
+ return getReceivedFields().get(Field.IDLE_TIME_OUT);
}
public Object getReceivedOutgoingLocales()
{
- return getReceivedFields().get(FIELD_OUTGOING_LOCALES);
+ return getReceivedFields().get(Field.OUTGOING_LOCALES);
}
public Object getReceivedIncomingLocales()
{
- return getReceivedFields().get(FIELD_INCOMING_LOCALES);
+ return getReceivedFields().get(Field.INCOMING_LOCALES);
}
public Object getReceivedOfferedCapabilities()
{
- return getReceivedFields().get(FIELD_OFFERED_CAPABILITIES);
+ return getReceivedFields().get(Field.OFFERED_CAPABILITIES);
}
public Object getReceivedDesiredCapabilities()
{
- return getReceivedFields().get(FIELD_DESIRED_CAPABILITIES);
+ return getReceivedFields().get(Field.DESIRED_CAPABILITIES);
}
public Object getReceivedProperties()
{
- return getReceivedFields().get(FIELD_PROPERTIES);
+ return getReceivedFields().get(Field.PROPERTIES);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,8 +32,11 @@ import org.hamcrest.Matcher;
*/
public class SaslChallengeMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_CHALLENGE = 0;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ CHALLENGE,
+ }
public SaslChallengeMatcher()
{
@@ -41,7 +44,7 @@ public class SaslChallengeMatcher extend
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000042L),
Symbol.valueOf("amqp:sasl-challenge:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -54,14 +57,19 @@ public class SaslChallengeMatcher extend
public SaslChallengeMatcher withChallenge(Matcher<?> m)
{
- getMatchers().put(FIELD_CHALLENGE, m);
+ getMatchers().put(Field.CHALLENGE, m);
return this;
}
public Object getReceivedChallenge()
{
- return getReceivedFields().get(FIELD_CHALLENGE);
+ return getReceivedFields().get(Field.CHALLENGE);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,10 +32,13 @@ import org.hamcrest.Matcher;
*/
public class SaslInitMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_MECHANISM = 0;
- private static final int FIELD_INITIAL_RESPONSE = 1;
- private static final int FIELD_HOSTNAME = 2;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ MECHANISM,
+ INITIAL_RESPONSE,
+ HOSTNAME,
+ }
public SaslInitMatcher()
{
@@ -43,7 +46,7 @@ public class SaslInitMatcher extends Fra
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000041L),
Symbol.valueOf("amqp:sasl-init:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -56,36 +59,41 @@ public class SaslInitMatcher extends Fra
public SaslInitMatcher withMechanism(Matcher<?> m)
{
- getMatchers().put(FIELD_MECHANISM, m);
+ getMatchers().put(Field.MECHANISM, m);
return this;
}
public SaslInitMatcher withInitialResponse(Matcher<?> m)
{
- getMatchers().put(FIELD_INITIAL_RESPONSE, m);
+ getMatchers().put(Field.INITIAL_RESPONSE, m);
return this;
}
public SaslInitMatcher withHostname(Matcher<?> m)
{
- getMatchers().put(FIELD_HOSTNAME, m);
+ getMatchers().put(Field.HOSTNAME, m);
return this;
}
public Object getReceivedMechanism()
{
- return getReceivedFields().get(FIELD_MECHANISM);
+ return getReceivedFields().get(Field.MECHANISM);
}
public Object getReceivedInitialResponse()
{
- return getReceivedFields().get(FIELD_INITIAL_RESPONSE);
+ return getReceivedFields().get(Field.INITIAL_RESPONSE);
}
public Object getReceivedHostname()
{
- return getReceivedFields().get(FIELD_HOSTNAME);
+ return getReceivedFields().get(Field.HOSTNAME);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,8 +32,11 @@ import org.hamcrest.Matcher;
*/
public class SaslMechanismsMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_SASL_SERVER_MECHANISMS = 0;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ SASL_SERVER_MECHANISMS,
+ }
public SaslMechanismsMatcher()
{
@@ -41,7 +44,7 @@ public class SaslMechanismsMatcher exten
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000040L),
Symbol.valueOf("amqp:sasl-mechanisms:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -54,14 +57,19 @@ public class SaslMechanismsMatcher exten
public SaslMechanismsMatcher withSaslServerMechanisms(Matcher<?> m)
{
- getMatchers().put(FIELD_SASL_SERVER_MECHANISMS, m);
+ getMatchers().put(Field.SASL_SERVER_MECHANISMS, m);
return this;
}
public Object getReceivedSaslServerMechanisms()
{
- return getReceivedFields().get(FIELD_SASL_SERVER_MECHANISMS);
+ return getReceivedFields().get(Field.SASL_SERVER_MECHANISMS);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,9 +32,12 @@ import org.hamcrest.Matcher;
*/
public class SaslOutcomeMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_CODE = 0;
- private static final int FIELD_ADDITIONAL_DATA = 1;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ CODE,
+ ADDITIONAL_DATA,
+ }
public SaslOutcomeMatcher()
{
@@ -42,7 +45,7 @@ public class SaslOutcomeMatcher extends
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000044L),
Symbol.valueOf("amqp:sasl-outcome:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -55,25 +58,30 @@ public class SaslOutcomeMatcher extends
public SaslOutcomeMatcher withCode(Matcher<?> m)
{
- getMatchers().put(FIELD_CODE, m);
+ getMatchers().put(Field.CODE, m);
return this;
}
public SaslOutcomeMatcher withAdditionalData(Matcher<?> m)
{
- getMatchers().put(FIELD_ADDITIONAL_DATA, m);
+ getMatchers().put(Field.ADDITIONAL_DATA, m);
return this;
}
public Object getReceivedCode()
{
- return getReceivedFields().get(FIELD_CODE);
+ return getReceivedFields().get(Field.CODE);
}
public Object getReceivedAdditionalData()
{
- return getReceivedFields().get(FIELD_ADDITIONAL_DATA);
+ return getReceivedFields().get(Field.ADDITIONAL_DATA);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,8 +32,11 @@ import org.hamcrest.Matcher;
*/
public class SaslResponseMatcher extends FrameWithNoPayloadMatchingHandler
{
-
- private static final int FIELD_RESPONSE = 0;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ RESPONSE,
+ }
public SaslResponseMatcher()
{
@@ -41,7 +44,7 @@ public class SaslResponseMatcher extends
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000043L),
Symbol.valueOf("amqp:sasl-response:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -54,14 +57,19 @@ public class SaslResponseMatcher extends
public SaslResponseMatcher withResponse(Matcher<?> m)
{
- getMatchers().put(FIELD_RESPONSE, m);
+ getMatchers().put(Field.RESPONSE, m);
return this;
}
public Object getReceivedResponse()
{
- return getReceivedFields().get(FIELD_RESPONSE);
+ return getReceivedFields().get(Field.RESPONSE);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java Fri Sep 13 12:52:52 2013
@@ -32,18 +32,21 @@ import org.hamcrest.Matcher;
*/
public class TransferMatcher extends FrameWithPayloadMatchingHandler
{
-
- private static final int FIELD_HANDLE = 0;
- private static final int FIELD_DELIVERY_ID = 1;
- private static final int FIELD_DELIVERY_TAG = 2;
- private static final int FIELD_MESSAGE_FORMAT = 3;
- private static final int FIELD_SETTLED = 4;
- private static final int FIELD_MORE = 5;
- private static final int FIELD_RCV_SETTLE_MODE = 6;
- private static final int FIELD_STATE = 7;
- private static final int FIELD_RESUME = 8;
- private static final int FIELD_ABORTED = 9;
- private static final int FIELD_BATCHABLE = 10;
+ /** Note that the ordinals of the Field enums match the order specified in the spec */
+ public enum Field
+ {
+ HANDLE,
+ DELIVERY_ID,
+ DELIVERY_TAG,
+ MESSAGE_FORMAT,
+ SETTLED,
+ MORE,
+ RCV_SETTLE_MODE,
+ STATE,
+ RESUME,
+ ABORTED,
+ BATCHABLE,
+ }
public TransferMatcher()
{
@@ -51,7 +54,7 @@ public class TransferMatcher extends Fra
ANY_CHANNEL,
UnsignedLong.valueOf(0x0000000000000014L),
Symbol.valueOf("amqp:transfer:list"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -64,124 +67,129 @@ public class TransferMatcher extends Fra
public TransferMatcher withHandle(Matcher<?> m)
{
- getMatchers().put(FIELD_HANDLE, m);
+ getMatchers().put(Field.HANDLE, m);
return this;
}
public TransferMatcher withDeliveryId(Matcher<?> m)
{
- getMatchers().put(FIELD_DELIVERY_ID, m);
+ getMatchers().put(Field.DELIVERY_ID, m);
return this;
}
public TransferMatcher withDeliveryTag(Matcher<?> m)
{
- getMatchers().put(FIELD_DELIVERY_TAG, m);
+ getMatchers().put(Field.DELIVERY_TAG, m);
return this;
}
public TransferMatcher withMessageFormat(Matcher<?> m)
{
- getMatchers().put(FIELD_MESSAGE_FORMAT, m);
+ getMatchers().put(Field.MESSAGE_FORMAT, m);
return this;
}
public TransferMatcher withSettled(Matcher<?> m)
{
- getMatchers().put(FIELD_SETTLED, m);
+ getMatchers().put(Field.SETTLED, m);
return this;
}
public TransferMatcher withMore(Matcher<?> m)
{
- getMatchers().put(FIELD_MORE, m);
+ getMatchers().put(Field.MORE, m);
return this;
}
public TransferMatcher withRcvSettleMode(Matcher<?> m)
{
- getMatchers().put(FIELD_RCV_SETTLE_MODE, m);
+ getMatchers().put(Field.RCV_SETTLE_MODE, m);
return this;
}
public TransferMatcher withState(Matcher<?> m)
{
- getMatchers().put(FIELD_STATE, m);
+ getMatchers().put(Field.STATE, m);
return this;
}
public TransferMatcher withResume(Matcher<?> m)
{
- getMatchers().put(FIELD_RESUME, m);
+ getMatchers().put(Field.RESUME, m);
return this;
}
public TransferMatcher withAborted(Matcher<?> m)
{
- getMatchers().put(FIELD_ABORTED, m);
+ getMatchers().put(Field.ABORTED, m);
return this;
}
public TransferMatcher withBatchable(Matcher<?> m)
{
- getMatchers().put(FIELD_BATCHABLE, m);
+ getMatchers().put(Field.BATCHABLE, m);
return this;
}
public Object getReceivedHandle()
{
- return getReceivedFields().get(FIELD_HANDLE);
+ return getReceivedFields().get(Field.HANDLE);
}
public Object getReceivedDeliveryId()
{
- return getReceivedFields().get(FIELD_DELIVERY_ID);
+ return getReceivedFields().get(Field.DELIVERY_ID);
}
public Object getReceivedDeliveryTag()
{
- return getReceivedFields().get(FIELD_DELIVERY_TAG);
+ return getReceivedFields().get(Field.DELIVERY_TAG);
}
public Object getReceivedMessageFormat()
{
- return getReceivedFields().get(FIELD_MESSAGE_FORMAT);
+ return getReceivedFields().get(Field.MESSAGE_FORMAT);
}
public Object getReceivedSettled()
{
- return getReceivedFields().get(FIELD_SETTLED);
+ return getReceivedFields().get(Field.SETTLED);
}
public Object getReceivedMore()
{
- return getReceivedFields().get(FIELD_MORE);
+ return getReceivedFields().get(Field.MORE);
}
public Object getReceivedRcvSettleMode()
{
- return getReceivedFields().get(FIELD_RCV_SETTLE_MODE);
+ return getReceivedFields().get(Field.RCV_SETTLE_MODE);
}
public Object getReceivedState()
{
- return getReceivedFields().get(FIELD_STATE);
+ return getReceivedFields().get(Field.STATE);
}
public Object getReceivedResume()
{
- return getReceivedFields().get(FIELD_RESUME);
+ return getReceivedFields().get(Field.RESUME);
}
public Object getReceivedAborted()
{
- return getReceivedFields().get(FIELD_ABORTED);
+ return getReceivedFields().get(Field.ABORTED);
}
public Object getReceivedBatchable()
{
- return getReceivedFields().get(FIELD_BATCHABLE);
+ return getReceivedFields().get(Field.BATCHABLE);
}
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl Fri Sep 13 12:52:52 2013
@@ -72,8 +72,12 @@ import org.hamcrest.Matcher;
*/
public class <xsl:value-of select="$classname"/> extends <xsl:value-of select="$superclass"/>
{
+ /** Note that the ordinals of the Field enums match the order specified in the AMQP spec */
+ public enum Field
+ {
<xsl:for-each select="descendant::node()[name()='field']">
- private static final int FIELD_<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template> = <xsl:value-of select="count(preceding-sibling::node()[name()='field'])"/>;</xsl:for-each>
+<xsl:text> </xsl:text><xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template>,
+</xsl:for-each> }
public <xsl:value-of select="$classname"/>()
{
@@ -81,7 +85,7 @@ public class <xsl:value-of select="$clas
ANY_CHANNEL,
UnsignedLong.valueOf(<xsl:value-of select="concat(substring(descendant::node()[name()='descriptor']/@code,1,10),substring(descendant::node()[name()='descriptor']/@code,14))"/>L),
Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>"),
- new HashMap<Integer, Matcher<?>>(),
+ new HashMap<Enum<?>, Matcher<?>>(),
null);
}
@@ -94,16 +98,21 @@ public class <xsl:value-of select="$clas
<xsl:for-each select="descendant::node()[name()='field']">
public <xsl:value-of select="$classname"/> with<xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template>(Matcher<?> m)
{
- getMatchers().put(FIELD_<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template>, m);
+ getMatchers().put(Field.<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template>, m);
return this;
}
</xsl:for-each>
<xsl:for-each select="descendant::node()[name()='field']">
public Object getReceived<xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template>()
{
- return getReceivedFields().get(FIELD_<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template>);
+ return getReceivedFields().get(Field.<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template>);
}
</xsl:for-each>
+ @Override
+ protected Enum<?> getField(int fieldIndex)
+ {
+ return Field.values()[fieldIndex];
+ }
}
</exsl:document>
Modified: qpid/jms/trunk/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/resources/logging.properties?rev=1522905&r1=1522904&r2=1522905&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/resources/logging.properties (original)
+++ qpid/jms/trunk/src/test/resources/logging.properties Fri Sep 13 12:52:52 2013
@@ -24,6 +24,7 @@ java.util.logging.ConsoleHandler.formatt
# Note: the following line forces log statements to appear on a single line
# when running on JDK 1.7 and later
-java.util.logging.SimpleFormatter.format = %1$tF %1$tT.%tL %4$s %3$s %5$s%n
+java.util.logging.SimpleFormatter.format = %1$tF %1$tT.%tL %4$s %3$s %5$s %6$s%n
+org.apache.qpid.jms.test.testpeer.level = FINE
.level = INFO
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org