Author: robbie
Date: Mon Feb 6 00:13:30 2012
New Revision: 1240866
URL: http://svn.apache.org/viewvc?rev=1240866&view=rev
Log:
NO-JIRA: remove factory method only used by test
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java?rev=1240866&r1=1240865&r2=1240866&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
Mon Feb 6 00:13:30 2012
@@ -24,7 +24,6 @@ import org.apache.qpid.protocol.Protocol
import org.apache.qpid.protocol.ServerProtocolEngine;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.transport.network.NetworkConnection;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@@ -50,11 +49,6 @@ public class MultiVersionProtocolEngineF
_defaultSupportedReply = defaultSupportedReply;
}
- public ServerProtocolEngine newProtocolEngine(NetworkConnection network)
- {
- return new MultiVersionProtocolEngine(_appRegistry, _supported,
_defaultSupportedReply, ID_GENERATOR.getAndIncrement(), network);
- }
-
public ServerProtocolEngine newProtocolEngine()
{
return new MultiVersionProtocolEngine(_appRegistry, _supported,
_defaultSupportedReply, ID_GENERATOR.getAndIncrement());
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1240866&r1=1240865&r2=1240866&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
Mon Feb 6 00:13:30 2012
@@ -124,7 +124,7 @@ public class MultiVersionProtocolEngineF
new MultiVersionProtocolEngineFactory(versions, null);
//create a dummy to retrieve the 'current' ID number
- long previousId = factory.newProtocolEngine(new
TestNetworkConnection()).getConnectionId();
+ long previousId = factory.newProtocolEngine().getConnectionId();
//create a protocol engine and send the AMQP header for all supported
AMQP verisons,
//ensuring the ID assigned increases as expected
@@ -134,7 +134,9 @@ public class MultiVersionProtocolEngineF
byte[] header = getAmqpHeader(version);
assertNotNull("protocol header should not be null", header);
- ServerProtocolEngine engine = factory.newProtocolEngine(new
TestNetworkConnection());
+ ServerProtocolEngine engine = factory.newProtocolEngine();
+ TestNetworkConnection conn = new TestNetworkConnection();
+ engine.setNetworkConnection(conn, conn.getSender());
assertEquals("ID did not increment as expected", expectedID,
engine.getConnectionId());
//actually feed in the AMQP header for this protocol version, and
ensure the ID remains consistent
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
