Fix AMQP resource creation in RMQObjectFactory

The exchange/routing key/queue were all marked as non-nullable, whereas
they can be null. The RMQDestination constructor takes care of checking
the arguments.

Fixes #129

(cherry picked from commit 1ef64f8)

Author: acogoluegnes

src/main/java/com/rabbitmq/jms/admin/RMQObjectFactory.java

@@ -227,9 +227,9 @@ public Object createDestination(Reference ref, Hashtable<?, ?> environment, Name
         String dname = getStringProperty(ref, environment, "destinationName", false, null);
         boolean amqp = getBooleanProperty(ref, environment, "amqp", true, false);
         if (amqp) {
-            String amqpExchangeName = getStringProperty(ref, environment, "amqpExchangeName", false, null);
-            String amqpRoutingKey = getStringProperty(ref, environment,"amqpRoutingKey", false, null);
-            String amqpQueueName = getStringProperty(ref, environment, "amqpQueueName", false, null);
+            String amqpExchangeName = getStringProperty(ref, environment, "amqpExchangeName", true, null);
+            String amqpRoutingKey = getStringProperty(ref, environment,"amqpRoutingKey", true, null);
+            String amqpQueueName = getStringProperty(ref, environment, "amqpQueueName", true, null);
             return new RMQDestination(dname, amqpExchangeName, amqpRoutingKey, amqpQueueName);
         } else {
             return new RMQDestination(dname, !topic, false);

src/test/java/com/rabbitmq/jms/admin/RMQDestinationTest.java

@@ -46,4 +46,34 @@ void amqpDestinationRegeneration() throws Exception {
         assertThat(newReference.getAmqpQueueName()).isEqualTo("queue");
     }
 
+    @Test
+    void amqpDestinationExchangeRoutingKeyOnlyRegeneration() throws Exception {
+        RMQDestination destination = new RMQDestination(
+                "destination", "exchange", "routing-key", null
+        );
+        Reference reference = destination.getReference();
+        RMQDestination newReference = (RMQDestination) rmqObjectFactory.getObjectInstance(reference, null, null, null);
+        assertThat(newReference.isQueue()).isTrue();
+        assertThat(newReference.getDestinationName()).isEqualTo("destination");
+        assertThat(newReference.isAmqp()).isTrue();
+        assertThat(newReference.getAmqpExchangeName()).isEqualTo("exchange");
+        assertThat(newReference.getAmqpRoutingKey()).isEqualTo("routing-key");
+        assertThat(newReference.getAmqpQueueName()).isNull();
+    }
+
+    @Test
+    void amqpDestinationQueueOnlyRegeneration() throws Exception {
+        RMQDestination destination = new RMQDestination(
+                "destination", null, null, "queue"
+        );
+        Reference reference = destination.getReference();
+        RMQDestination newReference = (RMQDestination) rmqObjectFactory.getObjectInstance(reference, null, null, null);
+        assertThat(newReference.isQueue()).isTrue();
+        assertThat(newReference.getDestinationName()).isEqualTo("destination");
+        assertThat(newReference.isAmqp()).isTrue();
+        assertThat(newReference.getAmqpExchangeName()).isNull();
+        assertThat(newReference.getAmqpRoutingKey()).isNull();
+        assertThat(newReference.getAmqpQueueName()).isEqualTo("queue");
+    }
+
 }

src/test/java/com/rabbitmq/jms/admin/RMQObjectFactoryTest.java

@@ -91,7 +91,7 @@ public void getObjectInstanceShouldCreateAMQPDestinationQUEUEViaEnvironment() th
 
 
     @Test
-    public void getObjectInstanceShouldCreateARMQDestinationTOPICViaEnvironment() throws Exception {
+    public void getObjectInstanceShouldCreateAMQPDestinationTOPICViaEnvironment() throws Exception {
 
         Hashtable<?, ?> environment = new Hashtable<Object, Object>() {{
             put("className", "javax.jms.Topic");
@@ -116,15 +116,14 @@ public void getObjectInstanceShouldThrowNamingExceptionWhenMissingRequiredProper
 
         Hashtable<?, ?> environment = new Hashtable<Object, Object>() {{
             put("className", "javax.jms.Queue");
-            put("destinationName", "TEST_QUEUE");
             put("amqp", "true");
         }};
 
         try {
             rmqObjectFactory.getObjectInstance("anything but a javax.naming.Reference", new CompositeName("java:global/jms/TestConnectionFactory"), null, environment);
             fail("Should have thrown a NamingException");
         } catch (NamingException ne) {
-            assertEquals("Property [amqpExchangeName] may not be null.", ne.getMessage());
+            assertEquals("Property [destinationName] may not be null.", ne.getMessage());
         }
 
     }