You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/10/10 07:57:53 UTC

[1/2] activemq-artemis git commit: Remove redundant type arguments

Repository: activemq-artemis
Updated Branches:
  refs/heads/master de746a762 -> 15f44d60d


Remove redundant type arguments

Missed by sevntu-checkstyle, but not the Eclipse compiler.

https://github.com/sevntu-checkstyle/sevntu.checkstyle/issues/458


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/693e745b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/693e745b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/693e745b

Branch: refs/heads/master
Commit: 693e745b9cb4f74e07e52930b3daf1d52411a255
Parents: de746a7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sat Oct 8 10:01:45 2016 +0300
Committer: Ville Skytt� <vi...@iki.fi>
Committed: Sat Oct 8 10:01:45 2016 +0300

----------------------------------------------------------------------
 .../message/JMSMappingOutboundTransformer.java          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/693e745b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java
index 9ee0344..efa1a81 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java
@@ -177,7 +177,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
          }
          properties.setTo(toAddress(destination));
          if (maMap == null) {
-            maMap = new HashMap<Symbol, Object>();
+            maMap = new HashMap<>();
          }
          maMap.put(JMS_DEST_TYPE_MSG_ANNOTATION, destinationType(destination));
       }
@@ -188,7 +188,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
          }
          properties.setReplyTo(toAddress(replyTo));
          if (maMap == null) {
-            maMap = new HashMap<Symbol, Object>();
+            maMap = new HashMap<>();
          }
          maMap.put(JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationType(replyTo));
       }
@@ -293,14 +293,14 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
                continue;
             } else if (key.startsWith(JMS_AMQP_DELIVERY_ANNOTATION_PREFIX)) {
                if (daMap == null) {
-                  daMap = new HashMap<Symbol, Object>();
+                  daMap = new HashMap<>();
                }
                String name = key.substring(JMS_AMQP_DELIVERY_ANNOTATION_PREFIX.length());
                daMap.put(Symbol.valueOf(name), message.getObjectProperty(key));
                continue;
             } else if (key.startsWith(JMS_AMQP_MESSAGE_ANNOTATION_PREFIX)) {
                if (maMap == null) {
-                  maMap = new HashMap<Symbol, Object>();
+                  maMap = new HashMap<>();
                }
                String name = key.substring(JMS_AMQP_MESSAGE_ANNOTATION_PREFIX.length());
                maMap.put(Symbol.valueOf(name), message.getObjectProperty(key));
@@ -325,7 +325,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
                continue;
             } else if (key.startsWith(JMS_AMQP_FOOTER_PREFIX)) {
                if (footerMap == null) {
-                  footerMap = new HashMap<Object, Object>();
+                  footerMap = new HashMap<>();
                }
                String name = key.substring(JMS_AMQP_FOOTER_PREFIX.length());
                footerMap.put(name, message.getObjectProperty(key));
@@ -350,7 +350,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
          }
 
          if (apMap == null) {
-            apMap = new HashMap<String, Object>();
+            apMap = new HashMap<>();
          }
 
          Object objectProperty = message.getObjectProperty(key);


[2/2] activemq-artemis git commit: This closes #829

Posted by cl...@apache.org.
This closes #829


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/15f44d60
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/15f44d60
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/15f44d60

Branch: refs/heads/master
Commit: 15f44d60df9ee59df5156b9cdf2ba6feef35bab8
Parents: de746a7 693e745
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 10 09:55:16 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 10 09:55:16 2016 +0200

----------------------------------------------------------------------
 .../message/JMSMappingOutboundTransformer.java          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------