root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2016-04-10 07:55:59 -07:00
parent e992d389e7
commit 2861c7651d
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java
View File

@ -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() {

1
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -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