You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/10/10 14:05:43 UTC
[1/2] git commit: simplify setting the encoding method and ensure it
is a no-op if the method is unchanged
Repository: qpid-jms
Updated Branches:
refs/heads/master a6d04de00 -> 5c46a63c3
simplify setting the encoding method and ensure it is a no-op if the method is unchanged
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8aa3d4d9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8aa3d4d9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8aa3d4d9
Branch: refs/heads/master
Commit: 8aa3d4d9824069a1e904a70268793126caffb4bc
Parents: a6d04de
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Oct 10 12:36:15 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Oct 10 12:36:15 2014 +0100
----------------------------------------------------------------------
.../message/AmqpJmsObjectMessageFacade.java | 25 ++++++++++----------
.../amqp/message/AmqpObjectTypeDelegate.java | 1 +
.../message/AmqpSerializedObjectDelegate.java | 5 ++++
.../amqp/message/AmqpTypedObjectDelegate.java | 5 ++++
4 files changed, 24 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
index 894ff3a..4c18f7e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java
@@ -126,22 +126,23 @@ public class AmqpJmsObjectMessageFacade extends AmqpJmsMessageFacade implements
}
void setUseAmqpTypedEncoding(boolean useAmqpTypedEncoding) throws JMSException {
- if (useAmqpTypedEncoding && delegate instanceof AmqpSerializedObjectDelegate) {
- AmqpTypedObjectDelegate newDelegate = new AmqpTypedObjectDelegate(message);
+ if (useAmqpTypedEncoding != delegate.isAmqpTypeEncoded()) {
try {
- newDelegate.setObject(delegate.getObject());
- } catch (ClassNotFoundException | IOException e) {
- throw JmsExceptionSupport.create(e);
- }
- delegate = newDelegate;
- } else if (delegate instanceof AmqpTypedObjectDelegate) {
- AmqpSerializedObjectDelegate newDelegate = new AmqpSerializedObjectDelegate(message);
- try {
- newDelegate.setObject(delegate.getObject());
+ Serializable existingObject = delegate.getObject();
+
+ AmqpObjectTypeDelegate newDelegate = null;
+ if (useAmqpTypedEncoding) {
+ newDelegate = new AmqpTypedObjectDelegate(message);
+ } else {
+ newDelegate = new AmqpSerializedObjectDelegate(message);
+ }
+
+ newDelegate.setObject(existingObject);
+
+ delegate = newDelegate;
} catch (ClassNotFoundException | IOException e) {
throw JmsExceptionSupport.create(e);
}
- delegate = newDelegate;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java
index cec37f0..fb74e68 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java
@@ -53,4 +53,5 @@ public interface AmqpObjectTypeDelegate {
*/
void onSend();
+ boolean isAmqpTypeEncoded();
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java
index d22d23a..647286e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java
@@ -101,4 +101,9 @@ public class AmqpSerializedObjectDelegate implements AmqpObjectTypeDelegate {
public void onSend() {
this.message.setContentType(CONTENT_TYPE);
}
+
+ @Override
+ public boolean isAmqpTypeEncoded() {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
index e28dc39..36cdfd7 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
@@ -107,4 +107,9 @@ public class AmqpTypedObjectDelegate implements AmqpObjectTypeDelegate {
serializable instanceof List<?> ||
serializable.getClass().isArray();
}
+
+ @Override
+ public boolean isAmqpTypeEncoded() {
+ return true;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] git commit: start on unit tests for AmqpJmsObjectMessageFacade
Posted by ro...@apache.org.
start on unit tests for AmqpJmsObjectMessageFacade
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5c46a63c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5c46a63c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5c46a63c
Branch: refs/heads/master
Commit: 5c46a63c38f8404fcb0dc5607baf690b0edacae1
Parents: 8aa3d4d
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Oct 10 12:54:15 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Oct 10 12:54:15 2014 +0100
----------------------------------------------------------------------
.../message/AmqpJmsMessageTypesTestCase.java | 8 ++
.../message/AmqpJmsObjectMessageFacadeTest.java | 84 ++++++++++++++++++++
2 files changed, 92 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5c46a63c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java
index a39afcd..8ad585f 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java
@@ -78,6 +78,14 @@ public class AmqpJmsMessageTypesTestCase extends QpidJmsTestCase {
return new AmqpJmsStreamMessageFacade(amqpConsumer, message);
}
+ protected AmqpJmsObjectMessageFacade createNewObjectMessageFacade(boolean javaSerialized) {
+ return new AmqpJmsObjectMessageFacade(createMockAmqpConnection(), javaSerialized);
+ }
+
+ protected AmqpJmsObjectMessageFacade createReceivedObjectMessageFacade(AmqpConsumer amqpConsumer, Message message) {
+ return new AmqpJmsObjectMessageFacade(amqpConsumer, message);
+ }
+
protected AmqpConsumer createMockAmqpConsumer() {
AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class);
Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5c46a63c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
new file mode 100644
index 0000000..4b3e422
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.qpid.jms.provider.amqp.message;
+
+import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_MSG_TYPE;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_OBJECT_MESSAGE;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.getSymbol;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
+import org.apache.qpid.proton.message.Message;
+import org.junit.Test;
+
+/**
+ * Tests for class AmqpJmsObjectMessageFacade
+ */
+public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
+
+ // ---------- Test initial state of newly created message -----------------//
+
+ @Test
+ public void testNewMessageToSendContainsMessageTypeAnnotation() throws Exception {
+ AmqpJmsObjectMessageFacade amqpObjectMessageFacade = createNewObjectMessageFacade(true);
+
+ Message protonMessage = amqpObjectMessageFacade.getAmqpMessage();
+ MessageAnnotations annotations = protonMessage.getMessageAnnotations();
+ Map<Symbol, Object> annotationsMap = annotations.getValue();
+
+ assertNotNull("MessageAnnotations section was not present", annotations);
+ assertNotNull("MessageAnnotations section value was not present", annotationsMap);
+
+ assertTrue("expected message type annotation to be present", annotationsMap.containsKey(AmqpMessageSupport.getSymbol(JMS_MSG_TYPE)));
+ assertEquals("unexpected value for message type annotation value", JMS_OBJECT_MESSAGE, annotationsMap.get(getSymbol(JMS_MSG_TYPE)));
+ assertEquals(JMS_OBJECT_MESSAGE, amqpObjectMessageFacade.getJmsMsgType());
+ }
+
+ @Test
+ public void testNewMessageToSendReturnsNullObject() throws Exception {
+ doNewMessageToSendReturnsNullObjectTestImpl(true);
+ }
+
+ @Test
+ public void testNewAmqpTypedMessageToSendReturnsNullObject() throws Exception {
+ doNewMessageToSendReturnsNullObjectTestImpl(false);
+ }
+
+ private void doNewMessageToSendReturnsNullObjectTestImpl(boolean javaSerialized) throws Exception {
+ AmqpJmsObjectMessageFacade amqpObjectMessageFacade = createNewObjectMessageFacade(javaSerialized);
+ amqpObjectMessageFacade.clearBody();
+ assertNull(amqpObjectMessageFacade.getObject());
+ }
+
+ // ---------- test for normal message operations -------------------------//
+
+ // ---------- test handling of received messages -------------------------//
+
+ @Test
+ public void testGetObjectUsingReceivedMessageWithNoBodySectionReturnsNull() throws Exception {
+ Message message = Message.Factory.create();
+ AmqpJmsObjectMessageFacade amqpObjectMessageFacade = createReceivedObjectMessageFacade(createMockAmqpConsumer(), message);
+
+ assertNull("Expected null object", amqpObjectMessageFacade.getObject());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org