Author: robbie
Date: Fri May 2 15:04:38 2014
New Revision: 1591940
URL: http://svn.apache.org/r1591940
Log:
NO-JIRA: fix compilation after recent updates to the Proton factories
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnection.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriver.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestFrameParser.java
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnection.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnection.java?rev=1591940&r1=1591939&r2=1591940&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnection.java
(original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnection.java
Fri May 2 15:04:38 2014
@@ -28,17 +28,14 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.qpid.proton.ProtonFactoryLoader;
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.EngineFactory;
import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Receiver;
import org.apache.qpid.proton.engine.Sasl;
import org.apache.qpid.proton.engine.Sender;
import org.apache.qpid.proton.engine.Session;
-import org.apache.qpid.proton.message.MessageFactory;
/**
* An AMQP connection.
@@ -50,7 +47,6 @@ import org.apache.qpid.proton.message.Me
* manner.
*
*/
-@SuppressWarnings("rawtypes")
public class AmqpConnection
{
private static Logger _logger =
Logger.getLogger("qpid.jms-client.connection");
@@ -61,9 +57,6 @@ public class AmqpConnection
*/
public static final long TIMEOUT =
Long.getLong("org.apache.qpid.jms.connection.timeout", 10_000L);
- private static final ProtonFactoryLoader protonFactoryLoader = new
ProtonFactoryLoader();
-
- private final EngineFactory _engineFactory;
private final Connection _connection;
private boolean _connected;
private boolean _authenticationError;
@@ -71,8 +64,6 @@ public class AmqpConnection
private SaslEngineFactory _saslEngineFactory = new SaslEngineFactoryImpl();
private SaslEngine _saslEngine;
- private MessageFactory _messageFactory = defaultMessageFactory();
-
private String _username;
private String _password;
@@ -92,8 +83,7 @@ public class AmqpConnection
{
_remoteHost = remoteHost;
_port = port;
- _engineFactory = defaultEngineFactory();
- _connection = _engineFactory.createConnection();
+ _connection = Connection.Factory.create();
_connection.setContainer(clientName);
_connection.setHostname(remoteHost);
@@ -370,24 +360,6 @@ public class AmqpConnection
return updated;
}
-
- MessageFactory getMessageFactory()
- {
- return _messageFactory;
- }
-
- @SuppressWarnings("unchecked")
- private static EngineFactory defaultEngineFactory()
- {
- return (EngineFactory)
protonFactoryLoader.loadFactory(EngineFactory.class);
- }
-
- @SuppressWarnings("unchecked")
- private static MessageFactory defaultMessageFactory()
- {
- return (MessageFactory)
protonFactoryLoader.loadFactory(MessageFactory.class);
- }
-
public synchronized void setSasl(Sasl sasl)
{
_sasl = sasl;
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriver.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriver.java?rev=1591940&r1=1591939&r2=1591940&view=diff
==============================================================================
---
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriver.java
(original)
+++
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpConnectionDriver.java
Fri May 2 15:04:38 2014
@@ -27,10 +27,8 @@ import java.util.concurrent.ConcurrentHa
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.qpid.proton.ProtonFactoryLoader;
import org.apache.qpid.proton.driver.Connector;
import org.apache.qpid.proton.driver.Driver;
-import org.apache.qpid.proton.driver.DriverFactory;
import org.apache.qpid.proton.engine.Sasl;
/**
@@ -72,8 +70,7 @@ public class AmqpConnectionDriver
public AmqpConnectionDriver() throws IOException
{
- DriverFactory driverFactory = new
ProtonFactoryLoader<DriverFactory>(DriverFactory.class).loadFactory();
- _driver = driverFactory.createDriver();
+ _driver = Driver.Factory.create();
}
public void registerConnection(AmqpConnection amqpConnection)
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java?rev=1591940&r1=1591939&r2=1591940&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java
(original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java
Fri May 2 15:04:38 2014
@@ -75,7 +75,7 @@ public class AmqpReceiver extends AmqpLi
}
}
- Message message =
getAmqpConnection().getMessageFactory().createMessage();
+ Message message = Message.Factory.create();
message.decode(_buffer, 0, total);
//TODO: dont create a new factory for every message
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestFrameParser.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestFrameParser.java?rev=1591940&r1=1591939&r2=1591940&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestFrameParser.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestFrameParser.java
Fri May 2 15:04:38 2014
@@ -23,11 +23,9 @@ import static org.apache.qpid.proton.eng
import java.nio.ByteBuffer;
import java.util.logging.Logger;
-import org.apache.qpid.proton.ProtonFactoryLoader;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.DescribedType;
import org.apache.qpid.proton.codec.Data;
-import org.apache.qpid.proton.codec.DataFactory;
import org.apache.qpid.proton.codec.DecodeException;
import org.apache.qpid.proton.engine.TransportResult;
import org.apache.qpid.proton.engine.TransportResultFactory;
@@ -65,8 +63,6 @@ class TestFrameParser
/** holds the current frame that is being parsed */
private ByteBuffer _frameBuffer;
- private final DataFactory _dataFactory = new
ProtonFactoryLoader<DataFactory>(DataFactory.class).loadFactory();
-
private TestAmqpPeer _peer;
/** PHTOD remove args? */
@@ -309,7 +305,7 @@ class TestFrameParser
if (frameBodySize > 0)
{
- Data data = _dataFactory.createData(frameBodySize);
+ Data data = Data.Factory.create();
data.decode(currentInput);
Data.DataType dataType = data.type();
if(dataType != Data.DataType.DESCRIBED)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
