From 2861c7651d491fb5c8e8ff802297510bb0bd2753 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Sun, 10 Apr 2016 07:55:59 -0700
Subject: [PATCH] Polish

---
 .../ActiveMQConnectionFactoryFactory.java     | 33 ++++++++++---------
 ...TomcatEmbeddedServletContainerFactory.java |  1 +
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java
index 4a29b1a661b..7b0f419c391 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.jms.activemq;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.apache.activemq.ActiveMQConnectionFactory;
 
 import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQProperties.Packages;
@@ -56,27 +58,28 @@ class ActiveMQConnectionFactoryFactory {
 
 	private <T extends ActiveMQConnectionFactory> T doCreateConnectionFactory(
 			Class<T> factoryClass) throws Exception {
+		T factory = createConnectionFactoryInstance(factoryClass);
+		Packages packages = this.properties.getPackages();
+		if (packages.getTrustAll() != null) {
+			factory.setTrustAllPackages(packages.getTrustAll());
+		}
+		if (!packages.getTrusted().isEmpty()) {
+			factory.setTrustedPackages(packages.getTrusted());
+		}
+		return factory;
+	}
+
+	private <T extends ActiveMQConnectionFactory> T createConnectionFactoryInstance(
+			Class<T> factoryClass) throws InstantiationException, IllegalAccessException,
+					InvocationTargetException, NoSuchMethodException {
 		String brokerUrl = determineBrokerUrl();
 		String user = this.properties.getUser();
 		String password = this.properties.getPassword();
-		T activeMqConnectionFactory;
 		if (StringUtils.hasLength(user) && StringUtils.hasLength(password)) {
-			activeMqConnectionFactory = factoryClass
-					.getConstructor(String.class, String.class, String.class)
+			return factoryClass.getConstructor(String.class, String.class, String.class)
 					.newInstance(user, password, brokerUrl);
 		}
-		else {
-			activeMqConnectionFactory = factoryClass.getConstructor(String.class)
-					.newInstance(brokerUrl);
-		}
-		Packages packages = this.properties.getPackages();
-		if (packages.getTrustAll() != null) {
-			activeMqConnectionFactory.setTrustAllPackages(packages.getTrustAll());
-		}
-		if (!packages.getTrusted().isEmpty()) {
-			activeMqConnectionFactory.setTrustedPackages(packages.getTrusted());
-		}
-		return activeMqConnectionFactory;
+		return factoryClass.getConstructor(String.class).newInstance(brokerUrl);
 	}
 
 	String determineBrokerUrl() {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
index 6292dffbb35..fb97d2a8ce6 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -732,6 +732,7 @@ public class TomcatEmbeddedServletContainerFactory
 	 */
 	private static class StoreMergedWebXmlListener implements LifecycleListener {
 
+		@SuppressWarnings("deprecation")
 		private final String MERGED_WEB_XML = org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML;
 
 		@Override