This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new b0c2fffb16 QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#212)
b0c2fffb16 is described below
commit b0c2fffb16bac947eeafea9e6b5eb17756197f2a
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Mon Aug 7 13:00:11 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#212)
---
.../protocol/v0_10/AMQPConnection_0_10Impl.java | 2 +-
.../server/protocol/v0_10/ConsumerTarget_0_10.java | 58 ++++------
.../v0_10/MessageConverter_Internal_to_v0_10.java | 124 ++++++++++-----------
.../protocol/v0_10/MessageConverter_v0_10.java | 124 ++++++++++-----------
.../protocol/v0_10/MessageMetaData_0_10.java | 2 +-
.../server/protocol/v0_10/ServerConnection.java | 105 ++++++-----------
.../protocol/v0_10/ServerConnectionDelegate.java | 2 +-
.../qpid/server/protocol/v0_10/ServerSession.java | 45 ++------
.../protocol/v0_10/ServerSessionDelegate.java | 39 +++----
.../server/protocol/v0_10/transport/Acquired.java | 2 +-
.../protocol/v0_10/transport/ConnectionClose.java | 2 +-
.../v0_10/transport/ConnectionCloseOk.java | 8 +-
.../v0_10/transport/ConnectionHeartbeat.java | 7 +-
.../protocol/v0_10/transport/ConnectionOpen.java | 6 +-
.../protocol/v0_10/transport/ConnectionOpenOk.java | 7 +-
.../v0_10/transport/ConnectionRedirect.java | 6 +-
.../protocol/v0_10/transport/ConnectionSecure.java | 6 +-
.../v0_10/transport/ConnectionSecureOk.java | 6 +-
.../protocol/v0_10/transport/ConnectionStart.java | 6 +-
.../v0_10/transport/ConnectionStartOk.java | 6 +-
.../protocol/v0_10/transport/ConnectionTune.java | 6 +-
.../protocol/v0_10/transport/ConnectionTuneOk.java | 2 +-
.../v0_10/transport/DeliveryProperties.java | 2 +-
.../server/protocol/v0_10/transport/DtxCommit.java | 2 +-
.../server/protocol/v0_10/transport/DtxEnd.java | 2 +-
.../server/protocol/v0_10/transport/DtxForget.java | 2 +-
.../protocol/v0_10/transport/DtxGetTimeout.java | 2 +-
.../protocol/v0_10/transport/DtxPrepare.java | 2 +-
.../protocol/v0_10/transport/DtxRecover.java | 6 +-
.../protocol/v0_10/transport/DtxRollback.java | 2 +-
.../server/protocol/v0_10/transport/DtxSelect.java | 6 +-
.../protocol/v0_10/transport/DtxSetTimeout.java | 2 +-
.../server/protocol/v0_10/transport/DtxStart.java | 2 +-
.../protocol/v0_10/transport/ExchangeBind.java | 6 +-
.../protocol/v0_10/transport/ExchangeBound.java | 6 +-
.../v0_10/transport/ExchangeBoundResult.java | 5 +-
.../protocol/v0_10/transport/ExchangeDeclare.java | 6 +-
.../protocol/v0_10/transport/ExchangeDelete.java | 6 +-
.../protocol/v0_10/transport/ExchangeQuery.java | 6 +-
.../v0_10/transport/ExchangeQueryResult.java | 5 +-
.../protocol/v0_10/transport/ExchangeUnbind.java | 6 +-
.../v0_10/transport/ExecutionException.java | 6 +-
.../protocol/v0_10/transport/ExecutionResult.java | 6 +-
.../protocol/v0_10/transport/ExecutionSync.java | 8 +-
.../v0_10/transport/FragmentProperties.java | 6 +-
.../protocol/v0_10/transport/GetTimeoutResult.java | 6 +-
.../protocol/v0_10/transport/MessageAccept.java | 6 +-
.../protocol/v0_10/transport/MessageAcquire.java | 6 +-
.../protocol/v0_10/transport/MessageCancel.java | 6 +-
.../protocol/v0_10/transport/MessageFlow.java | 6 +-
.../protocol/v0_10/transport/MessageFlush.java | 6 +-
.../v0_10/transport/MessageProperties.java | 2 +-
.../protocol/v0_10/transport/MessageReject.java | 6 +-
.../protocol/v0_10/transport/MessageRelease.java | 6 +-
.../protocol/v0_10/transport/MessageResume.java | 6 +-
.../v0_10/transport/MessageResumeResult.java | 5 +-
.../v0_10/transport/MessageSetFlowMode.java | 6 +-
.../protocol/v0_10/transport/MessageStop.java | 6 +-
.../protocol/v0_10/transport/MessageSubscribe.java | 6 +-
.../protocol/v0_10/transport/MessageTransfer.java | 4 +-
.../protocol/v0_10/transport/QueueDeclare.java | 6 +-
.../protocol/v0_10/transport/QueueDelete.java | 6 +-
.../protocol/v0_10/transport/QueuePurge.java | 7 +-
.../protocol/v0_10/transport/QueueQuery.java | 7 +-
.../protocol/v0_10/transport/QueueQueryResult.java | 6 +-
.../server/protocol/v0_10/transport/Range.java | 9 +-
.../protocol/v0_10/transport/RangeSetImpl.java | 6 +-
.../protocol/v0_10/transport/RecoverResult.java | 7 +-
.../server/protocol/v0_10/transport/ReplyTo.java | 4 +-
.../protocol/v0_10/transport/SessionAttach.java | 6 +-
.../protocol/v0_10/transport/SessionAttached.java | 6 +-
.../v0_10/transport/SessionCommandFragment.java | 6 +-
.../v0_10/transport/SessionCommandPoint.java | 6 +-
.../protocol/v0_10/transport/SessionCompleted.java | 6 +-
.../protocol/v0_10/transport/SessionConfirmed.java | 6 +-
.../protocol/v0_10/transport/SessionDetach.java | 6 +-
.../protocol/v0_10/transport/SessionDetached.java | 6 +-
.../protocol/v0_10/transport/SessionExpected.java | 6 +-
.../protocol/v0_10/transport/SessionFlush.java | 6 +-
.../protocol/v0_10/transport/SessionGap.java | 6 +-
.../protocol/v0_10/transport/SessionHeader.java | 6 +-
.../v0_10/transport/SessionKnownCompleted.java | 6 +-
.../v0_10/transport/SessionRequestTimeout.java | 6 +-
.../protocol/v0_10/transport/SessionTimeout.java | 6 +-
.../server/protocol/v0_10/transport/TxCommit.java | 8 +-
.../protocol/v0_10/transport/TxRollback.java | 8 +-
.../server/protocol/v0_10/transport/TxSelect.java | 8 +-
.../server/protocol/v0_10/transport/XaResult.java | 10 +-
.../qpid/server/protocol/v0_10/transport/Xid.java | 5 +-
89 files changed, 296 insertions(+), 647 deletions(-)
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
index 6665097cd9..391e1cdcf5 100755
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
@@ -69,7 +69,7 @@ public class AMQPConnection_0_10Impl extends
AbstractAMQPConnection<AMQPConnecti
private ServerDisassembler _disassembler;
private final Set<AMQPSession<?,?>> _sessionsWithWork =
- Collections.newSetFromMap(new ConcurrentHashMap<AMQPSession<?,?>,
Boolean>());
+ Collections.newSetFromMap(new ConcurrentHashMap<>());
public AMQPConnection_0_10Impl(final Broker<?> broker,
ServerNetworkConnection network,
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
index 6a755ba444..45f9ea942a 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
@@ -48,12 +48,10 @@ import
org.apache.qpid.server.protocol.v0_10.transport.MessageCreditUnit;
import org.apache.qpid.server.protocol.v0_10.transport.MessageFlowMode;
import org.apache.qpid.server.protocol.v0_10.transport.MessageProperties;
import org.apache.qpid.server.protocol.v0_10.transport.MessageTransfer;
-import org.apache.qpid.server.protocol.v0_10.transport.Method;
import org.apache.qpid.server.protocol.v0_10.transport.Option;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.GZIPUtils;
import org.apache.qpid.server.util.StateChangeListener;
@@ -75,25 +73,26 @@ public class ConsumerTarget_0_10 extends
AbstractConsumerTarget<ConsumerTarget_0
private volatile int _deferredMessageCredit;
private volatile long _deferredSizeCredit;
- private final StateChangeListener<MessageInstance, EntryState>
_unacknowledgedMessageListener = new StateChangeListener<MessageInstance,
EntryState>()
- {
-
- @Override
- public void stateChanged(MessageInstance entry, EntryState oldState,
EntryState newState)
- {
- if (isConsumerAcquiredStateForThis(oldState) &&
!isConsumerAcquiredStateForThis(newState))
+ private final StateChangeListener<MessageInstance, EntryState>
_unacknowledgedMessageListener =
+ new StateChangeListener<>()
{
- removeUnacknowledgedMessage(entry);
- entry.removeStateChangeListener(this);
- }
- }
- private boolean isConsumerAcquiredStateForThis(EntryState state)
- {
- return state instanceof ConsumerAcquiredState
- && ((ConsumerAcquiredState)
state).getConsumer().getTarget() == ConsumerTarget_0_10.this;
- }
- };
+ @Override
+ public void stateChanged(MessageInstance entry, EntryState
oldState, EntryState newState)
+ {
+ if (isConsumerAcquiredStateForThis(oldState) &&
!isConsumerAcquiredStateForThis(newState))
+ {
+ removeUnacknowledgedMessage(entry);
+ entry.removeStateChangeListener(this);
+ }
+ }
+
+ private boolean isConsumerAcquiredStateForThis(EntryState
state)
+ {
+ return state instanceof ConsumerAcquiredState
+ && ((ConsumerAcquiredState)
state).getConsumer().getTarget() == ConsumerTarget_0_10.this;
+ }
+ };
public ConsumerTarget_0_10(ServerSession session,
String name,
@@ -293,14 +292,7 @@ public class ConsumerTarget_0_10 extends
AbstractConsumerTarget<ConsumerTarget_0
else if(_flowMode == MessageFlowMode.WINDOW)
{
final long messageSize = entry.getMessage().getSize();
- xfr.setCompletionListener(new Method.CompletionListener()
- {
- @Override
- public void onComplete(Method
method)
- {
- deferredAddCredit(1,
messageSize);
- }
- });
+ xfr.setCompletionListener(method -> deferredAddCredit(1,
messageSize));
}
@@ -429,16 +421,8 @@ public class ConsumerTarget_0_10 extends
AbstractConsumerTarget<ConsumerTarget_0
int requeues = 0;
if (entry.makeAcquisitionUnstealable(consumer))
{
- requeues = entry.routeToAlternate(new Action<MessageInstance>()
- {
- @Override
- public void performAction(final MessageInstance requeueEntry)
- {
-
getEventLogger().message(ChannelMessages.DEADLETTERMSG(msg.getMessageNumber(),
-
requeueEntry.getOwningResource()
-
.getName()));
- }
- }, null, null);
+ requeues = entry.routeToAlternate(requeueEntry ->
+
getEventLogger().message(ChannelMessages.DEADLETTERMSG(msg.getMessageNumber(),
requeueEntry.getOwningResource().getName())), null, null);
}
if (requeues == 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
index 5a27e8946c..588a2f0d2f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
@@ -90,68 +90,68 @@ public class MessageConverter_Internal_to_v0_10 implements
MessageConverter<Inte
convertMetaData(serverMsg, addressSpace, mimeType,
messageContent.length);
final int metadataSize = messageMetaData_0_10.getStorableSize();
- return new StoredMessage<MessageMetaData_0_10>()
- {
- @Override
- public MessageMetaData_0_10 getMetaData()
- {
- return messageMetaData_0_10;
- }
-
- @Override
- public long getMessageNumber()
- {
- return serverMsg.getMessageNumber();
- }
-
- @Override
- public QpidByteBuffer getContent(final int offset, final
int length)
- {
- return QpidByteBuffer.wrap(messageContent, offset,
length);
- }
-
- @Override
- public int getContentSize()
- {
- return messageContent.length;
- }
-
- @Override
- public int getMetadataSize()
- {
- return metadataSize;
- }
-
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean isInContentInMemory()
- {
- return true;
- }
-
- @Override
- public long getInMemorySize()
- {
- return getContentSize() + getMetadataSize();
- }
-
- @Override
- public boolean flowToDisk()
- {
- return false;
- }
-
- @Override
- public void reallocate()
- {
-
- }
- };
+ return new StoredMessage<>()
+ {
+ @Override
+ public MessageMetaData_0_10 getMetaData()
+ {
+ return messageMetaData_0_10;
+ }
+
+ @Override
+ public long getMessageNumber()
+ {
+ return serverMsg.getMessageNumber();
+ }
+
+ @Override
+ public QpidByteBuffer getContent(final int offset, final int
length)
+ {
+ return QpidByteBuffer.wrap(messageContent, offset, length);
+ }
+
+ @Override
+ public int getContentSize()
+ {
+ return messageContent.length;
+ }
+
+ @Override
+ public int getMetadataSize()
+ {
+ return metadataSize;
+ }
+
+ @Override
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isInContentInMemory()
+ {
+ return true;
+ }
+
+ @Override
+ public long getInMemorySize()
+ {
+ return getContentSize() + getMetadataSize();
+ }
+
+ @Override
+ public boolean flowToDisk()
+ {
+ return false;
+ }
+
+ @Override
+ public void reallocate()
+ {
+
+ }
+ };
}
private String improveMimeType(final InternalMessage serverMsg, String
mimeType)
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
index 10e76bd023..c2cdfa433d 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
@@ -66,68 +66,68 @@ public class MessageConverter_v0_10 implements
MessageConverter<ServerMessage, M
final MessageMetaData_0_10 messageMetaData_0_10 =
convertMetaData(serverMsg);
final int metadataSize = messageMetaData_0_10.getStorableSize();
- return new StoredMessage<MessageMetaData_0_10>()
- {
- @Override
- public MessageMetaData_0_10 getMetaData()
- {
- return messageMetaData_0_10;
- }
-
- @Override
- public long getMessageNumber()
- {
- return serverMsg.getMessageNumber();
- }
-
- @Override
- public QpidByteBuffer getContent(final int offset, final
int length)
- {
- return serverMsg.getContent(offset, length);
- }
-
- @Override
- public int getContentSize()
- {
- return messageMetaData_0_10.getContentSize();
- }
-
- @Override
- public int getMetadataSize()
- {
- return metadataSize;
- }
-
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean isInContentInMemory()
- {
- return true;
- }
-
- @Override
- public long getInMemorySize()
- {
- return getContentSize() + getMetadataSize();
- }
-
- @Override
- public boolean flowToDisk()
- {
- return false;
- }
-
- @Override
- public void reallocate()
- {
-
- }
- };
+ return new StoredMessage<>()
+ {
+ @Override
+ public MessageMetaData_0_10 getMetaData()
+ {
+ return messageMetaData_0_10;
+ }
+
+ @Override
+ public long getMessageNumber()
+ {
+ return serverMsg.getMessageNumber();
+ }
+
+ @Override
+ public QpidByteBuffer getContent(final int offset, final int
length)
+ {
+ return serverMsg.getContent(offset, length);
+ }
+
+ @Override
+ public int getContentSize()
+ {
+ return messageMetaData_0_10.getContentSize();
+ }
+
+ @Override
+ public int getMetadataSize()
+ {
+ return metadataSize;
+ }
+
+ @Override
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isInContentInMemory()
+ {
+ return true;
+ }
+
+ @Override
+ public long getInMemorySize()
+ {
+ return getContentSize() + getMetadataSize();
+ }
+
+ @Override
+ public boolean flowToDisk()
+ {
+ return false;
+ }
+
+ @Override
+ public void reallocate()
+ {
+
+ }
+ };
}
private MessageMetaData_0_10 convertMetaData(ServerMessage serverMsg)
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
index 7c67767e12..b5c8beaea3 100755
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
@@ -290,7 +290,7 @@ public class MessageMetaData_0_10 implements
StorableMessageMetaData
{
if(otherProps == null)
{
- otherProps = new ArrayList<Struct>();
+ otherProps = new ArrayList<>();
}
otherProps.add(struct);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
index a2d3bbd98f..fcb0d62ebf 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
@@ -83,8 +83,8 @@ public class ServerConnection extends ConnectionInvoker
private final Object _reference = new Object();
private final AmqpPort<?> _port;
private final AtomicLong _lastIoTime = new AtomicLong();
- final private Map<Binary,ServerSession> sessions = new
HashMap<Binary,ServerSession>();
- final private Map<Integer,ServerSession> channels = new
ConcurrentHashMap<Integer,ServerSession>();
+ final private Map<Binary,ServerSession> sessions = new HashMap<>();
+ final private Map<Integer,ServerSession> channels = new
ConcurrentHashMap<>();
final private Object lock = new Object();
private final AtomicBoolean connectionLost = new AtomicBoolean(false);
private boolean _blocking;
@@ -221,30 +221,25 @@ public class ServerConnection extends ConnectionInvoker
default:
cause = ErrorCodes.INTERNAL_ERROR;
}
- addAsyncTask(new Action<ServerConnection>()
+ addAsyncTask(conn ->
{
-
- @Override
- public void performAction(final ServerConnection conn)
+ if(!session.isClosing())
{
- if(!session.isClosing())
+ ExecutionException ex = new ExecutionException();
+ ExecutionErrorCode code = ExecutionErrorCode.INTERNAL_ERROR;
+ try
{
- ExecutionException ex = new ExecutionException();
- ExecutionErrorCode code =
ExecutionErrorCode.INTERNAL_ERROR;
- try
- {
- code = ExecutionErrorCode.get(cause);
- }
- catch (IllegalArgumentException iae)
- {
- // Ignore, already set to INTERNAL_ERROR
- }
- ex.setErrorCode(code);
- ex.setDescription(message);
- session.invoke(ex);
-
- session.close(cause, message);
+ code = ExecutionErrorCode.get(cause);
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // Ignore, already set to INTERNAL_ERROR
}
+ ex.setErrorCode(code);
+ ex.setDescription(message);
+ session.invoke(ex);
+
+ session.close(cause, message);
}
});
@@ -294,18 +289,14 @@ public class ServerConnection extends ConnectionInvoker
void sendConnectionCloseAsync(final ConnectionCloseCode replyCode, final
String message)
{
- addAsyncTask(new Action<ServerConnection>()
+ addAsyncTask(object ->
{
- @Override
- public void performAction(final ServerConnection object)
+ if(!isClosing())
{
- if(!isClosing())
- {
- markAllSessionsClosed();
+ markAllSessionsClosed();
- setState(CLOSING);
- sendConnectionClose(replyCode, message);
- }
+ setState(CLOSING);
+ sendConnectionClose(replyCode, message);
}
});
}
@@ -391,7 +382,7 @@ public class ServerConnection extends ConnectionInvoker
synchronized (lock)
{
- List<ServerSession> values = new
ArrayList<ServerSession>(channels.values());
+ List<ServerSession> values = new
ArrayList<>(channels.values());
for (ServerSession ssn : values)
{
ssn.closed();
@@ -721,15 +712,11 @@ public class ServerConnection extends ConnectionInvoker
else
{
final FrameSizeObserver currentObserver = _frameSizeObserver;
- _frameSizeObserver = new FrameSizeObserver()
- {
- @Override
- public void setMaxFrameSize(final int
frameSize)
- {
-
currentObserver.setMaxFrameSize(frameSize);
-
frameSizeObserver.setMaxFrameSize(frameSize);
- }
- };
+ _frameSizeObserver = frameSize ->
+ {
+ currentObserver.setMaxFrameSize(frameSize);
+ frameSizeObserver.setMaxFrameSize(frameSize);
+ };
}
}
@@ -797,26 +784,15 @@ public class ServerConnection extends ConnectionInvoker
final Action<? super ServerConnection> asyncAction =
_asyncTaskList.poll();
if(asyncAction != null)
{
- return new Runnable()
- {
- @Override
- public void run()
- {
-
asyncAction.performAction(ServerConnection.this);
- }
- };
+ return () ->
asyncAction.performAction(ServerConnection.this);
}
else
{
// in case the connection was marked as closing
between a call to hasNext() and
// a subsequent call to next()
- return new Runnable()
+ return () ->
{
- @Override
- public void run()
- {
- }
};
}
}
@@ -827,16 +803,12 @@ public class ServerConnection extends ConnectionInvoker
_sessionIterator = _sessionsWithPending.iterator();
}
final AMQPSession<?,?> session = _sessionIterator.next();
- return new Runnable()
+ return () ->
{
- @Override
- public void run()
+ _sessionIterator.remove();
+ if (session.processPending())
{
- _sessionIterator.remove();
- if (session.processPending())
- {
- _sessionsWithPending.add(session);
- }
+ _sessionsWithPending.add(session);
}
};
}
@@ -844,14 +816,7 @@ public class ServerConnection extends ConnectionInvoker
else if(!_asyncTaskList.isEmpty())
{
final Action<? super ServerConnection> asyncAction =
_asyncTaskList.poll();
- return new Runnable()
- {
- @Override
- public void run()
- {
- asyncAction.performAction(ServerConnection.this);
- }
- };
+ return () -> asyncAction.performAction(ServerConnection.this);
}
else
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
index f90cab25cc..e32f88f604 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
@@ -261,7 +261,7 @@ public class ServerConnectionDelegate extends
MethodDelegate<ServerConnection> i
}
else
{
- sconn.invoke(new ConnectionRedirect(redirectHost, new
ArrayList<Object>()));
+ sconn.invoke(new ConnectionRedirect(redirectHost, new
ArrayList<>()));
}
return;
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
index 919849a1f6..e77738b5ca 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
@@ -118,8 +118,8 @@ public class ServerSession extends SessionInvoker
private final int commandLimit =
Integer.getInteger("qpid.session.command_limit", 64 * 1024);
private final Object commandsLock = new Object();
private final Object stateLock = new Object();
- private final Map<String, ConsumerTarget_0_10> _subscriptions = new
ConcurrentHashMap<String, ConsumerTarget_0_10>();
- private final AtomicReference<LogMessage> _forcedCloseLogMessage = new
AtomicReference<LogMessage>();
+ private final Map<String, ConsumerTarget_0_10> _subscriptions = new
ConcurrentHashMap<>();
+ private final AtomicReference<LogMessage> _forcedCloseLogMessage = new
AtomicReference<>();
private final long _blockingTimeout;
private final ServerConnection connection;
private final Binary name;
@@ -735,7 +735,7 @@ public class ServerSession extends SessionInvoker
synchronized (commandsLock)
{
int command = commandsOut;
- ResultFuture<T> future = new ResultFuture<T>(klass);
+ ResultFuture<T> future = new ResultFuture<>(klass);
synchronized (results)
{
results.put(command, future);
@@ -895,14 +895,10 @@ public class ServerSession extends SessionInvoker
}
else
{
- runAsSubject(new PrivilegedAction<Void>() {
-
- @Override
- public Void run()
- {
- setState(state);
- return null;
- }
+ runAsSubject(() ->
+ {
+ setState(state);
+ return null;
});
}
@@ -991,39 +987,18 @@ public class ServerSession extends SessionInvoker
public void accept(RangeSet ranges)
{
- dispositionChange(ranges, new MessageDispositionAction()
- {
- @Override
- public void performAction(MessageDispositionChangeListener
listener)
- {
- listener.onAccept();
- }
- });
+ dispositionChange(ranges, MessageDispositionChangeListener::onAccept);
}
public void release(RangeSet ranges, final boolean setRedelivered)
{
- dispositionChange(ranges, new MessageDispositionAction()
- {
- @Override
- public void
performAction(MessageDispositionChangeListener listener)
- {
-
listener.onRelease(setRedelivered, false);
- }
- });
+ dispositionChange(ranges, listener ->
listener.onRelease(setRedelivered, false));
}
public void reject(RangeSet ranges)
{
- dispositionChange(ranges, new MessageDispositionAction()
- {
- @Override
- public void
performAction(MessageDispositionChangeListener listener)
- {
- listener.onReject();
- }
- });
+ dispositionChange(ranges, MessageDispositionChangeListener::onReject);
}
public RangeSet acquire(RangeSet transfers)
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 2da686c829..ab264e85a2 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -24,7 +24,6 @@ import java.nio.charset.StandardCharsets;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -476,27 +475,23 @@ public class ServerSessionDelegate extends
MethodDelegate<ServerSession> impleme
try
{
- final InstanceProperties instanceProperties = new
InstanceProperties()
+ final InstanceProperties instanceProperties = prop ->
{
- @Override
- public Object getProperty(final Property prop)
+ switch (prop)
{
- switch (prop)
- {
- case EXPIRATION:
- return message.getExpiration();
- case IMMEDIATE:
- return message.isImmediate();
- case MANDATORY:
- return (delvProps == null ||
!delvProps.getDiscardUnroutable())
- && xfr.getAcceptMode() ==
MessageAcceptMode.EXPLICIT;
- case PERSISTENT:
- return message.isPersistent();
- case REDELIVERED:
- return delvProps.getRedelivered();
- }
- return null;
+ case EXPIRATION:
+ return message.getExpiration();
+ case IMMEDIATE:
+ return message.isImmediate();
+ case MANDATORY:
+ return (delvProps == null ||
!delvProps.getDiscardUnroutable())
+ && xfr.getAcceptMode() ==
MessageAcceptMode.EXPLICIT;
+ case PERSISTENT:
+ return message.isPersistent();
+ case REDELIVERED:
+ return delvProps.getRedelivered();
}
+ return null;
};
RoutingResult<MessageTransferMessage> routingResult =
ssn.enqueue(message, instanceProperties, destination);
@@ -921,7 +916,7 @@ public class ServerSessionDelegate extends
MethodDelegate<ServerSession> impleme
try
{
- Map<String,Object> attributes = new HashMap<String,
Object>();
+ Map<String,Object> attributes = new HashMap<>();
if(method.hasArguments())
{
attributes.putAll(method.getArguments());
@@ -936,7 +931,7 @@ public class ServerSessionDelegate extends
MethodDelegate<ServerSession> impleme
validateAlternateExchangeIsNotQueue(addressSpace,
alternateExchangeName);
attributes.put(org.apache.qpid.server.model.Exchange.ALTERNATE_BINDING,
-
Collections.singletonMap(AlternateBinding.DESTINATION, alternateExchangeName));
+ Map.of(AlternateBinding.DESTINATION,
alternateExchangeName));
}
validateAndSanitizeExchangeDeclareArguments(attributes,
session.getAMQPConnection());
addressSpace.createMessageDestination(Exchange.class,
attributes);;
@@ -1602,7 +1597,7 @@ public class ServerSessionDelegate extends
MethodDelegate<ServerSession> impleme
if (method.hasAlternateExchange() &&
!nameNullOrEmpty(alternateExchangeName))
{
validateAlternateExchangeIsNotQueue(addressSpace,
alternateExchangeName);
- arguments.put(Queue.ALTERNATE_BINDING,
Collections.singletonMap(AlternateBinding.DESTINATION, alternateExchangeName));
+ arguments.put(Queue.ALTERNATE_BINDING,
Map.of(AlternateBinding.DESTINATION, alternateExchangeName));
}
arguments.put(Queue.NAME, queueName);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
index fcae54d55f..7c460fbe24 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
@@ -129,7 +129,7 @@ public final class Acquired extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
index f272e2f2f0..bbe3c7d016 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
@@ -183,7 +183,7 @@ public final class ConnectionClose extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
index f9dcc7f951..b0c58233bb 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
@@ -106,12 +106,6 @@ public final class ConnectionCloseOk extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
index dee78a1435..4e815da2d7 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
@@ -106,12 +106,7 @@ public final class ConnectionHeartbeat extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
- return result;
+ return new LinkedHashMap<>();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
index ff195b22f6..a8a0e8ed6c 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
@@ -218,7 +218,7 @@ public final class ConnectionOpen extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -232,10 +232,6 @@ public final class ConnectionOpen extends Method {
{
result.put("insist", getInsist());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
index 9d7e1eb83d..b204cc9961 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
@@ -145,16 +145,11 @@ public final class ConnectionOpenOk extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("knownHosts", getKnownHosts());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
index 90d3af2e6d..b0a6e6f38e 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
@@ -183,7 +183,7 @@ public final class ConnectionRedirect extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -193,10 +193,6 @@ public final class ConnectionRedirect extends Method {
{
result.put("knownHosts", getKnownHosts());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
index 2d4fd34816..1627e2eee7 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
@@ -145,16 +145,12 @@ public final class ConnectionSecure extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("challenge", getChallenge());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
index 42757af8f8..f88e3df91f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
@@ -145,16 +145,12 @@ public final class ConnectionSecureOk extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("response", getResponse());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
index bb302544be..191d44658e 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
@@ -221,7 +221,7 @@ public final class ConnectionStart extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -235,10 +235,6 @@ public final class ConnectionStart extends Method {
{
result.put("locales", getLocales());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
index 361ac7e2c4..2658698f83 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
@@ -259,7 +259,7 @@ public final class ConnectionStartOk extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -277,10 +277,6 @@ public final class ConnectionStartOk extends Method {
{
result.put("locale", getLocale());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
index c6caf25be4..48219e4bf9 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
@@ -251,7 +251,7 @@ public final class ConnectionTune extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -269,10 +269,6 @@ public final class ConnectionTune extends Method {
{
result.put("heartbeatMax", getHeartbeatMax());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
index a61d92b13b..65a8b548de 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
@@ -215,7 +215,7 @@ public final class ConnectionTuneOk extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
index 18e9ee601c..57120fcec1 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
@@ -547,7 +547,7 @@ public final class DeliveryProperties extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
index dae7fd52eb..cd66718fdd 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
@@ -180,7 +180,7 @@ public final class DtxCommit extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
index 1b7268c22c..ce807d4eb5 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
@@ -215,7 +215,7 @@ public final class DtxEnd extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
index 342b351f17..55e19d7ee4 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
@@ -145,7 +145,7 @@ public final class DtxForget extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
index 92f0187a9a..f0140d3a33 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
@@ -145,7 +145,7 @@ public final class DtxGetTimeout extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
index e906744a42..b89ba3ed46 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
@@ -145,7 +145,7 @@ public final class DtxPrepare extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
index 3e32abd49d..e0304fcdaf 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
@@ -106,11 +106,7 @@ public final class DtxRecover extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
index 09e6a1e29f..370cf05953 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
@@ -145,7 +145,7 @@ public final class DtxRollback extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
index 1bff340ebe..e498269bc6 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
@@ -106,11 +106,7 @@ public final class DtxSelect extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
index e791779864..088c29af10 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
@@ -181,7 +181,7 @@ public final class DtxSetTimeout extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
index ffa9c38d28..c5ed5887fc 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
@@ -215,7 +215,7 @@ public final class DtxStart extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
index c40be731e3..477c2fde52 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
@@ -259,7 +259,7 @@ public final class ExchangeBind extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -277,10 +277,6 @@ public final class ExchangeBind extends Method {
{
result.put("arguments", getArguments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
index d4b885e388..07383842e6 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
@@ -259,7 +259,7 @@ public final class ExchangeBound extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -277,10 +277,6 @@ public final class ExchangeBound extends Method {
{
result.put("arguments", getArguments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
index a2cc0f050e..1b8d415c71 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
@@ -273,7 +273,7 @@ public final class ExchangeBoundResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -295,8 +295,6 @@ public final class ExchangeBoundResult extends Struct {
{
result.put("argsNotMatched", getArgsNotMatched());
}
-
-
return result;
}
@@ -305,5 +303,4 @@ public final class ExchangeBoundResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
index 3f66ff9561..fd4385b3e9 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
@@ -364,7 +364,7 @@ public final class ExchangeDeclare extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -394,10 +394,6 @@ public final class ExchangeDeclare extends Method {
{
result.put("arguments", getArguments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
index 6faa954d35..01fc099add 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
@@ -180,7 +180,7 @@ public final class ExchangeDelete extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -190,10 +190,6 @@ public final class ExchangeDelete extends Method {
{
result.put("ifUnused", getIfUnused());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
index 2eed787742..974d3fc07e 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
@@ -145,16 +145,12 @@ public final class ExchangeQuery extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("name", getName());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
index 92e5570ced..a2b076b7a5 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
@@ -244,7 +244,7 @@ public final class ExchangeQueryResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -262,8 +262,6 @@ public final class ExchangeQueryResult extends Struct {
{
result.put("arguments", getArguments());
}
-
-
return result;
}
@@ -272,5 +270,4 @@ public final class ExchangeQueryResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
index 781e8d1ce0..133757030f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
@@ -221,7 +221,7 @@ public final class ExchangeUnbind extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -235,10 +235,6 @@ public final class ExchangeUnbind extends Method {
{
result.put("bindingKey", getBindingKey());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
index f8e14b7928..022dc995e3 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
@@ -365,7 +365,7 @@ public final class ExecutionException extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -395,10 +395,6 @@ public final class ExecutionException extends Method {
{
result.put("errorInfo", getErrorInfo());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
index 1c2ba44f3d..7757e7d25a 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
@@ -181,7 +181,7 @@ public final class ExecutionResult extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -191,10 +191,6 @@ public final class ExecutionResult extends Method {
{
result.put("value", getValue());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
index aecdc0b099..0d0e1f8a25 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
@@ -106,12 +106,6 @@ public final class ExecutionSync extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
index bb38394369..b22bc69b18 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
@@ -204,7 +204,7 @@ public final class FragmentProperties extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -218,8 +218,6 @@ public final class FragmentProperties extends Struct {
{
result.put("fragmentSize", getFragmentSize());
}
-
-
return result;
}
@@ -228,6 +226,4 @@ public final class FragmentProperties extends Struct {
{
throw new UnsupportedOperationException();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
index d8b38cc3f1..701b8b3f31 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
@@ -127,14 +127,12 @@ public final class GetTimeoutResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("timeout", getTimeout());
}
-
-
return result;
}
@@ -143,6 +141,4 @@ public final class GetTimeoutResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
index 3f02d192f8..5623facdea 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
@@ -145,16 +145,12 @@ public final class MessageAccept extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("transfers", getTransfers());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
index 9fb18c224e..b13ade5649 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
@@ -145,16 +145,12 @@ public final class MessageAcquire extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("transfers", getTransfers());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
index d6eec670db..8a17058400 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
@@ -145,16 +145,12 @@ public final class MessageCancel extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("destination", getDestination());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
index 41ebd5dc00..f4c840f9df 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
@@ -219,7 +219,7 @@ public final class MessageFlow extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -233,10 +233,6 @@ public final class MessageFlow extends Method {
{
result.put("value", getValue());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
index acfb162ab6..4675e4ed34 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
@@ -145,16 +145,12 @@ public final class MessageFlush extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("destination", getDestination());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
index 6c572b2d42..2803633b75 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
@@ -485,7 +485,7 @@ public final class MessageProperties extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
index ad6cde92dd..f3bd3c5c0f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
@@ -221,7 +221,7 @@ public final class MessageReject extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -235,10 +235,6 @@ public final class MessageReject extends Method {
{
result.put("text", getText());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
index eb283bc99d..370d222915 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
@@ -180,7 +180,7 @@ public final class MessageRelease extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -190,10 +190,6 @@ public final class MessageRelease extends Method {
{
result.put("setRedelivered", getSetRedelivered());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
index 1ea6939757..450a9583d4 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
@@ -183,7 +183,7 @@ public final class MessageResume extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -193,10 +193,6 @@ public final class MessageResume extends Method {
{
result.put("resumeId", getResumeId());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
index cb3964931d..2305646d8b 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
@@ -127,14 +127,12 @@ public final class MessageResumeResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("offset", getOffset());
}
-
-
return result;
}
@@ -143,5 +141,4 @@ public final class MessageResumeResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
index aaa412df58..e0dd0c8ac3 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
@@ -183,7 +183,7 @@ public final class MessageSetFlowMode extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -193,10 +193,6 @@ public final class MessageSetFlowMode extends Method {
{
result.put("flowMode", getFlowMode());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
index ee62dca8f4..0749c7770a 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
@@ -145,16 +145,12 @@ public final class MessageStop extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("destination", getDestination());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
index 88d4e88284..8ecc73f65f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
@@ -406,7 +406,7 @@ public final class MessageSubscribe extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -440,10 +440,6 @@ public final class MessageSubscribe extends Method {
{
result.put("arguments", getArguments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
index 8602e7b78b..b548ffc829 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
@@ -282,7 +282,7 @@ public final class MessageTransfer extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -296,8 +296,6 @@ public final class MessageTransfer extends Method {
{
result.put("acquireMode", getAcquireMode());
}
-
-
return result;
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
index 6b8ea4350a..ef93825fc9 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
@@ -360,7 +360,7 @@ public final class QueueDeclare extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -390,10 +390,6 @@ public final class QueueDeclare extends Method {
{
result.put("arguments", getArguments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
index ea45361ee8..e8357308ea 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
@@ -214,7 +214,7 @@ public final class QueueDelete extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -228,10 +228,6 @@ public final class QueueDelete extends Method {
{
result.put("ifEmpty", getIfEmpty());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
index 3ea8bb9a1a..700e673364 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
@@ -144,16 +144,11 @@ public final class QueuePurge extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("queue", getQueue());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
index a6eebac828..497562d618 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
@@ -144,16 +144,11 @@ public final class QueueQuery extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("queue", getQueue());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
index 3f250a4789..7a61c38d31 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
@@ -388,7 +388,7 @@ public final class QueueQueryResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -422,8 +422,6 @@ public final class QueueQueryResult extends Struct {
{
result.put("subscriberCount", getSubscriberCount());
}
-
-
return result;
}
@@ -432,6 +430,4 @@ public final class QueueQueryResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
index 79af6cfa2a..0562503c5b 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.util.Serial.max;
import static org.apache.qpid.server.util.Serial.min;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -202,13 +201,13 @@ public abstract class Range implements RangeSet
@Override
public List<Range> subtract(Range range)
{
- if(range.includes(point))
+ if (range.includes(point))
{
- return Collections.emptyList();
+ return List.of();
}
else
{
- return Collections.singletonList((Range) this);
+ return List.of(this);
}
}
@@ -280,7 +279,7 @@ public abstract class Range implements RangeSet
@Override
public List<Range> subtract(Range range)
{
- List<Range> result = new ArrayList<Range>();
+ List<Range> result = new ArrayList<>();
if (includes(range.getLower()) && le(lower, range.getLower() - 1))
{
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
index d43aa63f26..01c5f6718d 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
@@ -34,18 +34,18 @@ public class RangeSetImpl implements RangeSet
public RangeSetImpl()
{
- ranges = new ArrayList<Range>();
+ ranges = new ArrayList<>();
}
public RangeSetImpl(int size)
{
- ranges = new ArrayList<Range>(size);
+ ranges = new ArrayList<>(size);
}
public RangeSetImpl(RangeSetImpl copy)
{
- ranges = new ArrayList<Range>(copy.ranges);
+ ranges = new ArrayList<>(copy.ranges);
}
@Override
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
index 52dfe27637..f1bdadd8e8 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
@@ -129,14 +129,11 @@ public final class RecoverResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("inDoubt", getInDoubt());
}
-
-
return result;
}
@@ -145,6 +142,4 @@ public final class RecoverResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
index 7547570145..f3fc874654 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
@@ -186,7 +186,7 @@ public final class ReplyTo extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -196,8 +196,6 @@ public final class ReplyTo extends Struct {
{
result.put("routingKey", getRoutingKey());
}
-
-
return result;
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
index 548f3f2eb8..b8a5db40d7 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
@@ -180,7 +180,7 @@ public final class SessionAttach extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -190,10 +190,6 @@ public final class SessionAttach extends Method {
{
result.put("force", getForce());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
index abba5578a1..e3ac81a2f6 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
@@ -145,16 +145,12 @@ public final class SessionAttached extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("name", getName());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
index 59f83a3e1b..81fa92e815 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
@@ -128,12 +128,9 @@ public final class SessionCommandFragment extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
+ Map<String,Object> result = new LinkedHashMap<>();
result.put("commandId", getCommandId());
result.put("byteRanges", getByteRanges());
-
-
return result;
}
@@ -142,5 +139,4 @@ public final class SessionCommandFragment extends Struct {
{
throw new UnsupportedOperationException();
}
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
index 5d2386db33..c77694d7af 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
@@ -179,7 +179,7 @@ public final class SessionCommandPoint extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -189,10 +189,6 @@ public final class SessionCommandPoint extends Method {
{
result.put("commandOffset", getCommandOffset());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
index 37a8ce15ff..0566a2c6aa 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
@@ -180,7 +180,7 @@ public final class SessionCompleted extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -190,10 +190,6 @@ public final class SessionCompleted extends Method {
{
result.put("timelyReply", getTimelyReply());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
index a635379953..fbad0a6ce6 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
@@ -183,7 +183,7 @@ public final class SessionConfirmed extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -193,10 +193,6 @@ public final class SessionConfirmed extends Method {
{
result.put("fragments", getFragments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
index dc0d6f612a..8233dec341 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
@@ -145,16 +145,12 @@ public final class SessionDetach extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("name", getName());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
index dda97e8ec8..1dd5fa6210 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
@@ -183,7 +183,7 @@ public final class SessionDetached extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -193,10 +193,6 @@ public final class SessionDetached extends Method {
{
result.put("code", getCode());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
index 6e74632abb..8d318c92c5 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
@@ -183,7 +183,7 @@ public final class SessionExpected extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -193,10 +193,6 @@ public final class SessionExpected extends Method {
{
result.put("fragments", getFragments());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
index 2f7965163b..92991a9aa9 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
@@ -212,7 +212,7 @@ public final class SessionFlush extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -226,10 +226,6 @@ public final class SessionFlush extends Method {
{
result.put("completed", getCompleted());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
index 1c37926de9..f9c5e66128 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
@@ -145,16 +145,12 @@ public final class SessionGap extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("commands", getCommands());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
index 3533f0424d..aa8140dab8 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
@@ -133,14 +133,12 @@ public final class SessionHeader extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 1) != 0)
{
result.put("sync", getSync());
}
-
-
return result;
}
@@ -149,6 +147,4 @@ public final class SessionHeader extends Struct {
{
throw new UnsupportedOperationException();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
index 3b4d59ce42..e32a0d908a 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
@@ -145,16 +145,12 @@ public final class SessionKnownCompleted extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("commands", getCommands());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
index 229305fbbb..2d836a3bca 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
@@ -143,16 +143,12 @@ public final class SessionRequestTimeout extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("timeout", getTimeout());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
index 115650b9c1..a2840646c9 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
@@ -143,16 +143,12 @@ public final class SessionTimeout extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("timeout", getTimeout());
}
-
-
return result;
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
index a131ea49f1..1d814e88fd 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
@@ -106,12 +106,6 @@ public final class TxCommit extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
index 9ab4f411dc..ca792aa0a8 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
@@ -106,12 +106,6 @@ public final class TxRollback extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
index da6523ea8c..3b9d1a6390 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
@@ -106,12 +106,6 @@ public final class TxSelect extends Method {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
-
-
- return result;
+ return new LinkedHashMap<>();
}
-
-
}
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
index 4190c9d0ae..4f410ab188 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
@@ -129,14 +129,11 @@ public final class XaResult extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
-
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
result.put("status", getStatus());
}
-
-
return result;
}
@@ -145,7 +142,4 @@ public final class XaResult extends Struct {
{
throw new UnsupportedOperationException();
}
-
-
-
-}
+}
\ No newline at end of file
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
index e5f870c254..7732eeacce 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
@@ -203,7 +203,7 @@ public final class Xid extends Struct {
@Override
public Map<String,Object> getFields()
{
- Map<String,Object> result = new LinkedHashMap<String,Object>();
+ Map<String,Object> result = new LinkedHashMap<>();
if ((packing_flags & 256) != 0)
{
@@ -217,8 +217,6 @@ public final class Xid extends Struct {
{
result.put("branchId", getBranchId());
}
-
-
return result;
}
@@ -227,5 +225,4 @@ public final class Xid extends Struct {
{
throw new UnsupportedOperationException();
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
