You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/07/08 18:02:20 UTC
svn commit: r1689911 - in /qpid/java/trunk:
broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/
broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/
client/src/main/java/org/apache/qpid/client/...
Author: rgodfrey
Date: Wed Jul 8 16:02:20 2015
New Revision: 1689911
URL: http://svn.apache.org/r1689911
Log:
NO-JIRA : Fix the source so it will compile with -Werror enabled
Modified:
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1689911&r1=1689910&r2=1689911&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Wed Jul 8 16:02:20 2015
@@ -602,7 +602,7 @@ class ManagementNode implements MessageS
private InternalMessage createFailureResponse(final InternalMessage requestMessage,
final int statusCode,
final String stateDescription,
- String... params)
+ Object... params)
{
final InternalMessageHeader requestHeader = requestMessage.getMessageHeader();
final MutableMessageHeader responseHeader = new MutableMessageHeader();
Modified: qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java?rev=1689911&r1=1689910&r2=1689911&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java (original)
+++ qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java Wed Jul 8 16:02:20 2015
@@ -321,6 +321,7 @@ public class QueueMBean extends AMQManag
return alternateExchange == null ? null : alternateExchange.getName();
}
+ @Deprecated
public TabularData viewMessages(int fromIndex, int toIndex)
throws IOException, JMException
{
@@ -437,6 +438,7 @@ public class QueueMBean extends AMQManag
return visitor.getEntry();
}
+ @Deprecated
public void deleteMessageFromTop() throws IOException, JMException
{
VirtualHost vhost = _queue.getParent(VirtualHost.class);
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=1689911&r1=1689910&r2=1689911&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Wed Jul 8 16:02:20 2015
@@ -859,16 +859,6 @@ public class AMQProtocolHandler implemen
_failoverState= failoverState;
}
- public byte getProtocolMajorVersion()
- {
- return _protocolSession.getProtocolMajorVersion();
- }
-
- public byte getProtocolMinorVersion()
- {
- return _protocolSession.getProtocolMinorVersion();
- }
-
public MethodRegistry getMethodRegistry()
{
return _protocolSession.getMethodRegistry();
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java?rev=1689911&r1=1689910&r2=1689911&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java Wed Jul 8 16:02:20 2015
@@ -72,15 +72,13 @@ public class AMQProtocolSession implemen
private final AMQProtocolHandler _protocolHandler;
- private ConcurrentMap<Integer, AMQSession> _channelId2SessionMap = new ConcurrentHashMap<Integer, AMQSession>();
-
- private ConcurrentMap _closingChannels = new ConcurrentHashMap();
+ private ConcurrentMap<Integer,AMQSession<?,?>> _closingChannels = new ConcurrentHashMap<>();
/**
* Maps from a channel id to an unprocessed message. This is used to tie together the JmsDeliverBody (which arrives
* first) with the subsequent content header and content bodies.
*/
- private final ConcurrentMap<Integer, UnprocessedMessage> _channelId2UnprocessedMsgMap = new ConcurrentHashMap<Integer, UnprocessedMessage>();
+ private final ConcurrentMap<Integer, UnprocessedMessage> _channelId2UnprocessedMsgMap = new ConcurrentHashMap<>();
private final UnprocessedMessage[] _channelId2UnprocessedMsgArray = new UnprocessedMessage[16];
private int _queueId = 1;
@@ -196,8 +194,6 @@ public class AMQProtocolSession implemen
/**
* Callback invoked from the BasicDeliverMethodHandler when a message has been received.
*
- * @param message
- *
* @throws QpidException if this was not expected
*/
public void unprocessedMessageReceived(final int channelId, UnprocessedMessage message) throws QpidException
@@ -313,7 +309,7 @@ public class AMQProtocolSession implemen
*
* @param session the AMQSession being closed
*/
- public void closeSession(AMQSession session)
+ public void closeSession(AMQSession<?,?> session)
{
if (_logger.isDebugEnabled())
{
@@ -419,16 +415,6 @@ public class AMQProtocolSession implemen
_methodDispatcher = ClientMethodDispatcherImpl.newMethodDispatcher(pv, this);
}
- public byte getProtocolMinorVersion()
- {
- return _protocolVersion.getMinorVersion();
- }
-
- public byte getProtocolMajorVersion()
- {
- return _protocolVersion.getMajorVersion();
- }
-
public ProtocolVersion getProtocolVersion()
{
return _protocolVersion;
@@ -450,11 +436,6 @@ public class AMQProtocolSession implemen
session.setTicket(ticket);
}
- public void setMethodDispatcher(MethodDispatcher methodDispatcher)
- {
- _methodDispatcher = methodDispatcher;
- }
-
public void setFlowControl(final int channelId, final boolean active)
{
final AMQSession session = getSession(channelId);
@@ -492,43 +473,6 @@ public class AMQProtocolSession implemen
return _protocolHandler;
}
- /** Maps from the channel id to the AMQSession that it represents. */
- protected ConcurrentMap<Integer, AMQSession> getChannelId2SessionMap()
- {
- return _channelId2SessionMap;
- }
-
- protected void setChannelId2SessionMap(ConcurrentMap<Integer, AMQSession> channelId2SessionMap)
- {
- _channelId2SessionMap = channelId2SessionMap;
- }
-
- protected ConcurrentMap getClosingChannels()
- {
- return _closingChannels;
- }
-
- protected void setClosingChannels(ConcurrentMap closingChannels)
- {
- _closingChannels = closingChannels;
- }
-
- /** Counter to ensure unique queue names */
- protected int getQueueId()
- {
- return _queueId;
- }
-
- protected void setQueueId(int queueId)
- {
- _queueId = queueId;
- }
-
- protected Object getQueueIdLock()
- {
- return _queueIdLock;
- }
-
protected AMQConnection getConnection()
{
return _connection;
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java?rev=1689911&r1=1689910&r2=1689911&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java Wed Jul 8 16:02:20 2015
@@ -28,21 +28,5 @@ import org.apache.qpid.framing.ProtocolV
*/
public interface ProtocolVersionAware
{
- /**
- * @deprecated
- * Reports the AMQP minor version, that the implementer can handle.
- *
- * @return The AMQP minor version.
- */
- public byte getProtocolMinorVersion();
-
- /**
- * @deprecated
- * Reports the AMQP major version, that the implementer can handle.
- *
- * @return The AMQP major version.
- */
- public byte getProtocolMajorVersion();
-
- public ProtocolVersion getProtocolVersion();
+ ProtocolVersion getProtocolVersion();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org