Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B474E200B95 for ; Tue, 27 Sep 2016 23:08:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B1370160AD2; Tue, 27 Sep 2016 21:08:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D115D160AB9 for ; Tue, 27 Sep 2016 23:08:38 +0200 (CEST) Received: (qmail 40908 invoked by uid 500); 27 Sep 2016 21:08:38 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 40899 invoked by uid 99); 27 Sep 2016 21:08:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Sep 2016 21:08:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5975DFCC0; Tue, 27 Sep 2016 21:08:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-6438 Date: Tue, 27 Sep 2016 21:08:37 +0000 (UTC) archived-at: Tue, 27 Sep 2016 21:08:39 -0000 Repository: activemq Updated Branches: refs/heads/master b1a9a9382 -> 45f60e413 https://issues.apache.org/jira/browse/AMQ-6438 Remove redundant tests and clean up a few small nits. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/45f60e41 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/45f60e41 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/45f60e41 Branch: refs/heads/master Commit: 45f60e4133f64603d5f1a5161c363eb185d2804d Parents: b1a9a93 Author: Timothy Bish Authored: Tue Sep 27 17:08:28 2016 -0400 Committer: Timothy Bish Committed: Tue Sep 27 17:08:28 2016 -0400 ---------------------------------------------------------------------- .../message/JMSMappingOutboundTransformer.java | 5 +- .../JMSTransformationSpeedComparisonTest.java | 65 -------------------- 2 files changed, 2 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/45f60e41/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java index fa915e8..69039ea 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java @@ -220,7 +220,7 @@ public class JMSMappingOutboundTransformer implements OutboundTransformer { if (header == null) { header = new Header(); } - header.setDeliveryCount(new UnsignedInteger(deliveryCount)); + header.setDeliveryCount(UnsignedInteger.valueOf(deliveryCount)); } String userId = message.getUserID(); if (userId != null) { @@ -238,11 +238,10 @@ public class JMSMappingOutboundTransformer implements OutboundTransformer { } int groupSequence = message.getGroupSequence(); if (groupSequence > 0) { - UnsignedInteger value = new UnsignedInteger(groupSequence); if (properties == null) { properties = new Properties(); } - properties.setGroupSequence(value); + properties.setGroupSequence(UnsignedInteger.valueOf(groupSequence)); } final Map entries; http://git-wip-us.apache.org/repos/asf/activemq/blob/45f60e41/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSTransformationSpeedComparisonTest.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSTransformationSpeedComparisonTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSTransformationSpeedComparisonTest.java index 204c652..cd93af7 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSTransformationSpeedComparisonTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSTransformationSpeedComparisonTest.java @@ -16,10 +16,6 @@ */ package org.apache.activemq.transport.amqp.message; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -277,67 +273,6 @@ public class JMSTransformationSpeedComparisonTest { transformer, PROFILE_CYCLES, TimeUnit.NANOSECONDS.toMillis(totalDuration), test.getMethodName()); } - @Test - public void testEncodeDecodeIsWorking() throws Exception { - Message incomingMessage = createTypicalQpidJMSMessage(); - EncodedMessage encoded = encode(incomingMessage); - InboundTransformer inboundTransformer = getInboundTransformer(); - OutboundTransformer outboundTransformer = getOutboundTransformer(); - - ActiveMQMessage outbound = inboundTransformer.transform(encoded); - outbound.onSend(); - Message outboudMessage = outboundTransformer.transform(outbound).decode(); - - // Test that message details are equal - assertEquals(incomingMessage.getAddress(), outboudMessage.getAddress()); - assertEquals(incomingMessage.getDeliveryCount(), outboudMessage.getDeliveryCount()); - assertEquals(incomingMessage.getCreationTime(), outboudMessage.getCreationTime()); - assertEquals(incomingMessage.getContentType(), outboudMessage.getContentType()); - - // Test Message annotations - ApplicationProperties incomingApplicationProperties = incomingMessage.getApplicationProperties(); - ApplicationProperties outgoingApplicationProperties = outboudMessage.getApplicationProperties(); - - assertEquals(incomingApplicationProperties.getValue(), outgoingApplicationProperties.getValue()); - - // Test Message properties - MessageAnnotations incomingMessageAnnotations = incomingMessage.getMessageAnnotations(); - MessageAnnotations outgoingMessageAnnotations = outboudMessage.getMessageAnnotations(); - - assertEquals(incomingMessageAnnotations.getValue(), outgoingMessageAnnotations.getValue()); - - // Test that bodies are equal - assertTrue(incomingMessage.getBody() instanceof AmqpValue); - assertTrue(outboudMessage.getBody() instanceof AmqpValue); - - AmqpValue incomingBody = (AmqpValue) incomingMessage.getBody(); - AmqpValue outgoingBody = (AmqpValue) outboudMessage.getBody(); - - assertTrue(incomingBody.getValue() instanceof String); - assertTrue(outgoingBody.getValue() instanceof String); - - assertEquals(incomingBody.getValue(), outgoingBody.getValue()); - } - - @Test - public void testBodyOnlyEncodeDecode() throws Exception { - - Message incomingMessage = Proton.message(); - - incomingMessage.setBody(new AmqpValue("String payload for AMQP message conversion performance testing.")); - - EncodedMessage encoded = encode(incomingMessage); - InboundTransformer inboundTransformer = getInboundTransformer(); - OutboundTransformer outboundTransformer = getOutboundTransformer(); - - ActiveMQMessage intermediate = inboundTransformer.transform(encoded); - intermediate.onSend(); - Message outboudMessage = outboundTransformer.transform(intermediate).decode(); - - assertNull(outboudMessage.getHeader()); - assertNull(outboudMessage.getProperties()); - } - private Message createTypicalQpidJMSMessage() { Map applicationProperties = new HashMap(); Map messageAnnotations = new HashMap();