Copilot commented on code in PR #1667:
URL: https://github.com/apache/activemq/pull/1667#discussion_r2799257163
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java:
##########
@@ -152,34 +152,34 @@ public void doTestSendBytesMessageOfGivenSize(int
expectedSize) throws JMSExcept
byte[] payload = createLargeByteArray(expectedSize);
assertEquals(expectedSize, payload.length);
- Connection connection =
JMSClientContext.INSTANCE.createConnection(getBrokerAmqpConnectionURI());
- long startTime = System.currentTimeMillis();
- Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = session.createQueue(testName.getMethodName());
- MessageProducer producer = session.createProducer(queue);
- BytesMessage message = session.createBytesMessage();
- message.writeBytes(payload);
- producer.send(message);
- long endTime = System.currentTimeMillis();
- LOG.info("Returned from send after {} ms", endTime - startTime);
-
- startTime = System.currentTimeMillis();
-
- MessageConsumer consumer = session.createConsumer(queue);
- connection.start();
- LOG.info("Calling receive");
- Message receivedMessage = consumer.receive();
- assertNotNull(receivedMessage);
- assertTrue(receivedMessage instanceof BytesMessage);
- BytesMessage receivedBytesMessage = (BytesMessage) receivedMessage;
- assertNotNull(receivedMessage);
- endTime = System.currentTimeMillis();
- LOG.info("Returned from receive after {} ms", endTime - startTime);
- byte[] receivedBytes = new byte[(int)
receivedBytesMessage.getBodyLength()];
- receivedBytesMessage.readBytes(receivedBytes);
- assertEquals(expectedSize, receivedBytes.length);
- assertArrayEquals(payload, receivedBytes);
- connection.close();
+ try (Connection connection =
JMSClientContext.INSTANCE.createConnection(getBrokerAmqpConnectionURI())) {
+ long startTime = System.currentTimeMillis();
+ Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue(testName.getMethodName());
+ MessageProducer producer = session.createProducer(queue);
+ BytesMessage message = session.createBytesMessage();
+ message.writeBytes(payload);
+ producer.send(message);
+ long endTime = System.currentTimeMillis();
+ LOG.info("Returned from send after {} ms", endTime - startTime);
+
+ startTime = System.currentTimeMillis();
+
+ MessageConsumer consumer = session.createConsumer(queue);
+ connection.start();
+ LOG.info("Calling receive");
+ Message receivedMessage = consumer.receive();
+ assertNotNull(receivedMessage);
+ assertTrue(receivedMessage instanceof BytesMessage);
+ BytesMessage receivedBytesMessage = (BytesMessage) receivedMessage;
+ assertNotNull(receivedMessage);
Review Comment:
Minor redundancy: `receivedMessage` is asserted non-null twice; the second
`assertNotNull(receivedMessage)` is unnecessary. Consider removing it (or
assert on `receivedBytesMessage` if needed).
```suggestion
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java:
##########
@@ -67,42 +67,42 @@ public void testNativeTransformation() throws Exception {
startBrokerWithAmqpTransport(String.format(AMQP_URL,
"?transport.transformer=native"));
// send "text message" with AMQP JMS API
- Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI);
- amqpConnection.start();
+ try (Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI)) {
+ amqpConnection.start();
- Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = amqpSession.createQueue(TEST_QUEUE);
- MessageProducer p = amqpSession.createProducer(queue);
- p.setPriority(7);
+ Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = amqpSession.createQueue(TEST_QUEUE);
+ MessageProducer p = amqpSession.createProducer(queue);
+ p.setPriority(7);
- TextMessage amqpMessage = amqpSession.createTextMessage();
- amqpMessage.setText("hello");
- p.send(amqpMessage);
+ TextMessage amqpMessage = amqpSession.createTextMessage();
+ amqpMessage.setText("hello");
+ p.send(amqpMessage);
- p.close();
- amqpSession.close();
- amqpConnection.close();
+ p.close();
+ amqpSession.close();
+ }
// receive with openwire JMS
ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory(openwireConnectionURI);
- Connection openwireConn = factory.createConnection();
- openwireConn.start();
- Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue jmsDest = session.createQueue(TEST_QUEUE);
+ try (Connection openwireConn = factory.createConnection()) {
+ openwireConn.start();
+ Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue jmsDest = session.createQueue(TEST_QUEUE);
- MessageConsumer c = session.createConsumer(jmsDest);
+ MessageConsumer c = session.createConsumer(jmsDest);
- Message message = c.receive(1000);
+ Message message = c.receive(1000);
- assertTrue(message instanceof BytesMessage);
- Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
- assertTrue("Didn't use the correct transformation, expected NATIVE",
nativeTransformationUsed);
- assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
- assertEquals(7, message.getJMSPriority());
+ assertTrue(message instanceof BytesMessage);
+ Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
+ assertTrue("Didn't use the correct transformation, expected
NATIVE", nativeTransformationUsed);
+ assertEquals(DeliveryMode.PERSISTENT,
message.getJMSDeliveryMode());
+ assertEquals(7, message.getJMSPriority());
Review Comment:
`c.receive(1000)` can return null; `assertTrue(message instanceof
BytesMessage)` will then fail with a generic message. Add an `assertNotNull`
(with a helpful message) before the type assertion to make failures easier to
diagnose.
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java:
##########
@@ -184,188 +181,177 @@ public void
testMessagePropertiesArePreservedAMQPToOpenWire() throws Exception {
Enumeration<String> propertyNames = null;
String testMessageBody = "Testing msgPropertyExistTest";
- Connection openwire = createJMSConnection();
- Connection amqp = createConnection();
-
- openwire.start();
- amqp.start();
-
- Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Destination queue = openwireSession.createQueue(getDestinationName());
-
- MessageProducer amqpProducer = amqpSession.createProducer(queue);
- MessageConsumer openwireConsumer =
openwireSession.createConsumer(queue);
-
- TextMessage outbound = amqpSession.createTextMessage();
- outbound.setText(testMessageBody);
- outbound.setBooleanProperty("Boolean", bool);
- outbound.setByteProperty("Byte", bValue);
- outbound.setShortProperty("Short", nShort);
- outbound.setIntProperty("Integer", nInt);
- outbound.setFloatProperty("Float", nFloat);
- outbound.setDoubleProperty("Double", nDouble);
- outbound.setStringProperty("String", "test");
- outbound.setLongProperty("Long", nLong);
- outbound.setObjectProperty("BooleanObject", bool);
-
- amqpProducer.send(outbound);
-
- Message inbound = openwireConsumer.receive(2500);
-
- propertyNames = inbound.getPropertyNames();
- int propertyCount = 0;
- do {
- String propertyName = propertyNames.nextElement();
-
- if (propertyName.indexOf("JMS") != 0) {
- propertyCount++;
- if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
- propertyName.equals("Integer") ||
propertyName.equals("Short") ||
- propertyName.equals("Float") ||
propertyName.equals("Double") ||
- propertyName.equals("String") ||
propertyName.equals("Long") ||
- propertyName.equals("BooleanObject")) {
-
- LOG.debug("Appclication Property set by client is: {}",
propertyName);
- if (!inbound.propertyExists(propertyName)) {
- assertTrue(inbound.propertyExists(propertyName));
- LOG.debug("Positive propertyExists test failed for
{}", propertyName);
- } else if (inbound.propertyExists(propertyName + "1")) {
- LOG.debug("Negative propertyExists test failed for {}
1", propertyName);
- fail("Negative propertyExists test failed for " +
propertyName + "1");
+ try (Connection openwire = createJMSConnection(); Connection amqp =
createConnection()) {
+ openwire.start();
+ amqp.start();
+
+ Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ Destination queue =
openwireSession.createQueue(getDestinationName());
+
+ MessageProducer amqpProducer = amqpSession.createProducer(queue);
+ MessageConsumer openwireConsumer =
openwireSession.createConsumer(queue);
+
+ TextMessage outbound = amqpSession.createTextMessage();
+ outbound.setText(testMessageBody);
+ outbound.setBooleanProperty("Boolean", bool);
+ outbound.setByteProperty("Byte", bValue);
+ outbound.setShortProperty("Short", nShort);
+ outbound.setIntProperty("Integer", nInt);
+ outbound.setFloatProperty("Float", nFloat);
+ outbound.setDoubleProperty("Double", nDouble);
+ outbound.setStringProperty("String", "test");
+ outbound.setLongProperty("Long", nLong);
+ outbound.setObjectProperty("BooleanObject", bool);
+
+ amqpProducer.send(outbound);
+
+ Message inbound = openwireConsumer.receive(2500);
+
+ propertyNames = inbound.getPropertyNames();
+ int propertyCount = 0;
+ do {
+ String propertyName = propertyNames.nextElement();
+
+ if (propertyName.indexOf("JMS") != 0) {
+ propertyCount++;
+ if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
+ propertyName.equals("Integer") ||
propertyName.equals("Short") ||
+ propertyName.equals("Float") ||
propertyName.equals("Double") ||
+ propertyName.equals("String") ||
propertyName.equals("Long") ||
+ propertyName.equals("BooleanObject")) {
+
+ LOG.debug("Appclication Property set by client is:
{}", propertyName);
+ if (!inbound.propertyExists(propertyName)) {
Review Comment:
Typo in log message: "Appclication" should be "Application".
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java:
##########
@@ -112,46 +112,46 @@ public void testRawTransformation() throws Exception {
startBrokerWithAmqpTransport(String.format(AMQP_URL,
"?transport.transformer=raw"));
// send "text message" with AMQP JMS API
- Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI);
- amqpConnection.start();
+ try (Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI)) {
+ amqpConnection.start();
- Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = amqpSession.createQueue(TEST_QUEUE);
- MessageProducer p = amqpSession.createProducer(queue);
- p.setPriority(7);
+ Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = amqpSession.createQueue(TEST_QUEUE);
+ MessageProducer p = amqpSession.createProducer(queue);
+ p.setPriority(7);
- TextMessage amqpMessage = amqpSession.createTextMessage();
- amqpMessage.setText("hello");
- p.send(amqpMessage);
+ TextMessage amqpMessage = amqpSession.createTextMessage();
+ amqpMessage.setText("hello");
+ p.send(amqpMessage);
- p.close();
- amqpSession.close();
- amqpConnection.close();
+ p.close();
+ amqpSession.close();
+ }
// receive with openwire JMS
ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory(openwireConnectionURI);
- Connection openwireConn = factory.createConnection();
- openwireConn.start();
- Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue jmsDest = session.createQueue(TEST_QUEUE);
+ try (Connection openwireConn = factory.createConnection()) {
+ openwireConn.start();
+ Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue jmsDest = session.createQueue(TEST_QUEUE);
- MessageConsumer c = session.createConsumer(jmsDest);
+ MessageConsumer c = session.createConsumer(jmsDest);
- Message message = c.receive(2000);
+ Message message = c.receive(2000);
- assertNotNull("Should have received a message", message);
- LOG.info("Recieved message: {}", message);
- assertTrue(message instanceof BytesMessage);
- Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
- assertTrue("Didn't use the correct transformation, expected NATIVE",
nativeTransformationUsed);
- assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
+ assertNotNull("Should have received a message", message);
+ LOG.info("Recieved message: {}", message);
Review Comment:
Typo in log message: "Recieved" should be "Received".
```suggestion
LOG.info("Received message: {}", message);
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java:
##########
@@ -112,46 +112,46 @@ public void testRawTransformation() throws Exception {
startBrokerWithAmqpTransport(String.format(AMQP_URL,
"?transport.transformer=raw"));
// send "text message" with AMQP JMS API
- Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI);
- amqpConnection.start();
+ try (Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI)) {
+ amqpConnection.start();
- Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = amqpSession.createQueue(TEST_QUEUE);
- MessageProducer p = amqpSession.createProducer(queue);
- p.setPriority(7);
+ Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = amqpSession.createQueue(TEST_QUEUE);
+ MessageProducer p = amqpSession.createProducer(queue);
+ p.setPriority(7);
- TextMessage amqpMessage = amqpSession.createTextMessage();
- amqpMessage.setText("hello");
- p.send(amqpMessage);
+ TextMessage amqpMessage = amqpSession.createTextMessage();
+ amqpMessage.setText("hello");
+ p.send(amqpMessage);
- p.close();
- amqpSession.close();
- amqpConnection.close();
+ p.close();
+ amqpSession.close();
+ }
// receive with openwire JMS
ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory(openwireConnectionURI);
- Connection openwireConn = factory.createConnection();
- openwireConn.start();
- Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue jmsDest = session.createQueue(TEST_QUEUE);
+ try (Connection openwireConn = factory.createConnection()) {
+ openwireConn.start();
+ Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue jmsDest = session.createQueue(TEST_QUEUE);
- MessageConsumer c = session.createConsumer(jmsDest);
+ MessageConsumer c = session.createConsumer(jmsDest);
- Message message = c.receive(2000);
+ Message message = c.receive(2000);
- assertNotNull("Should have received a message", message);
- LOG.info("Recieved message: {}", message);
- assertTrue(message instanceof BytesMessage);
- Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
- assertTrue("Didn't use the correct transformation, expected NATIVE",
nativeTransformationUsed);
- assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
+ assertNotNull("Should have received a message", message);
+ LOG.info("Recieved message: {}", message);
+ assertTrue(message instanceof BytesMessage);
+ Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
Review Comment:
The variable 'nativeTransformationUsed' is only assigned values of primitive
type and is never 'null', but it is declared with the boxed type 'Boolean'.
```suggestion
boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java:
##########
@@ -95,32 +95,32 @@ public void doTestSendTextMessageOfGivenSize(int
expectedSize) throws JMSExcepti
String payload = createLargeString(expectedSize);
assertEquals(expectedSize, payload.getBytes().length);
- Connection connection =
JMSClientContext.INSTANCE.createConnection(getBrokerAmqpConnectionURI());
- long startTime = System.currentTimeMillis();
- Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = session.createQueue(testName.getMethodName());
- MessageProducer producer = session.createProducer(queue);
- TextMessage message = session.createTextMessage();
- message.setText(payload);
- producer.send(message);
- long endTime = System.currentTimeMillis();
- LOG.info("Returned from send after {} ms", endTime - startTime);
-
- startTime = System.currentTimeMillis();
- MessageConsumer consumer = session.createConsumer(queue);
- connection.start();
- LOG.info("Calling receive");
- Message receivedMessage = consumer.receive();
- assertNotNull(receivedMessage);
- assertTrue(receivedMessage instanceof TextMessage);
- TextMessage receivedTextMessage = (TextMessage) receivedMessage;
- assertNotNull(receivedMessage);
- endTime = System.currentTimeMillis();
- LOG.info("Returned from receive after {} ms", endTime - startTime);
- String receivedText = receivedTextMessage.getText();
- assertEquals(expectedSize, receivedText.getBytes().length);
- assertEquals(payload, receivedText);
- connection.close();
+ try (Connection connection =
JMSClientContext.INSTANCE.createConnection(getBrokerAmqpConnectionURI())) {
+ long startTime = System.currentTimeMillis();
+ Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue(testName.getMethodName());
+ MessageProducer producer = session.createProducer(queue);
+ TextMessage message = session.createTextMessage();
+ message.setText(payload);
+ producer.send(message);
+ long endTime = System.currentTimeMillis();
+ LOG.info("Returned from send after {} ms", endTime - startTime);
+
+ startTime = System.currentTimeMillis();
+ MessageConsumer consumer = session.createConsumer(queue);
+ connection.start();
+ LOG.info("Calling receive");
+ Message receivedMessage = consumer.receive();
+ assertNotNull(receivedMessage);
+ assertTrue(receivedMessage instanceof TextMessage);
+ TextMessage receivedTextMessage = (TextMessage) receivedMessage;
+ assertNotNull(receivedMessage);
Review Comment:
Minor redundancy: `receivedMessage` is asserted non-null twice; the second
`assertNotNull(receivedMessage)` doesn’t add anything. Consider removing it (or
change it to assert on the cast value if that was the intent).
```suggestion
assertNotNull(receivedTextMessage);
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java:
##########
@@ -100,71 +100,68 @@ public void
testMessagePropertiesArePreservedOpenWireToAMQP() throws Exception {
Enumeration<String> propertyNames = null;
String testMessageBody = "Testing msgPropertyExistTest";
- Connection openwire = createJMSConnection();
- Connection amqp = createConnection();
-
- openwire.start();
- amqp.start();
-
- Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Destination queue = openwireSession.createQueue(getDestinationName());
-
- MessageProducer openwireProducer =
openwireSession.createProducer(queue);
- MessageConsumer amqpConsumer = amqpSession.createConsumer(queue);
-
- TextMessage outbound = openwireSession.createTextMessage();
- outbound.setText(testMessageBody);
- outbound.setBooleanProperty("Boolean", bool);
- outbound.setByteProperty("Byte", bValue);
- outbound.setShortProperty("Short", nShort);
- outbound.setIntProperty("Integer", nInt);
- outbound.setFloatProperty("Float", nFloat);
- outbound.setDoubleProperty("Double", nDouble);
- outbound.setStringProperty("String", "test");
- outbound.setLongProperty("Long", nLong);
- outbound.setObjectProperty("BooleanObject", bool);
-
- openwireProducer.send(outbound);
-
- Message inbound = amqpConsumer.receive(2500);
-
- propertyNames = inbound.getPropertyNames();
- int propertyCount = 0;
- do {
- String propertyName = propertyNames.nextElement();
-
- if (propertyName.indexOf("JMS") != 0) {
- propertyCount++;
- if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
- propertyName.equals("Integer") ||
propertyName.equals("Short") ||
- propertyName.equals("Float") ||
propertyName.equals("Double") ||
- propertyName.equals("String") ||
propertyName.equals("Long") ||
- propertyName.equals("BooleanObject")) {
-
- LOG.debug("Appclication Property set by client is: {}",
propertyName);
- if (!inbound.propertyExists(propertyName)) {
- assertTrue(inbound.propertyExists(propertyName));
- LOG.debug("Positive propertyExists test failed for
{}", propertyName);
- } else if (inbound.propertyExists(propertyName + "1")) {
- LOG.debug("Negative propertyExists test failed for {}
1", propertyName);
- fail("Negative propertyExists test failed for " +
propertyName + "1");
+ try (Connection openwire = createJMSConnection(); Connection amqp =
createConnection()) {
+ openwire.start();
+ amqp.start();
+
+ Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ Destination queue =
openwireSession.createQueue(getDestinationName());
+
+ MessageProducer openwireProducer =
openwireSession.createProducer(queue);
+ MessageConsumer amqpConsumer = amqpSession.createConsumer(queue);
+
+ TextMessage outbound = openwireSession.createTextMessage();
+ outbound.setText(testMessageBody);
+ outbound.setBooleanProperty("Boolean", bool);
+ outbound.setByteProperty("Byte", bValue);
+ outbound.setShortProperty("Short", nShort);
+ outbound.setIntProperty("Integer", nInt);
+ outbound.setFloatProperty("Float", nFloat);
+ outbound.setDoubleProperty("Double", nDouble);
+ outbound.setStringProperty("String", "test");
+ outbound.setLongProperty("Long", nLong);
+ outbound.setObjectProperty("BooleanObject", bool);
+
+ openwireProducer.send(outbound);
+
+ Message inbound = amqpConsumer.receive(2500);
Review Comment:
`amqpConsumer.receive(2500)` can return null on timeout; the next line
dereferences `inbound` (`inbound.getPropertyNames()`), which would throw a
NullPointerException and produce a noisy test failure. Add an `assertNotNull`
(optionally with a helpful message) immediately after the receive call.
```suggestion
Message inbound = amqpConsumer.receive(2500);
assertNotNull("Timed out waiting for message", inbound);
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java:
##########
@@ -184,188 +181,177 @@ public void
testMessagePropertiesArePreservedAMQPToOpenWire() throws Exception {
Enumeration<String> propertyNames = null;
String testMessageBody = "Testing msgPropertyExistTest";
- Connection openwire = createJMSConnection();
- Connection amqp = createConnection();
-
- openwire.start();
- amqp.start();
-
- Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Destination queue = openwireSession.createQueue(getDestinationName());
-
- MessageProducer amqpProducer = amqpSession.createProducer(queue);
- MessageConsumer openwireConsumer =
openwireSession.createConsumer(queue);
-
- TextMessage outbound = amqpSession.createTextMessage();
- outbound.setText(testMessageBody);
- outbound.setBooleanProperty("Boolean", bool);
- outbound.setByteProperty("Byte", bValue);
- outbound.setShortProperty("Short", nShort);
- outbound.setIntProperty("Integer", nInt);
- outbound.setFloatProperty("Float", nFloat);
- outbound.setDoubleProperty("Double", nDouble);
- outbound.setStringProperty("String", "test");
- outbound.setLongProperty("Long", nLong);
- outbound.setObjectProperty("BooleanObject", bool);
-
- amqpProducer.send(outbound);
-
- Message inbound = openwireConsumer.receive(2500);
-
- propertyNames = inbound.getPropertyNames();
- int propertyCount = 0;
- do {
- String propertyName = propertyNames.nextElement();
-
- if (propertyName.indexOf("JMS") != 0) {
- propertyCount++;
- if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
- propertyName.equals("Integer") ||
propertyName.equals("Short") ||
- propertyName.equals("Float") ||
propertyName.equals("Double") ||
- propertyName.equals("String") ||
propertyName.equals("Long") ||
- propertyName.equals("BooleanObject")) {
-
- LOG.debug("Appclication Property set by client is: {}",
propertyName);
- if (!inbound.propertyExists(propertyName)) {
- assertTrue(inbound.propertyExists(propertyName));
- LOG.debug("Positive propertyExists test failed for
{}", propertyName);
- } else if (inbound.propertyExists(propertyName + "1")) {
- LOG.debug("Negative propertyExists test failed for {}
1", propertyName);
- fail("Negative propertyExists test failed for " +
propertyName + "1");
+ try (Connection openwire = createJMSConnection(); Connection amqp =
createConnection()) {
+ openwire.start();
+ amqp.start();
+
+ Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ Destination queue =
openwireSession.createQueue(getDestinationName());
+
+ MessageProducer amqpProducer = amqpSession.createProducer(queue);
+ MessageConsumer openwireConsumer =
openwireSession.createConsumer(queue);
+
+ TextMessage outbound = amqpSession.createTextMessage();
+ outbound.setText(testMessageBody);
+ outbound.setBooleanProperty("Boolean", bool);
+ outbound.setByteProperty("Byte", bValue);
+ outbound.setShortProperty("Short", nShort);
+ outbound.setIntProperty("Integer", nInt);
+ outbound.setFloatProperty("Float", nFloat);
+ outbound.setDoubleProperty("Double", nDouble);
+ outbound.setStringProperty("String", "test");
+ outbound.setLongProperty("Long", nLong);
+ outbound.setObjectProperty("BooleanObject", bool);
+
+ amqpProducer.send(outbound);
+
+ Message inbound = openwireConsumer.receive(2500);
+
+ propertyNames = inbound.getPropertyNames();
+ int propertyCount = 0;
+ do {
+ String propertyName = propertyNames.nextElement();
+
+ if (propertyName.indexOf("JMS") != 0) {
+ propertyCount++;
+ if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
+ propertyName.equals("Integer") ||
propertyName.equals("Short") ||
+ propertyName.equals("Float") ||
propertyName.equals("Double") ||
+ propertyName.equals("String") ||
propertyName.equals("Long") ||
+ propertyName.equals("BooleanObject")) {
+
+ LOG.debug("Appclication Property set by client is:
{}", propertyName);
+ if (!inbound.propertyExists(propertyName)) {
+ assertTrue(inbound.propertyExists(propertyName));
+ LOG.debug("Positive propertyExists test failed for
{}", propertyName);
+ } else if (inbound.propertyExists(propertyName + "1"))
{
+ LOG.debug("Negative propertyExists test failed for
{} 1", propertyName);
+ fail("Negative propertyExists test failed for " +
propertyName + "1");
+ }
+ } else {
+ LOG.debug("Appclication Property not set by client:
{}", propertyName);
+ fail("Appclication Property not set by client: " +
propertyName);
Review Comment:
Typo in log / failure message: "Appclication" should be "Application" (both
the LOG message and `fail(...)` message).
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java:
##########
@@ -100,71 +100,68 @@ public void
testMessagePropertiesArePreservedOpenWireToAMQP() throws Exception {
Enumeration<String> propertyNames = null;
String testMessageBody = "Testing msgPropertyExistTest";
- Connection openwire = createJMSConnection();
- Connection amqp = createConnection();
-
- openwire.start();
- amqp.start();
-
- Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Destination queue = openwireSession.createQueue(getDestinationName());
-
- MessageProducer openwireProducer =
openwireSession.createProducer(queue);
- MessageConsumer amqpConsumer = amqpSession.createConsumer(queue);
-
- TextMessage outbound = openwireSession.createTextMessage();
- outbound.setText(testMessageBody);
- outbound.setBooleanProperty("Boolean", bool);
- outbound.setByteProperty("Byte", bValue);
- outbound.setShortProperty("Short", nShort);
- outbound.setIntProperty("Integer", nInt);
- outbound.setFloatProperty("Float", nFloat);
- outbound.setDoubleProperty("Double", nDouble);
- outbound.setStringProperty("String", "test");
- outbound.setLongProperty("Long", nLong);
- outbound.setObjectProperty("BooleanObject", bool);
-
- openwireProducer.send(outbound);
-
- Message inbound = amqpConsumer.receive(2500);
-
- propertyNames = inbound.getPropertyNames();
- int propertyCount = 0;
- do {
- String propertyName = propertyNames.nextElement();
-
- if (propertyName.indexOf("JMS") != 0) {
- propertyCount++;
- if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
- propertyName.equals("Integer") ||
propertyName.equals("Short") ||
- propertyName.equals("Float") ||
propertyName.equals("Double") ||
- propertyName.equals("String") ||
propertyName.equals("Long") ||
- propertyName.equals("BooleanObject")) {
-
- LOG.debug("Appclication Property set by client is: {}",
propertyName);
- if (!inbound.propertyExists(propertyName)) {
- assertTrue(inbound.propertyExists(propertyName));
- LOG.debug("Positive propertyExists test failed for
{}", propertyName);
- } else if (inbound.propertyExists(propertyName + "1")) {
- LOG.debug("Negative propertyExists test failed for {}
1", propertyName);
- fail("Negative propertyExists test failed for " +
propertyName + "1");
+ try (Connection openwire = createJMSConnection(); Connection amqp =
createConnection()) {
+ openwire.start();
+ amqp.start();
+
+ Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ Destination queue =
openwireSession.createQueue(getDestinationName());
+
+ MessageProducer openwireProducer =
openwireSession.createProducer(queue);
+ MessageConsumer amqpConsumer = amqpSession.createConsumer(queue);
+
+ TextMessage outbound = openwireSession.createTextMessage();
+ outbound.setText(testMessageBody);
+ outbound.setBooleanProperty("Boolean", bool);
+ outbound.setByteProperty("Byte", bValue);
+ outbound.setShortProperty("Short", nShort);
+ outbound.setIntProperty("Integer", nInt);
+ outbound.setFloatProperty("Float", nFloat);
+ outbound.setDoubleProperty("Double", nDouble);
+ outbound.setStringProperty("String", "test");
+ outbound.setLongProperty("Long", nLong);
+ outbound.setObjectProperty("BooleanObject", bool);
+
+ openwireProducer.send(outbound);
+
+ Message inbound = amqpConsumer.receive(2500);
+
+ propertyNames = inbound.getPropertyNames();
+ int propertyCount = 0;
+ do {
+ String propertyName = propertyNames.nextElement();
+
+ if (propertyName.indexOf("JMS") != 0) {
+ propertyCount++;
+ if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
+ propertyName.equals("Integer") ||
propertyName.equals("Short") ||
+ propertyName.equals("Float") ||
propertyName.equals("Double") ||
+ propertyName.equals("String") ||
propertyName.equals("Long") ||
+ propertyName.equals("BooleanObject")) {
+
+ LOG.debug("Appclication Property set by client is:
{}", propertyName);
+ if (!inbound.propertyExists(propertyName)) {
Review Comment:
Typo in log message: "Appclication" should be "Application".
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java:
##########
@@ -67,42 +67,42 @@ public void testNativeTransformation() throws Exception {
startBrokerWithAmqpTransport(String.format(AMQP_URL,
"?transport.transformer=native"));
// send "text message" with AMQP JMS API
- Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI);
- amqpConnection.start();
+ try (Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI)) {
+ amqpConnection.start();
- Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = amqpSession.createQueue(TEST_QUEUE);
- MessageProducer p = amqpSession.createProducer(queue);
- p.setPriority(7);
+ Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = amqpSession.createQueue(TEST_QUEUE);
+ MessageProducer p = amqpSession.createProducer(queue);
+ p.setPriority(7);
- TextMessage amqpMessage = amqpSession.createTextMessage();
- amqpMessage.setText("hello");
- p.send(amqpMessage);
+ TextMessage amqpMessage = amqpSession.createTextMessage();
+ amqpMessage.setText("hello");
+ p.send(amqpMessage);
- p.close();
- amqpSession.close();
- amqpConnection.close();
+ p.close();
+ amqpSession.close();
+ }
// receive with openwire JMS
ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory(openwireConnectionURI);
- Connection openwireConn = factory.createConnection();
- openwireConn.start();
- Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue jmsDest = session.createQueue(TEST_QUEUE);
+ try (Connection openwireConn = factory.createConnection()) {
+ openwireConn.start();
+ Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue jmsDest = session.createQueue(TEST_QUEUE);
- MessageConsumer c = session.createConsumer(jmsDest);
+ MessageConsumer c = session.createConsumer(jmsDest);
- Message message = c.receive(1000);
+ Message message = c.receive(1000);
- assertTrue(message instanceof BytesMessage);
- Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
- assertTrue("Didn't use the correct transformation, expected NATIVE",
nativeTransformationUsed);
- assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
- assertEquals(7, message.getJMSPriority());
+ assertTrue(message instanceof BytesMessage);
+ Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
Review Comment:
The variable 'nativeTransformationUsed' is only assigned values of primitive
type and is never 'null', but it is declared with the boxed type 'Boolean'.
```suggestion
boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java:
##########
@@ -100,71 +100,68 @@ public void
testMessagePropertiesArePreservedOpenWireToAMQP() throws Exception {
Enumeration<String> propertyNames = null;
String testMessageBody = "Testing msgPropertyExistTest";
- Connection openwire = createJMSConnection();
- Connection amqp = createConnection();
-
- openwire.start();
- amqp.start();
-
- Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Destination queue = openwireSession.createQueue(getDestinationName());
-
- MessageProducer openwireProducer =
openwireSession.createProducer(queue);
- MessageConsumer amqpConsumer = amqpSession.createConsumer(queue);
-
- TextMessage outbound = openwireSession.createTextMessage();
- outbound.setText(testMessageBody);
- outbound.setBooleanProperty("Boolean", bool);
- outbound.setByteProperty("Byte", bValue);
- outbound.setShortProperty("Short", nShort);
- outbound.setIntProperty("Integer", nInt);
- outbound.setFloatProperty("Float", nFloat);
- outbound.setDoubleProperty("Double", nDouble);
- outbound.setStringProperty("String", "test");
- outbound.setLongProperty("Long", nLong);
- outbound.setObjectProperty("BooleanObject", bool);
-
- openwireProducer.send(outbound);
-
- Message inbound = amqpConsumer.receive(2500);
-
- propertyNames = inbound.getPropertyNames();
- int propertyCount = 0;
- do {
- String propertyName = propertyNames.nextElement();
-
- if (propertyName.indexOf("JMS") != 0) {
- propertyCount++;
- if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
- propertyName.equals("Integer") ||
propertyName.equals("Short") ||
- propertyName.equals("Float") ||
propertyName.equals("Double") ||
- propertyName.equals("String") ||
propertyName.equals("Long") ||
- propertyName.equals("BooleanObject")) {
-
- LOG.debug("Appclication Property set by client is: {}",
propertyName);
- if (!inbound.propertyExists(propertyName)) {
- assertTrue(inbound.propertyExists(propertyName));
- LOG.debug("Positive propertyExists test failed for
{}", propertyName);
- } else if (inbound.propertyExists(propertyName + "1")) {
- LOG.debug("Negative propertyExists test failed for {}
1", propertyName);
- fail("Negative propertyExists test failed for " +
propertyName + "1");
+ try (Connection openwire = createJMSConnection(); Connection amqp =
createConnection()) {
+ openwire.start();
+ amqp.start();
+
+ Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ Destination queue =
openwireSession.createQueue(getDestinationName());
+
+ MessageProducer openwireProducer =
openwireSession.createProducer(queue);
+ MessageConsumer amqpConsumer = amqpSession.createConsumer(queue);
+
+ TextMessage outbound = openwireSession.createTextMessage();
+ outbound.setText(testMessageBody);
+ outbound.setBooleanProperty("Boolean", bool);
+ outbound.setByteProperty("Byte", bValue);
+ outbound.setShortProperty("Short", nShort);
+ outbound.setIntProperty("Integer", nInt);
+ outbound.setFloatProperty("Float", nFloat);
+ outbound.setDoubleProperty("Double", nDouble);
+ outbound.setStringProperty("String", "test");
+ outbound.setLongProperty("Long", nLong);
+ outbound.setObjectProperty("BooleanObject", bool);
+
+ openwireProducer.send(outbound);
+
+ Message inbound = amqpConsumer.receive(2500);
+
+ propertyNames = inbound.getPropertyNames();
+ int propertyCount = 0;
+ do {
+ String propertyName = propertyNames.nextElement();
+
+ if (propertyName.indexOf("JMS") != 0) {
+ propertyCount++;
+ if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
+ propertyName.equals("Integer") ||
propertyName.equals("Short") ||
+ propertyName.equals("Float") ||
propertyName.equals("Double") ||
+ propertyName.equals("String") ||
propertyName.equals("Long") ||
+ propertyName.equals("BooleanObject")) {
+
+ LOG.debug("Appclication Property set by client is:
{}", propertyName);
+ if (!inbound.propertyExists(propertyName)) {
+ assertTrue(inbound.propertyExists(propertyName));
+ LOG.debug("Positive propertyExists test failed for
{}", propertyName);
+ } else if (inbound.propertyExists(propertyName + "1"))
{
+ LOG.debug("Negative propertyExists test failed for
{} 1", propertyName);
+ fail("Negative propertyExists test failed for " +
propertyName + "1");
+ }
+ } else {
+ LOG.debug("Appclication Property not set by client:
{}", propertyName);
+ fail("Appclication Property not set by client: " +
propertyName);
Review Comment:
Typo in log / failure message: "Appclication" should be "Application" (both
the LOG message and `fail(...)` message).
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java:
##########
@@ -161,40 +161,40 @@ public void testJmsTransformation() throws Exception {
startBrokerWithAmqpTransport(String.format(AMQP_URL,
"?transport.transformer=jms"));
// send "text message" with AMQP JMS API
- Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI);
- amqpConnection.start();
+ try (Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI)) {
+ amqpConnection.start();
- Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = amqpSession.createQueue(TEST_QUEUE);
- MessageProducer p = amqpSession.createProducer(queue);
+ Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = amqpSession.createQueue(TEST_QUEUE);
+ MessageProducer p = amqpSession.createProducer(queue);
- TextMessage amqpMessage = amqpSession.createTextMessage();
- amqpMessage.setText("hello");
- p.send(amqpMessage);
+ TextMessage amqpMessage = amqpSession.createTextMessage();
+ amqpMessage.setText("hello");
+ p.send(amqpMessage);
- p.close();
- amqpSession.close();
- amqpConnection.close();
+ p.close();
+ amqpSession.close();
+ }
// receive with openwire JMS
ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory(openwireConnectionURI);
- Connection openwireConn = factory.createConnection();
- openwireConn.start();
- Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue jmsDest = session.createQueue(TEST_QUEUE);
+ try (Connection openwireConn = factory.createConnection()) {
+ openwireConn.start();
+ Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue jmsDest = session.createQueue(TEST_QUEUE);
- MessageConsumer c = session.createConsumer(jmsDest);
+ MessageConsumer c = session.createConsumer(jmsDest);
- Message message = c.receive(1000);
+ Message message = c.receive(1000);
- assertTrue(message instanceof TextMessage);
- Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
- assertFalse("Didn't use the correct transformation, expected NOT to be
NATIVE", nativeTransformationUsed);
- assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
+ assertTrue(message instanceof TextMessage);
+ Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
+ assertFalse("Didn't use the correct transformation, expected NOT
to be NATIVE", nativeTransformationUsed);
+ assertEquals(DeliveryMode.PERSISTENT,
message.getJMSDeliveryMode());
Review Comment:
`c.receive(1000)` can return null; `assertTrue(message instanceof
TextMessage)` will then fail without clearly indicating a timeout. Add an
`assertNotNull` before the type assertion for clearer test failures.
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSInteroperabilityTest.java:
##########
@@ -184,188 +181,177 @@ public void
testMessagePropertiesArePreservedAMQPToOpenWire() throws Exception {
Enumeration<String> propertyNames = null;
String testMessageBody = "Testing msgPropertyExistTest";
- Connection openwire = createJMSConnection();
- Connection amqp = createConnection();
-
- openwire.start();
- amqp.start();
-
- Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-
- Destination queue = openwireSession.createQueue(getDestinationName());
-
- MessageProducer amqpProducer = amqpSession.createProducer(queue);
- MessageConsumer openwireConsumer =
openwireSession.createConsumer(queue);
-
- TextMessage outbound = amqpSession.createTextMessage();
- outbound.setText(testMessageBody);
- outbound.setBooleanProperty("Boolean", bool);
- outbound.setByteProperty("Byte", bValue);
- outbound.setShortProperty("Short", nShort);
- outbound.setIntProperty("Integer", nInt);
- outbound.setFloatProperty("Float", nFloat);
- outbound.setDoubleProperty("Double", nDouble);
- outbound.setStringProperty("String", "test");
- outbound.setLongProperty("Long", nLong);
- outbound.setObjectProperty("BooleanObject", bool);
-
- amqpProducer.send(outbound);
-
- Message inbound = openwireConsumer.receive(2500);
-
- propertyNames = inbound.getPropertyNames();
- int propertyCount = 0;
- do {
- String propertyName = propertyNames.nextElement();
-
- if (propertyName.indexOf("JMS") != 0) {
- propertyCount++;
- if (propertyName.equals("Boolean") ||
propertyName.equals("Byte") ||
- propertyName.equals("Integer") ||
propertyName.equals("Short") ||
- propertyName.equals("Float") ||
propertyName.equals("Double") ||
- propertyName.equals("String") ||
propertyName.equals("Long") ||
- propertyName.equals("BooleanObject")) {
-
- LOG.debug("Appclication Property set by client is: {}",
propertyName);
- if (!inbound.propertyExists(propertyName)) {
- assertTrue(inbound.propertyExists(propertyName));
- LOG.debug("Positive propertyExists test failed for
{}", propertyName);
- } else if (inbound.propertyExists(propertyName + "1")) {
- LOG.debug("Negative propertyExists test failed for {}
1", propertyName);
- fail("Negative propertyExists test failed for " +
propertyName + "1");
+ try (Connection openwire = createJMSConnection(); Connection amqp =
createConnection()) {
+ openwire.start();
+ amqp.start();
+
+ Session openwireSession = openwire.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Session amqpSession = amqp.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ Destination queue =
openwireSession.createQueue(getDestinationName());
+
+ MessageProducer amqpProducer = amqpSession.createProducer(queue);
+ MessageConsumer openwireConsumer =
openwireSession.createConsumer(queue);
+
+ TextMessage outbound = amqpSession.createTextMessage();
+ outbound.setText(testMessageBody);
+ outbound.setBooleanProperty("Boolean", bool);
+ outbound.setByteProperty("Byte", bValue);
+ outbound.setShortProperty("Short", nShort);
+ outbound.setIntProperty("Integer", nInt);
+ outbound.setFloatProperty("Float", nFloat);
+ outbound.setDoubleProperty("Double", nDouble);
+ outbound.setStringProperty("String", "test");
+ outbound.setLongProperty("Long", nLong);
+ outbound.setObjectProperty("BooleanObject", bool);
+
+ amqpProducer.send(outbound);
+
+ Message inbound = openwireConsumer.receive(2500);
Review Comment:
`openwireConsumer.receive(2500)` can return null on timeout;
`inbound.getPropertyNames()` will then throw a NullPointerException. Add an
`assertNotNull` for `inbound` right after the receive call to make test
failures clearer.
```suggestion
Message inbound = openwireConsumer.receive(2500);
assertNotNull("Timed out waiting for message on OpenWire
consumer", inbound);
```
##########
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java:
##########
@@ -161,40 +161,40 @@ public void testJmsTransformation() throws Exception {
startBrokerWithAmqpTransport(String.format(AMQP_URL,
"?transport.transformer=jms"));
// send "text message" with AMQP JMS API
- Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI);
- amqpConnection.start();
+ try (Connection amqpConnection =
JMSClientContext.INSTANCE.createConnection(amqpConnectionURI)) {
+ amqpConnection.start();
- Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue queue = amqpSession.createQueue(TEST_QUEUE);
- MessageProducer p = amqpSession.createProducer(queue);
+ Session amqpSession = amqpConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue queue = amqpSession.createQueue(TEST_QUEUE);
+ MessageProducer p = amqpSession.createProducer(queue);
- TextMessage amqpMessage = amqpSession.createTextMessage();
- amqpMessage.setText("hello");
- p.send(amqpMessage);
+ TextMessage amqpMessage = amqpSession.createTextMessage();
+ amqpMessage.setText("hello");
+ p.send(amqpMessage);
- p.close();
- amqpSession.close();
- amqpConnection.close();
+ p.close();
+ amqpSession.close();
+ }
// receive with openwire JMS
ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory(openwireConnectionURI);
- Connection openwireConn = factory.createConnection();
- openwireConn.start();
- Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
- Queue jmsDest = session.createQueue(TEST_QUEUE);
+ try (Connection openwireConn = factory.createConnection()) {
+ openwireConn.start();
+ Session session = openwireConn.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ Queue jmsDest = session.createQueue(TEST_QUEUE);
- MessageConsumer c = session.createConsumer(jmsDest);
+ MessageConsumer c = session.createConsumer(jmsDest);
- Message message = c.receive(1000);
+ Message message = c.receive(1000);
- assertTrue(message instanceof TextMessage);
- Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
- assertFalse("Didn't use the correct transformation, expected NOT to be
NATIVE", nativeTransformationUsed);
- assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
+ assertTrue(message instanceof TextMessage);
+ Boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
Review Comment:
The variable 'nativeTransformationUsed' is only assigned values of primitive
type and is never 'null', but it is declared with the boxed type 'Boolean'.
```suggestion
boolean nativeTransformationUsed =
message.getBooleanProperty("JMS_AMQP_NATIVE");
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
