Merge branch '2.1.x'

Closes gh-18323

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java

@@ -23,14 +23,15 @@
 import java.util.UUID;
 
 import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.TextMessage;
 
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
 import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.server.BindingQueryResult;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
 import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
@@ -51,9 +52,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.SessionCallback;
-import org.springframework.jms.support.destination.DestinationResolver;
-import org.springframework.jms.support.destination.DynamicDestinationResolver;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -206,9 +204,9 @@ void embeddedServerWithDestinations() {
 					DestinationChecker checker = new DestinationChecker(context);
 					checker.checkQueue("Queue1", true);
 					checker.checkQueue("Queue2", true);
-					checker.checkQueue("QueueWillNotBeAutoCreated", true);
+					checker.checkQueue("NonExistentQueue", false);
 					checker.checkTopic("Topic1", true);
-					checker.checkTopic("TopicWillBeAutoCreated", true);
+					checker.checkTopic("NonExistentTopic", false);
 				});
 	}
 
@@ -228,8 +226,8 @@ void embeddedServiceWithCustomJmsConfiguration() {
 				.withPropertyValues("spring.artemis.embedded.queues=Queue1,Queue2").run((context) -> {
 					DestinationChecker checker = new DestinationChecker(context);
 					checker.checkQueue("custom", true); // See CustomJmsConfiguration
-					checker.checkQueue("Queue1", true);
-					checker.checkQueue("Queue2", true);
+					checker.checkQueue("Queue1", false);
+					checker.checkQueue("Queue2", false);
 				});
 	}
 
@@ -273,10 +271,10 @@ void severalEmbeddedBrokers() {
 								.isLessThan(secondProperties.getEmbedded().getServerId());
 						DestinationChecker firstChecker = new DestinationChecker(first);
 						firstChecker.checkQueue("Queue1", true);
-						firstChecker.checkQueue("Queue2", true);
+						firstChecker.checkQueue("Queue2", false);
 						DestinationChecker secondChecker = new DestinationChecker(second);
+						secondChecker.checkQueue("Queue1", false);
 						secondChecker.checkQueue("Queue2", true);
-						secondChecker.checkQueue("Queue1", true);
 					});
 				});
 	}
@@ -293,10 +291,9 @@ void connectToASpecificEmbeddedBroker() {
 									// Do not start a specific one
 									"spring.artemis.embedded.enabled=false")
 							.run((secondContext) -> {
-								DestinationChecker firstChecker = new DestinationChecker(first);
-								firstChecker.checkQueue("Queue1", true);
-								DestinationChecker secondChecker = new DestinationChecker(secondContext);
-								secondChecker.checkQueue("Queue1", true);
+								first.getBean(JmsTemplate.class).convertAndSend("Queue1", "test");
+								assertThat(secondContext.getBean(JmsTemplate.class).receiveAndConvert("Queue1"))
+										.isEqualTo("test");
 							});
 				});
 	}
@@ -382,40 +379,31 @@ private TransportConfiguration getSingleTransportConfiguration(ActiveMQConnectio
 
 	private static final class DestinationChecker {
 
-		private final JmsTemplate jmsTemplate;
-
-		private final DestinationResolver destinationResolver;
+		private final EmbeddedJMS embeddedJms;
 
 		private DestinationChecker(ApplicationContext applicationContext) {
-			this.jmsTemplate = applicationContext.getBean(JmsTemplate.class);
-			this.destinationResolver = new DynamicDestinationResolver();
+			this.embeddedJms = applicationContext.getBean(EmbeddedJMS.class);
 		}
 
 		void checkQueue(String name, boolean shouldExist) {
-			checkDestination(name, false, shouldExist);
+			checkDestination(name, RoutingType.ANYCAST, shouldExist);
 		}
 
 		void checkTopic(String name, boolean shouldExist) {
-			checkDestination(name, true, shouldExist);
+			checkDestination(name, RoutingType.MULTICAST, shouldExist);
 		}
 
-		void checkDestination(String name, final boolean pubSub, final boolean shouldExist) {
-			this.jmsTemplate.execute((SessionCallback<Void>) (session) -> {
-				try {
-					Destination destination = this.destinationResolver.resolveDestinationName(session, name, pubSub);
-					if (!shouldExist) {
-						throw new IllegalStateException(
-								"Destination '" + name + "' was not expected but got " + destination);
-					}
-				}
-				catch (JMSException ex) {
-					if (shouldExist) {
-						throw new IllegalStateException(
-								"Destination '" + name + "' was expected but got " + ex.getMessage());
-					}
+		void checkDestination(String name, RoutingType routingType, boolean shouldExist) {
+			try {
+				BindingQueryResult result = this.embeddedJms.getActiveMQServer().bindingQuery(new SimpleString(name));
+				assertThat(result.isExists()).isEqualTo(shouldExist);
+				if (shouldExist) {
+					assertThat(result.getAddressInfo().getRoutingType()).isEqualTo(routingType);
 				}
-				return null;
-			});
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex);
+			}
 		}
 
 	}