You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/03/25 16:22:49 UTC
svn commit: r1736589 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/transport/
broker-core/src/main/java/org/apache/qpid/server/virtualhost/
broker-core/src/test/java/org/...
Author: lquack
Date: Fri Mar 25 15:22:49 2016
New Revision: 1736589
URL: http://svn.apache.org/viewvc?rev=1736589&view=rev
Log:
QPID-7162: [Java Broker] Remove Connection#getUnderlyingConnection()
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java Fri Mar 25 15:22:49 2016
@@ -121,6 +121,4 @@ public interface Connection<X extends Co
//children
Collection<Session> getSessions();
-
- AMQPConnection<?> getUnderlyingConnection();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java Fri Mar 25 15:22:49 2016
@@ -273,11 +273,6 @@ public abstract class AbstractAMQPConnec
_stopped = true;
}
- public final ProtocolEngine getProtocolEngine()
- {
- return this;
- }
-
@Override
public boolean isConnectionStopped()
{
@@ -716,12 +711,6 @@ public abstract class AbstractAMQPConnec
}
@Override
- public AMQPConnection<?> getUnderlyingConnection()
- {
- return this;
- }
-
- @Override
public void reserveOutboundMessageSpace(final long size)
{
_network.reserveOutboundMessageSpace(size);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Mar 25 15:22:49 2016
@@ -958,9 +958,9 @@ public abstract class AbstractVirtualHos
_logger.debug("Closing connection registry :" + _connections.size() + " connections.");
}
_acceptsConnections.set(false);
- for(Connection conn : _connections)
+ for(AMQPConnection<?> conn : _connections)
{
- conn.getUnderlyingConnection().stopConnection();
+ conn.stopConnection();
}
List<ListenableFuture<Void>> connectionCloseFutures = new ArrayList<>();
@@ -1062,9 +1062,9 @@ public abstract class AbstractVirtualHos
_messagesReceived.reset();
_dataReceived.reset();
- for (Connection<?> connection : _connections)
+ for (AMQPConnection<?> connection : _connections)
{
- connection.getUnderlyingConnection().resetStatistics();
+ connection.resetStatistics();
}
}
@@ -1091,9 +1091,9 @@ public abstract class AbstractVirtualHos
_blockingReasons.add(blockingType);
if(_blocked.compareAndSet(false,true))
{
- for(Connection<?> conn : _connections)
+ for(AMQPConnection<?> conn : _connections)
{
- conn.getUnderlyingConnection().block();
+ conn.block();
}
}
}
@@ -1108,9 +1108,9 @@ public abstract class AbstractVirtualHos
_blockingReasons.remove(blockingType);
if(_blockingReasons.isEmpty() && _blocked.compareAndSet(true,false))
{
- for(Connection<?> conn : _connections)
+ for(AMQPConnection<?> conn : _connections)
{
- conn.getUnderlyingConnection().unblock();
+ conn.unblock();
}
}
}
@@ -1242,10 +1242,10 @@ public abstract class AbstractVirtualHos
q.checkMessageStatus();
}
}
- for (Connection<?> connection : _connections)
+ for (AMQPConnection<?> connection : _connections)
{
_logger.debug("Checking for long running open transactions on connection {}", connection);
- for (AMQSessionModel<?> session : connection.getUnderlyingConnection().getSessionModels())
+ for (AMQSessionModel<?> session : connection.getSessionModels())
{
_logger.debug("Checking for long running open transactions on session {}", session);
session.checkTransactionStatus(getStoreTransactionOpenTimeoutWarn(),
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Fri Mar 25 15:22:49 2016
@@ -31,12 +31,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import java.security.AccessControlException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -241,7 +239,6 @@ public class VirtualHostTest extends Qpi
assertEquals("Unexpected number of connections before connection registered", 0, virtualHost.getConnectionCount());
AMQPConnection modelConnection = mock(AMQPConnection.class);
- when(modelConnection.getUnderlyingConnection()).thenReturn(connection);
when(modelConnection.closeAsync()).thenReturn(Futures.immediateFuture(null));
virtualHost.registerConnection(modelConnection);
@@ -270,7 +267,6 @@ public class VirtualHostTest extends Qpi
virtualHost.getConnectionCount());
AMQPConnection modelConnection = mock(AMQPConnection.class);
- when(modelConnection.getUnderlyingConnection()).thenReturn(connection);
when(modelConnection.closeAsync()).thenReturn(Futures.immediateFuture(null));
virtualHost.registerConnection(modelConnection);
@@ -399,7 +395,6 @@ public class VirtualHostTest extends Qpi
{
VirtualHost<?> host = createVirtualHost(getTestName());
AbstractAMQPConnection connection = mock(AbstractAMQPConnection.class);
- when(connection.getUnderlyingConnection()).thenReturn(connection);
host.registerConnection(connection);
((EventListener)host).event(Event.PERSISTENT_MESSAGE_SIZE_OVERFULL);
verify(connection).block();
@@ -519,7 +514,6 @@ public class VirtualHostTest extends Qpi
AMQPConnection<?> connection = mock(AMQPConnection.class);
final ListenableFuture<Void> listenableFuture = Futures.immediateFuture(null);
when(connection.closeAsync()).thenReturn(listenableFuture);
- when(connection.getUnderlyingConnection()).thenReturn((AMQPConnection) connection);
return connection;
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Fri Mar 25 15:22:49 2016
@@ -417,8 +417,7 @@ public class ServerConnectionDelegate ex
((ServerConnection)conn).getVirtualHost().getConnections().iterator();
while(connections.hasNext())
{
- final org.apache.qpid.server.model.Connection<?> modelConnnection = connections.next();
- final AMQPConnection<?> amqConnectionModel = modelConnnection.getUnderlyingConnection();
+ final AMQPConnection<?> amqConnectionModel = (AMQPConnection<?>) connections.next();
final String userName = amqConnectionModel.getAuthorizedPrincipal() == null
? ""
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java Fri Mar 25 15:22:49 2016
@@ -81,13 +81,12 @@ public class ServerSessionTest extends Q
AmqpPort port = createMockPort();
- final AMQPConnection_0_10 protocolEngine = mock(AMQPConnection_0_10.class);
- when(protocolEngine.getVirtualHost()).thenReturn((VirtualHost) _virtualHost);
- when(protocolEngine.getUnderlyingConnection()).thenReturn((AMQPConnection) protocolEngine);
+ final AMQPConnection_0_10 modelConnection = mock(AMQPConnection_0_10.class);
+ when(modelConnection.getVirtualHost()).thenReturn((VirtualHost) _virtualHost);
Subject subject = new Subject();
- when(protocolEngine.getSubject()).thenReturn(subject);
- when(protocolEngine.getMaxMessageSize()).thenReturn(1024l);
- ServerConnection connection = new ServerConnection(1, broker, port, Transport.TCP, protocolEngine);
+ when(modelConnection.getSubject()).thenReturn(subject);
+ when(modelConnection.getMaxMessageSize()).thenReturn(1024l);
+ ServerConnection connection = new ServerConnection(1, broker, port, Transport.TCP, modelConnection);
connection.setVirtualHost(_virtualHost);
final List<Method> invokedMethods = new ArrayList<>();
ServerSession session = new ServerSession(connection, new ServerSessionDelegate(),
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java?rev=1736589&r1=1736588&r2=1736589&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java Fri Mar 25 15:22:49 2016
@@ -174,7 +174,7 @@ public class ProtocolEngine_1_0_0Test ex
_protocolEngine_1_0_0.received(buf);
verify(_virtualHost).registerConnection(any(AMQPConnection.class));
- AuthenticatedPrincipal principal = (AuthenticatedPrincipal) _connection.getUnderlyingConnection().getAuthorizedPrincipal();
+ AuthenticatedPrincipal principal = (AuthenticatedPrincipal) _connection.getAuthorizedPrincipal();
assertNotNull(principal);
assertEquals(principal, new AuthenticatedPrincipal(AnonymousAuthenticationManager.ANONYMOUS_PRINCIPAL));
}
@@ -227,7 +227,7 @@ public class ProtocolEngine_1_0_0Test ex
_protocolEngine_1_0_0.received(buf);
verify(_virtualHost).registerConnection(any(AMQPConnection.class));
- AuthenticatedPrincipal authPrincipal = (AuthenticatedPrincipal) _connection.getUnderlyingConnection().getAuthorizedPrincipal();
+ AuthenticatedPrincipal authPrincipal = (AuthenticatedPrincipal) _connection.getAuthorizedPrincipal();
assertNotNull(authPrincipal);
assertEquals(authPrincipal, new AuthenticatedPrincipal(principal));
}
@@ -271,7 +271,7 @@ public class ProtocolEngine_1_0_0Test ex
_protocolEngine_1_0_0.received(buf);
verify(_virtualHost).registerConnection(any(AMQPConnection.class));
- AuthenticatedPrincipal principal = (AuthenticatedPrincipal) _connection.getUnderlyingConnection().getAuthorizedPrincipal();
+ AuthenticatedPrincipal principal = (AuthenticatedPrincipal) _connection.getAuthorizedPrincipal();
assertNotNull(principal);
assertEquals(principal, new AuthenticatedPrincipal(AnonymousAuthenticationManager.ANONYMOUS_PRINCIPAL));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org