You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ph...@apache.org on 2013/01/25 13:26:50 UTC
svn commit: r1438468 - in /qpid/proton/branches/jni-binding:
proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/
proton-j/proton-api/src/main/java/org/apache/qpid/proton/
proton-j/proton/src/main/java/org/apache...
Author: philharveyonline
Date: Fri Jan 25 12:26:49 2013
New Revision: 1438468
URL: http://svn.apache.org/viewvc?rev=1438468&view=rev
Log:
PROTON-192: reduce visibility of constructors to enforce use of factories, thereby abstracting away proton-j vs proton-c-via-JNI.
Modified:
qpid/proton/branches/jni-binding/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/ProtonFactoryLoader.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImplQuery.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/PlainTransportWrapper.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ByteHolder.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapper.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/FactoryTest.java
qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/SimpleTest.java
Modified: qpid/proton/branches/jni-binding/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java Fri Jan 25 12:26:49 2013
@@ -53,7 +53,7 @@ public class AmqpTransport extends Watch
final DispatchQueue queue;
final ConnectionImpl connection = new ConnectionImpl();
Transport hawtdispatchTransport;
- TransportImpl protonTransport;
+ Transport protonTransport;
Throwable failure;
CustomDispatchSource<Defer,LinkedList<Defer>> defers;
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/ProtonFactoryLoader.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/ProtonFactoryLoader.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/ProtonFactoryLoader.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/ProtonFactoryLoader.java Fri Jan 25 12:26:49 2013
@@ -26,14 +26,20 @@ import java.util.logging.Logger;
public class ProtonFactoryLoader<C>
{
private static final Logger LOGGER = Logger.getLogger(ProtonFactoryLoader.class.getName());
+ private Class<C> _factoryInterface;
- public C loadFactory(Class<C> factoryInterface)
+ public ProtonFactoryLoader(Class<C> factoryInterface)
{
- ServiceLoader<C> serviceLoader = ServiceLoader.load(factoryInterface);
+ _factoryInterface = factoryInterface;
+ }
+
+ public C loadFactory()
+ {
+ ServiceLoader<C> serviceLoader = ServiceLoader.load(_factoryInterface);
Iterator<C> serviceLoaderIterator = serviceLoader.iterator();
if(!serviceLoaderIterator.hasNext())
{
- throw new IllegalStateException("Can't find service loader for " + factoryInterface.getName());
+ throw new IllegalStateException("Can't find service loader for " + _factoryInterface.getName());
}
C factory = serviceLoaderIterator.next();
if(LOGGER.isLoggable(Level.FINE))
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Fri Jan 25 12:26:49 2013
@@ -55,7 +55,7 @@ public class ConnectionImpl extends Endp
private String _remoteContainer;
private String _remoteHostname;
- public ConnectionImpl()
+ ConnectionImpl()
{
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java Fri Jan 25 12:26:49 2013
@@ -57,7 +57,7 @@ public class DeliveryImpl implements Del
private boolean _done;
private int _offset;
- public DeliveryImpl(final byte[] tag, final LinkImpl link, DeliveryImpl previous)
+ DeliveryImpl(final byte[] tag, final LinkImpl link, DeliveryImpl previous)
{
_tag = tag;
_link = link;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImplQuery.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImplQuery.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImplQuery.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EndpointImplQuery.java Fri Jan 25 12:26:49 2013
@@ -29,7 +29,7 @@ class EndpointImplQuery<T extends Endpoi
private final EnumSet<EndpointState> _local;
private final EnumSet<EndpointState> _remote;
- public EndpointImplQuery(EnumSet<EndpointState> local, EnumSet<EndpointState> remote)
+ EndpointImplQuery(EnumSet<EndpointState> local, EnumSet<EndpointState> remote)
{
_local = local;
_remote = remote;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java Fri Jan 25 12:26:49 2013
@@ -56,7 +56,7 @@ public abstract class LinkImpl extends E
private boolean _drain;
- public LinkImpl(SessionImpl session, String name)
+ LinkImpl(SessionImpl session, String name)
{
_session = session;
_name = name;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/PlainTransportWrapper.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/PlainTransportWrapper.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/PlainTransportWrapper.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/PlainTransportWrapper.java Fri Jan 25 12:26:49 2013
@@ -25,7 +25,7 @@ public class PlainTransportWrapper imple
private final TransportOutput _outputProcessor;
private final TransportInput _inputProcessor;
- public PlainTransportWrapper(TransportOutput outputProcessor,
+ PlainTransportWrapper(TransportOutput outputProcessor,
TransportInput inputProcessor)
{
_outputProcessor = outputProcessor;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ReceiverImpl.java Fri Jan 25 12:26:49 2013
@@ -47,7 +47,7 @@ public class ReceiverImpl extends LinkIm
private int _unsentCredits;
- public ReceiverImpl(SessionImpl session, String name)
+ ReceiverImpl(SessionImpl session, String name)
{
super(session, name);
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java Fri Jan 25 12:26:49 2013
@@ -75,7 +75,7 @@ public class SaslImpl implements Sasl, S
private Role _role;
- public SaslImpl()
+ SaslImpl()
{
_frameParser = new SaslFrameParser(this);
AMQPDefinedTypes.registerAllTypes(_decoder,_encoder);
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SenderImpl.java Fri Jan 25 12:26:49 2013
@@ -31,7 +31,7 @@ public class SenderImpl extends LinkImp
private TransportSender _transportLink;
private boolean _drained;
- public SenderImpl(SessionImpl session, String name)
+ SenderImpl(SessionImpl session, String name)
{
super(session, name);
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java Fri Jan 25 12:26:49 2013
@@ -35,7 +35,7 @@ public class SessionImpl extends Endpoin
private LinkNode<SessionImpl> _node;
- public SessionImpl(ConnectionImpl connection)
+ SessionImpl(ConnectionImpl connection)
{
_connection = connection;
_node = _connection.addSessionEndpoint(this);
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java Fri Jan 25 12:26:49 2013
@@ -30,7 +30,7 @@ public class TransportDelivery
private TransportLink _transportLink;
private int _sessionSize = 1;
- public TransportDelivery(UnsignedInteger currentDeliveryId, DeliveryImpl delivery, TransportLink transportLink)
+ TransportDelivery(UnsignedInteger currentDeliveryId, DeliveryImpl delivery, TransportLink transportLink)
{
_deliveryId = currentDeliveryId;
_delivery = delivery;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java Fri Jan 25 12:26:49 2013
@@ -25,6 +25,10 @@ import org.apache.qpid.proton.engine.Tra
class TransportFactoryImpl extends TransportFactory
{
+ TransportFactoryImpl()
+ {
+ }
+
public Transport transport(Connection c)
{
TransportImpl t = new TransportImpl();
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java Fri Jan 25 12:26:49 2013
@@ -108,7 +108,7 @@ public class TransportImpl extends Endpo
_overflowBuffer.flip();
}
- public TransportImpl()
+ TransportImpl()
{
FrameParser frameParser = new FrameParser(this);
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java Fri Jan 25 12:26:49 2013
@@ -62,7 +62,7 @@ class TransportSession
private boolean _endReceived;
private boolean _beginSent;
- public TransportSession(SessionImpl session)
+ TransportSession(SessionImpl session)
{
_session = session;
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ByteHolder.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ByteHolder.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ByteHolder.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ByteHolder.java Fri Jan 25 12:26:49 2013
@@ -34,7 +34,7 @@ public class ByteHolder
private final ByteBuffer _bytes;
/** Creates me, initially in a writeable state */
- public ByteHolder(int capacity)
+ ByteHolder(int capacity)
{
_bytes = ByteBuffer.allocate(capacity);
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java Fri Jan 25 12:26:49 2013
@@ -31,7 +31,7 @@ class DefaultSslEngineFacade implements
{
private final SSLEngine _sslEngine;
- public DefaultSslEngineFacade(SSLEngine sslEngine)
+ DefaultSslEngineFacade(SSLEngine sslEngine)
{
_sslEngine = sslEngine;
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java Fri Jan 25 12:26:49 2013
@@ -34,6 +34,10 @@ public class SslDomainImpl implements Ss
private final SslEngineFacadeFactory _sslEngineFacadeFactory = new SslEngineFacadeFactory();
+ SslDomainImpl()
+ {
+ }
+
@Override
public void init(Mode mode)
{
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java Fri Jan 25 12:26:49 2013
@@ -71,6 +71,10 @@ public class SslEngineFacadeFactory
Security.addProvider(new BouncyCastleProvider());
}
+ SslEngineFacadeFactory()
+ {
+ }
+
/**
* This is a list of all anonymous cipher suites supported by Java 6, excluding those that
* use MD5. These are all supported by both Oracle's and IBM's Java 6 implementation.
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapper.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapper.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapper.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslHandshakeSniffingTransportWrapper.java Fri Jan 25 12:26:49 2013
@@ -30,7 +30,7 @@ public class SslHandshakeSniffingTranspo
private boolean _determinationMade = false;
private boolean _isSecure;
- public SslHandshakeSniffingTransportWrapper(
+ SslHandshakeSniffingTransportWrapper(
SslTransportWrapper secureTransportWrapper,
TransportWrapper plainTransportWrapper)
{
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java Fri Jan 25 12:26:49 2013
@@ -43,7 +43,7 @@ public class SslImpl implements Ssl
* enforce at the API level because {@link ProtonSslEngineProvider} is not part of the
* public Proton API.</p>
*/
- public SslImpl(SslDomain domain, SslPeerDetails peerDetails)
+ SslImpl(SslDomain domain, SslPeerDetails peerDetails)
{
_domain = domain;
_protonSslEngineProvider = (ProtonSslEngineProvider)domain;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java Fri Jan 25 12:26:49 2013
@@ -25,7 +25,7 @@ public class SslPeerDetailsImpl implemen
private final String _hostname;
private final int _port;
- public SslPeerDetailsImpl(String hostname, int port)
+ SslPeerDetailsImpl(String hostname, int port)
{
_hostname = hostname;
_port = port;
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java Fri Jan 25 12:26:49 2013
@@ -28,12 +28,15 @@ import java.util.Iterator;
import java.util.concurrent.TimeoutException;
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.Listener;
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.EngineFactory;
import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Receiver;
import org.apache.qpid.proton.engine.Sasl;
@@ -69,6 +72,7 @@ public class MessengerImpl implements Me
private int _distributed;
private TrackerQueue _incoming = new TrackerQueue();
private TrackerQueue _outgoing = new TrackerQueue();
+ private EngineFactory _engineFactory;
public MessengerImpl()
{
@@ -77,7 +81,20 @@ public class MessengerImpl implements Me
public MessengerImpl(String name)
{
+ this(name, defaultEngineFactory());
+ }
+
+
+ public MessengerImpl(String name, EngineFactory engineFactory)
+ {
_name = name;
+ _engineFactory = engineFactory;
+ }
+
+ private static EngineFactory defaultEngineFactory()
+ {
+ ProtonFactoryLoader<EngineFactory> engineFactoryLoader = new ProtonFactoryLoader<EngineFactory>(EngineFactory.class);
+ return engineFactoryLoader.loadFactory();
}
public void setTimeout(long timeInMillis)
@@ -368,7 +385,7 @@ public class MessengerImpl implements Me
for (Listener l = _driver.listener(); l != null; l = _driver.listener())
{
Connector c = l.accept();
- Connection connection = new ConnectionImpl();
+ Connection connection = _engineFactory.createConnection();
connection.setContainer(_name);
c.setConnection(connection);
//TODO: SSL and full SASL
@@ -699,7 +716,7 @@ public class MessengerImpl implements Me
{
Connector connector = _driver.createConnector(host, port, null);
_logger.log(Level.FINE, "Connecting to " + host + ":" + port);
- connection = new ConnectionImpl();
+ connection = _engineFactory.createConnection();
connection.setContainer(_name);
connection.setHostname(host);
connection.setContext(service);
Modified: qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/FactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/FactoryTest.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/FactoryTest.java (original)
+++ qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/FactoryTest.java Fri Jan 25 12:26:49 2013
@@ -32,7 +32,7 @@ public class FactoryTest
@Test
public void testMessageFactory()
{
- MessageFactory messageFactory = new ProtonFactoryLoader<MessageFactory>().loadFactory(MessageFactory.class);
+ MessageFactory messageFactory = new ProtonFactoryLoader<MessageFactory>(MessageFactory.class).loadFactory();
assertNotNull(messageFactory);
}
Modified: qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/SimpleTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/SimpleTest.java?rev=1438468&r1=1438467&r2=1438468&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/SimpleTest.java (original)
+++ qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/systemtests/SimpleTest.java Fri Jan 25 12:26:49 2013
@@ -33,7 +33,7 @@ public class SimpleTest
@Test
public void test()
{
- EngineFactory engineFactory = new ProtonFactoryLoader<EngineFactory>().loadFactory(EngineFactory.class);
+ EngineFactory engineFactory = new ProtonFactoryLoader<EngineFactory>(EngineFactory.class).loadFactory();
Connection connection1 = engineFactory.createConnection();
Connection connection2 = engineFactory.createConnection();;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org