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 788064d4ea QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#215)
788064d4ea is described below
commit 788064d4ea4ba9edecc652da6396b715909d86b2
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Mon Aug 7 13:04:43 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#215)
---
.../converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java | 2 +-
.../converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10Test.java | 8 ++++----
.../converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java | 4 ++--
.../converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java | 2 +-
.../converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java | 2 +-
.../converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
index 83bc9230a4..274088acb3 100644
---
a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
+++
b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
@@ -110,7 +110,7 @@ public class MessageConverter_1_0_to_v0_10 implements
MessageConverter<Message_1
convertedContent.length);
final int metadataSize = messageMetaData_0_10.getStorableSize();
- return new StoredMessage<MessageMetaData_0_10>()
+ return new StoredMessage<>()
{
@Override
public MessageMetaData_0_10 getMetaData()
diff --git
a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10Test.java
b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10Test.java
index 2c467e28db..5fe8e433d1 100644
---
a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10Test.java
+++
b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10Test.java
@@ -354,8 +354,8 @@ class MessageConverter_1_0_to_v0_10Test extends UnitTestBase
final List<Object> convertedList = new
AmqpListToListConverter().toObject(getBytes(content));
assertEquals(originalList.size(), (long) convertedList.size(),
"Unexpected size");
- assertEquals(new HashMap<String, Object>((Map) originalList.get(0)),
- new HashMap<String, Object>((Map) convertedList.get(0)),
+ assertEquals(new HashMap<>((Map) originalList.get(0)),
+ new HashMap<>((Map) convertedList.get(0)),
"Unexpected map item");
}
@@ -410,8 +410,8 @@ class MessageConverter_1_0_to_v0_10Test extends UnitTestBase
final List<Object> convertedList = new
AmqpListToListConverter().toObject(getBytes(content));
assertEquals(originalList.size(), (long) convertedList.size(),
"Unexpected size");
- assertEquals(new HashMap<String, Object>((Map) originalList.get(0)),
- new HashMap<String, Object>((Map) convertedList.get(0)),
+ assertEquals(new HashMap<>((Map) originalList.get(0)),
+ new HashMap<>((Map) convertedList.get(0)),
"Unexpected map item");
}
diff --git
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
index d5b528b1c6..2e21d5f2dc 100644
---
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
+++
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
@@ -176,7 +176,7 @@ public class MessageConverter_0_10_to_0_8 implements
MessageConverter<MessageTra
if(messageProps.hasApplicationHeaders())
{
- Map<String, Object> appHeaders = new HashMap<String,
Object>(messageProps.getApplicationHeaders());
+ Map<String, Object> appHeaders = new
HashMap<>(messageProps.getApplicationHeaders());
if(messageProps.getApplicationHeaders().containsKey("x-jms-type"))
{
String jmsType =
String.valueOf(appHeaders.remove("x-jms-type"));
@@ -235,7 +235,7 @@ public class MessageConverter_0_10_to_0_8 implements
MessageConverter<MessageTra
{
final MessageMetaData metaData = convertMetaData(message,
addressSpace);
final int metadataSize = metaData.getStorableSize();
- return new
StoredMessage<org.apache.qpid.server.protocol.v0_8.MessageMetaData>()
+ return new StoredMessage<>()
{
@Override
public MessageMetaData getMetaData()
diff --git
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
index ae54d402e5..04eb7041ab 100644
---
a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
+++
b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
@@ -76,7 +76,7 @@ public class MessageConverter_0_8_to_0_10 implements
MessageConverter<AMQMessag
{
final MessageMetaData_0_10 messageMetaData_0_10 =
convertMetaData(message_0_8);
final int metadataSize = messageMetaData_0_10.getStorableSize();
- return new StoredMessage<MessageMetaData_0_10>()
+ return new StoredMessage<>()
{
@Override
public MessageMetaData_0_10 getMetaData()
diff --git
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
index 738bd9a046..57bd521e1a 100644
---
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
+++
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
@@ -101,7 +101,7 @@ public class MessageConverter_1_0_to_v0_8 implements
MessageConverter<Message_1_
addressSpace);
final int metadataSize = messageMetaData_0_8.getStorableSize();
- return new StoredMessage<MessageMetaData>()
+ return new StoredMessage<>()
{
@Override
public MessageMetaData getMetaData()
diff --git
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
index ab6f4aa8ca..e8cc392f22 100644
---
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
+++
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
@@ -350,8 +350,8 @@ class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
assertEquals("amqp/list",
convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalList.size(), (long) convertedList.size(),
"Unexpected size");
- assertEquals(new HashMap<String, Object>((Map) originalList.get(0)),
- new HashMap<String, Object>((Map) convertedList.get(0)),
+ assertEquals(new HashMap<>((Map) originalList.get(0)),
+ new HashMap<>((Map) convertedList.get(0)),
"Unexpected map item");
}
@@ -407,8 +407,8 @@ class MessageConverter_1_0_to_v0_8Test extends UnitTestBase
assertEquals("amqp/list",
convertedMessage.getMessageHeader().getMimeType(), "Unexpected mime type");
assertEquals(originalList.size(), (long) convertedList.size(),
"Unexpected size");
- assertEquals(new HashMap<String, Object>((Map) originalList.get(0)),
- new HashMap<String, Object>((Map) convertedList.get(0)),
+ assertEquals(new HashMap<>((Map) originalList.get(0)),
+ new HashMap<>((Map) convertedList.get(0)),
"Unexpected map item");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
