You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/16 15:59:25 UTC
svn commit: r1783242 - in
/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10:
Connection.java ServerConnection.java ServerSession.java
Author: kwall
Date: Thu Feb 16 15:59:25 2017
New Revision: 1783242
URL: http://svn.apache.org/viewvc?rev=1783242&view=rev
Log:
QPID-7622: [Java Broker] [0-10] Remove redundant overrides and unused methods
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.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/Connection.java?rev=1783242&r1=1783241&r2=1783242&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java Thu Feb 16 15:59:25 2017
@@ -68,8 +68,6 @@ public class Connection extends Connecti
{
private static final Logger LOGGER = LoggerFactory.getLogger(Connection.class);
- private long _lastSendTime;
- private long _lastReadTime;
private NetworkConnection _networkConnection;
private FrameSizeObserver _frameSizeObserver;
@@ -153,7 +151,6 @@ public class Connection extends Connecti
public void received(ProtocolEvent event)
{
- _lastReadTime = System.currentTimeMillis();
if(LOGGER.isDebugEnabled())
{
LOGGER.debug("RECV: [{}] {}", this, String.valueOf(event));
@@ -163,7 +160,6 @@ public class Connection extends Connecti
public void send(ProtocolEvent event)
{
- _lastSendTime = System.currentTimeMillis();
if(LOGGER.isDebugEnabled())
{
LOGGER.debug("SEND: [{}] {}", this, String.valueOf(event));
@@ -321,6 +317,7 @@ public class Connection extends Connecti
}
}
+ @Override
public void closed()
{
if (state == OPEN)
@@ -351,6 +348,7 @@ public class Connection extends Connecti
}
}
+ @Override
public void close()
{
close(ConnectionCloseCode.NORMAL, null);
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.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/ServerConnection.java?rev=1783242&r1=1783241&r2=1783242&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Thu Feb 16 15:59:25 2017
@@ -22,7 +22,6 @@ package org.apache.qpid.server.protocol.
import static org.apache.qpid.server.protocol.v0_10.Connection.State.CLOSING;
-import java.net.SocketAddress;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.Principal;
@@ -30,8 +29,6 @@ import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.Set;
@@ -40,26 +37,25 @@ import java.util.concurrent.atomic.Atomi
import javax.security.auth.Subject;
-import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.protocol.ConnectionClosingTicker;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.session.AMQPSession;
import org.apache.qpid.server.transport.AMQPConnection;
-import org.apache.qpid.server.transport.ServerNetworkConnection;
-import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.server.transport.ConnectionClose;
import org.apache.qpid.server.transport.ConnectionCloseCode;
import org.apache.qpid.server.transport.ConnectionCloseOk;
import org.apache.qpid.server.transport.ExecutionErrorCode;
import org.apache.qpid.server.transport.ExecutionException;
import org.apache.qpid.server.transport.Method;
-import org.apache.qpid.server.transport.Option;
import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.ServerNetworkConnection;
+import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class ServerConnection extends Connection
{
@@ -282,14 +278,6 @@ public class ServerConnection extends Co
});
}
- @Override
- protected void sendConnectionClose(final ConnectionCloseCode replyCode,
- final String replyText,
- final Option... _options)
- {
- super.sendConnectionClose(replyCode, replyText, _options);
- }
-
protected void performDeleteTasks()
{
_amqpConnection.performDeleteTasks();
@@ -340,14 +328,6 @@ public class ServerConnection extends Co
return (Collection<ServerSession>) super.getChannels();
}
- /**
- * @return authorizedSubject
- */
- public Subject getAuthorizedSubject()
- {
- return _amqpConnection.getSubject();
- }
-
public void setAuthorizedSubject(final Subject authorizedSubject)
{
_amqpConnection.setSubject(authorizedSubject);
@@ -363,11 +343,6 @@ public class ServerConnection extends Co
return _connectionId;
}
- public String getRemoteAddressString()
- {
- return String.valueOf(getRemoteSocketAddress());
- }
-
@Override
public void closed()
{
@@ -412,53 +387,17 @@ public class ServerConnection extends Co
super.send(event);
}
- public String getClientId()
- {
- return getConnectionDelegate().getClientId();
- }
-
public String getRemoteContainerName()
{
return getConnectionDelegate().getClientId();
}
- public String getClientVersion()
- {
- return getConnectionDelegate().getClientVersion();
- }
-
- public String getClientProduct()
- {
- return getConnectionDelegate().getClientProduct();
- }
-
public long getSessionCountLimit()
{
return getChannelMax();
}
- public Principal getPeerPrincipal()
- {
- return getNetworkConnection().getPeerPrincipal();
- }
-
- @Override
- public void setRemoteAddress(SocketAddress remoteAddress)
- {
- super.setRemoteAddress(remoteAddress);
- }
-
- @Override
- public void setLocalAddress(SocketAddress localAddress)
- {
- super.setLocalAddress(localAddress);
- }
-
- public void doHeartBeat()
- {
- super.doHeartBeat();
- }
void addAsyncTask(final Action<? super ServerConnection> action)
{
@@ -597,49 +536,4 @@ public class ServerConnection extends Co
return _ignoreFutureInput;
}
- @Override
- public boolean isConnectionLost()
- {
- return super.isConnectionLost();
- }
-
- @Override
- protected void setLocale(String locale)
- {
- super.setLocale(locale);
- }
-
- @Override
- protected void sendConnectionSecure(byte[] challenge, Option ... options)
- {
- super.sendConnectionSecure(challenge, options);
- }
-
- @Override
- protected void sendConnectionTune(int channelMax, int maxFrameSize, int heartbeatMin, int heartbeatMax, Option ... options)
- {
- super.sendConnectionTune(channelMax, maxFrameSize, heartbeatMin, heartbeatMax, options);
- }
-
- @Override
- protected void setChannelMax(int max)
- {
- super.setChannelMax(max);
- }
-
- @Override
- protected void map(Session ssn, int channel)
- {
- super.map(ssn, channel);
- }
-
- @Override
- protected void sendConnectionStart(final Map<String, Object> clientProperties,
- final List<Object> mechanisms,
- final List<Object> locales,
- final Option... options)
- {
- super.sendConnectionStart(clientProperties, mechanisms, locales, options);
- }
-
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.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/ServerSession.java?rev=1783242&r1=1783241&r2=1783242&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Thu Feb 16 15:59:25 2017
@@ -485,11 +485,13 @@ public class ServerSession extends Sessi
new ServerTransaction.Action()
{
+ @Override
public void postCommit()
{
entry.delete();
}
+ @Override
public void onRollback()
{
// The client has acknowledge the message and therefore have seen it.
@@ -834,6 +836,7 @@ public class ServerSession extends Sessi
return getConnection().getReference();
}
+ @Override
public String toLogString()
{
long connectionId = super.getConnection() instanceof ServerConnection
@@ -1007,11 +1010,6 @@ public class ServerSession extends Sessi
}
}
- protected void setClose(boolean close)
- {
- super.setClose(close);
- }
-
public long getConsumerCount()
{
return _subscriptions.values().size();
@@ -1070,12 +1068,6 @@ public class ServerSession extends Sessi
return _modelObject.getMaxUncommittedInMemorySize();
}
- @Override
- protected void sendSessionAttached(final byte[] name, final Option... options)
- {
- super.sendSessionAttached(name, options);
- }
-
private class CheckCapacityAction implements Action<MessageInstance>
{
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org