You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/09/03 12:08:16 UTC
[qpid-broker-j] 03/04: QPID-8349: [Tests][AMQP 1.0] Remove
duplicate code
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 142026bd12017c89c64358d629640ba83f5b1f0f
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Tue Sep 3 10:54:07 2019 +0100
QPID-8349: [Tests][AMQP 1.0] Remove duplicate code
---
.../qpid/tests/protocol/v0_10/FrameTransport.java | 6 +-----
.../qpid/tests/protocol/v0_10/Interaction.java | 24 +---------------------
.../qpid/tests/protocol/v0_8/FrameTransport.java | 8 +-------
.../qpid/tests/protocol/v0_8/Interaction.java | 24 +---------------------
.../qpid/tests/protocol/v1_0/FrameTransport.java | 6 +-----
.../qpid/tests/protocol/v1_0/Interaction.java | 21 +------------------
.../qpid/tests/protocol/AbstractInteraction.java | 19 +++++++++++++++++
.../org/apache/qpid/tests/utils/BrokerAdmin.java | 5 +++++
8 files changed, 30 insertions(+), 83 deletions(-)
diff --git a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java
index 0989af7..a7ba4e3 100644
--- a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java
+++ b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameTransport.java
@@ -33,7 +33,7 @@ public class FrameTransport extends AbstractFrameTransport<Interaction>
public FrameTransport(final BrokerAdmin brokerAdmin)
{
- this(brokerAdmin, getPortType(brokerAdmin));
+ this(brokerAdmin, brokerAdmin.getPreferredPortType());
}
public FrameTransport(final BrokerAdmin brokerAdmin, final BrokerAdmin.PortType portType)
@@ -65,8 +65,4 @@ public class FrameTransport extends AbstractFrameTransport<Interaction>
return this;
}
- private static BrokerAdmin.PortType getPortType(final BrokerAdmin brokerAdmin)
- {
- return brokerAdmin.isAnonymousSupported() ? BrokerAdmin.PortType.ANONYMOUS_AMQP : BrokerAdmin.PortType.AMQP;
- }
}
diff --git a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
index 12379ce..5f7a842 100644
--- a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
+++ b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
@@ -23,7 +23,6 @@ package org.apache.qpid.tests.protocol.v0_10;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.nio.ByteBuffer;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,9 +38,7 @@ import org.apache.qpid.server.protocol.v0_10.transport.Header;
import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
import org.apache.qpid.server.protocol.v0_10.transport.Method;
import org.apache.qpid.server.protocol.v0_10.transport.SessionAttached;
-import org.apache.qpid.tests.protocol.AbstractFrameTransport;
import org.apache.qpid.tests.protocol.AbstractInteraction;
-import org.apache.qpid.tests.protocol.Response;
import org.apache.qpid.tests.utils.BrokerAdmin;
public class Interaction extends AbstractInteraction<Interaction>
@@ -58,7 +55,7 @@ public class Interaction extends AbstractInteraction<Interaction>
private int _channelId;
private TxInteraction _txInteraction;
- public Interaction(final AbstractFrameTransport frameTransport,
+ public Interaction(final FrameTransport frameTransport,
final BrokerAdmin brokerAdmin,
final BrokerAdmin.PortType portType)
{
@@ -273,23 +270,4 @@ public class Interaction extends AbstractInteraction<Interaction>
return _exchangeInteraction;
}
- public <T extends Method> T consume(final Class<T> expected,
- final Class<? extends Method>... ignore)
- throws Exception
- {
- final Class<? extends Method>[] expectedResponses = Arrays.copyOf(ignore, ignore.length + 1);
- expectedResponses[ignore.length] = expected;
-
- T completed = null;
- do
- {
- Response<?> response = consumeResponse(expectedResponses).getLatestResponse();
- if (expected.isAssignableFrom(response.getBody().getClass()))
- {
- completed = (T) response.getBody();
- }
- }
- while (completed == null);
- return completed;
- }
}
diff --git a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/FrameTransport.java b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/FrameTransport.java
index 54982fe..295f541 100644
--- a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/FrameTransport.java
+++ b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/FrameTransport.java
@@ -20,8 +20,6 @@
*/
package org.apache.qpid.tests.protocol.v0_8;
-import java.net.InetSocketAddress;
-
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.plugin.ProtocolEngineCreator;
import org.apache.qpid.server.plugin.QpidServiceLoader;
@@ -39,7 +37,7 @@ public class FrameTransport extends AbstractFrameTransport<Interaction>
public FrameTransport(final BrokerAdmin brokerAdmin)
{
- this(brokerAdmin, getPortType(brokerAdmin), Protocol.AMQP_0_9_1);
+ this(brokerAdmin, brokerAdmin.getPreferredPortType(), Protocol.AMQP_0_9_1);
}
public FrameTransport(final BrokerAdmin brokerAdmin, final BrokerAdmin.PortType portType)
@@ -114,8 +112,4 @@ public class FrameTransport extends AbstractFrameTransport<Interaction>
return protocolVersion;
}
- private static BrokerAdmin.PortType getPortType(final BrokerAdmin brokerAdmin)
- {
- return brokerAdmin.isAnonymousSupported() ? BrokerAdmin.PortType.ANONYMOUS_AMQP : BrokerAdmin.PortType.AMQP;
- }
}
diff --git a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/Interaction.java b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/Interaction.java
index 5e073ab..f980bb8 100644
--- a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/Interaction.java
+++ b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/Interaction.java
@@ -39,7 +39,6 @@ import org.apache.qpid.server.protocol.v0_8.transport.ConnectionTuneBody;
import org.apache.qpid.server.protocol.v0_8.transport.ContentBody;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager;
import org.apache.qpid.tests.protocol.AbstractInteraction;
-import org.apache.qpid.tests.protocol.Response;
import org.apache.qpid.tests.utils.BrokerAdmin;
public class Interaction extends AbstractInteraction<Interaction>
@@ -56,7 +55,7 @@ public class Interaction extends AbstractInteraction<Interaction>
private TxInteraction _txInteraction;
private ExchangeInteraction _exchangeInteraction;
- Interaction(final FrameTransport transport, final BrokerAdmin brokerAdmin, BrokerAdmin.PortType portType)
+ Interaction(final FrameTransport transport, final BrokerAdmin brokerAdmin, final BrokerAdmin.PortType portType)
{
super(transport);
_connectionInteraction = new ConnectionInteraction(this);
@@ -206,27 +205,6 @@ public class Interaction extends AbstractInteraction<Interaction>
return _exchangeInteraction;
}
- @SafeVarargs
- public final <T extends AMQBody> T consume(final Class<T> expected,
- final Class<? extends AMQBody>... ignore)
- throws Exception
- {
- final Class<? extends AMQBody>[] expectedResponses = Arrays.copyOf(ignore, ignore.length + 1);
- expectedResponses[ignore.length] = expected;
-
- T completed = null;
- do
- {
- Response<?> response = consumeResponse(expectedResponses).getLatestResponse();
- if (expected.isAssignableFrom(response.getBody().getClass()))
- {
- completed = (T) response.getBody();
- }
- }
- while (completed == null);
- return completed;
- }
-
public String getLatestResponseContentBodyAsString() throws Exception
{
ContentBody content = getLatestResponse(ContentBody.class);
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
index dd646d1..85f99d6 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
@@ -31,7 +31,7 @@ public class FrameTransport extends AbstractFrameTransport<Interaction>
public FrameTransport(final BrokerAdmin brokerAdmin)
{
- this(brokerAdmin, getPortType(brokerAdmin));
+ this(brokerAdmin, brokerAdmin.getPreferredPortType());
}
public FrameTransport(final BrokerAdmin brokerAdmin, final BrokerAdmin.PortType portType)
@@ -61,8 +61,4 @@ public class FrameTransport extends AbstractFrameTransport<Interaction>
return new Interaction(this, _brokerAdmin, _portType);
}
- private static BrokerAdmin.PortType getPortType(final BrokerAdmin brokerAdmin)
- {
- return brokerAdmin.isAnonymousSupported() ? BrokerAdmin.PortType.ANONYMOUS_AMQP : BrokerAdmin.PortType.AMQP;
- }
}
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
index c9614f6..13ce5bc 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
@@ -128,7 +128,7 @@ public class Interaction extends AbstractInteraction<Interaction>
private AtomicLong _coordinatorCredits = new AtomicLong();
private InteractionTransactionalState _transactionalState;
- Interaction(final FrameTransport frameTransport, BrokerAdmin brokerAdmin, BrokerAdmin.PortType portType)
+ Interaction(final FrameTransport frameTransport, final BrokerAdmin brokerAdmin, final BrokerAdmin.PortType portType)
{
super(frameTransport);
_brokerAdmin = brokerAdmin;
@@ -1287,25 +1287,6 @@ public class Interaction extends AbstractInteraction<Interaction>
return this;
}
- public <T> T consume(final Class<T> expected, final Class<?>... ignore)
- throws Exception
- {
- final Class<?>[] expectedResponses = Arrays.copyOf(ignore, ignore.length + 1);
- expectedResponses[ignore.length] = expected;
-
- T completed = null;
- do
- {
- Response<?> response = consumeResponse(expectedResponses).getLatestResponse();
- if (expected.isAssignableFrom(response.getBody().getClass()))
- {
- completed = (T) response.getBody();
- }
- }
- while (completed == null);
- return completed;
- }
-
@Override
protected Response<?> getNextResponse() throws Exception
{
diff --git a/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractInteraction.java b/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractInteraction.java
index 801033e..98b3b6f 100644
--- a/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractInteraction.java
+++ b/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractInteraction.java
@@ -73,6 +73,25 @@ public abstract class AbstractInteraction<I extends AbstractInteraction<I>>
_latestResponse == null ? null : _latestResponse.getBody()));
}
+ public <T> T consume(final Class<T> expected, final Class<?>... ignore)
+ throws Exception
+ {
+ final Class<?>[] expectedResponses = Arrays.copyOf(ignore, ignore.length + 1);
+ expectedResponses[ignore.length] = expected;
+
+ T completed = null;
+ do
+ {
+ Response<?> response = consumeResponse(expectedResponses).getLatestResponse();
+ if (expected.isAssignableFrom(response.getBody().getClass()))
+ {
+ completed = (T) response.getBody();
+ }
+ }
+ while (completed == null);
+ return completed;
+ }
+
protected Response<?> getNextResponse() throws Exception
{
return _transport.getNextResponse();
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
index e9695de..900738e 100644
--- a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
@@ -62,6 +62,11 @@ public interface BrokerAdmin extends Pluggable
String getKind();
+ default PortType getPreferredPortType()
+ {
+ return isAnonymousSupported() ? PortType.ANONYMOUS_AMQP : PortType.AMQP;
+ }
+
enum PortType
{
ANONYMOUS_AMQP,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org