Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java

@@ -364,6 +364,7 @@ public class EndpointWebMvcChildContextConfiguration {
 		}
 
 		abstract void customize(T container);
+
 	}
 
 	static class TomcatAccessLogCustomizer

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java

@@ -188,8 +188,9 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 		}
 		if (isSpringSecurityAuthentication(principal)) {
 			Authentication authentication = (Authentication) principal;
-			List<String> roles = Arrays.asList(StringUtils.trimArrayElements(StringUtils
+			List<String> roles = Arrays.asList(StringUtils
-					.commaDelimitedListToStringArray(this.roleResolver.getProperty("roles", "ROLE_ADMIN"))));
+					.trimArrayElements(StringUtils.commaDelimitedListToStringArray(
+							this.roleResolver.getProperty("roles", "ROLE_ADMIN"))));
 			for (GrantedAuthority authority : authentication.getAuthorities()) {
 				String name = authority.getAuthority();
 				for (String role : roles) {

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java

@@ -42,7 +42,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link EndpointWebMvcHypermediaManagementContextConfigurationTests}.
+ * Tests for {@link EndpointWebMvcHypermediaManagementContextConfiguration}.
  *
  * @author Andy Wilkinson
  */

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java

@@ -60,15 +60,18 @@ public class HealthMvcEndpointTests {
 
 	private MockEnvironment environment;
 
-	private UsernamePasswordAuthenticationToken user = createAuthenticationToken("ROLE_USER");
+	private UsernamePasswordAuthenticationToken user = createAuthenticationToken(
+			"ROLE_USER");
 
-	private UsernamePasswordAuthenticationToken admin = createAuthenticationToken("ROLE_ADMIN");
+	private UsernamePasswordAuthenticationToken admin = createAuthenticationToken(
+			"ROLE_ADMIN");
 
-	private UsernamePasswordAuthenticationToken hero = createAuthenticationToken("ROLE_HERO");
+	private UsernamePasswordAuthenticationToken hero = createAuthenticationToken(
+			"ROLE_HERO");
 
-	private UsernamePasswordAuthenticationToken createAuthenticationToken(String authority) {
+	private UsernamePasswordAuthenticationToken createAuthenticationToken(
-		return new UsernamePasswordAuthenticationToken(
+			String authority) {
-				"user", "password",
+		return new UsernamePasswordAuthenticationToken("user", "password",
 				AuthorityUtils.commaSeparatedStringToAuthorityList(authority));
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java

@@ -24,10 +24,10 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapt
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 /**
- * A {@code RepositoryRestConfigurer} that applies that applies configuration items
+ * A {@code RepositoryRestConfigurer} that applies that applies configuration items from
- * from the {@code spring.data.rest} namespace to Spring Data REST. Also, if a
+ * the {@code spring.data.rest} namespace to Spring Data REST. Also, if a
- * {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring
+ * {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring Data
- * Data REST's {@link ObjectMapper ObjectMappers}.
+ * REST's {@link ObjectMapper ObjectMappers}.
  *
  * @author Andy Wilkinson
  * @author Stephane Nicoll

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java

@@ -139,10 +139,12 @@ public class DataSourceAutoConfiguration {
 		}
 
 		@ConditionalOnProperty(prefix = "spring.datasource", name = "type")
-		static class ExplicitType { }
+		static class ExplicitType {
+		}
 
 		@Conditional(PooledDataSourceAvailableCondition.class)
-		static class PooledDataSourceAvailable { }
+		static class PooledDataSourceAvailable {
+		}
 
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java

@@ -114,10 +114,10 @@ abstract class DataSourceConfiguration {
 	static class Generic {
 
 		@Bean
-		public DataSource dataSource(
+		public DataSource dataSource(DataSourceProperties properties) {
-				DataSourceProperties properties) {
 			return properties.initializeDataSourceBuilder().build();
 		}
+
 	}
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java

@@ -166,15 +166,13 @@ public class DataSourceProperties
 
 	/**
 	 * Initialize a {@link DataSourceBuilder} with the state of this instance.
-	 * @return a {@link DataSourceBuilder} initialized with the customizations
+	 * @return a {@link DataSourceBuilder} initialized with the customizations defined on
-	 * defined on this instance
+	 * this instance
 	 */
 	public DataSourceBuilder initializeDataSourceBuilder() {
-		return DataSourceBuilder.create(getClassLoader())
+		return DataSourceBuilder.create(getClassLoader()).type(getType())
-				.type(getType())
+				.driverClassName(determineDriverClassName()).url(determineUrl())
-				.driverClassName(determineDriverClassName())
+				.username(determineUsername()).password(determinePassword());
-				.url(determineUrl()).username(determineUsername())
-				.password(determinePassword());
 	}
 
 	public String getName() {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java

@@ -22,24 +22,28 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
 /**
  * An {@link AbstractFailureAnalyzer} that performs analysis of a Hikari configuration
  * failure caused by the use of the unsupported 'dataSourceClassName' property.
-
+ *
  * @author Stephane Nicoll
  */
-class HikariDriverConfigurationFailureAnalyzer extends AbstractFailureAnalyzer<IllegalStateException> {
+class HikariDriverConfigurationFailureAnalyzer
+		extends AbstractFailureAnalyzer<IllegalStateException> {
 
-	static final String EXPECTED_MESSAGE = "both driverClassName and dataSourceClassName are " +
+	private static final String EXPECTED_MESSAGE = "both driverClassName and "
-			"specified, one or the other should be used";
+			+ "dataSourceClassName are specified, one or the other should be used";
 
 	@Override
-	protected FailureAnalysis analyze(Throwable rootFailure, IllegalStateException cause) {
+	protected FailureAnalysis analyze(Throwable rootFailure,
+			IllegalStateException cause) {
 		if (!EXPECTED_MESSAGE.equals(cause.getMessage())) {
 			return null;
 		}
-		return new FailureAnalysis("Configuration of the Hikari connection pool failed: " +
+		return new FailureAnalysis(
-				"'dataSourceClassName' is not supported.",
+				"Configuration of the Hikari connection pool failed: "
-				"Spring Boot auto-configures only a driver and can't specify a custom " +
+						+ "'dataSourceClassName' is not supported.",
-						"DataSource. Consider configuring the Hikari DataSource in your " +
+				"Spring Boot auto-configures only a driver and can't specify a custom "
-						"own configuration.", cause);
+						+ "DataSource. Consider configuring the Hikari DataSource in "
+						+ "your own configuration.",
+				cause);
 	}
 
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

@@ -186,8 +186,8 @@ public class DataSourceAutoConfigurationTests {
 	}
 
 	/**
-	 * This test makes sure that if no supported data source is present, a datasource
+	 * This test makes sure that if no supported data source is present, a datasource is
-	 * is still created if "spring.datasource.type" is present.
+	 * still created if "spring.datasource.type" is present.
 	 */
 	@Test
 	public void explicitTypeNoSupportedDataSource() {
@@ -195,9 +195,9 @@ public class DataSourceAutoConfigurationTests {
 				"spring.datasource.driverClassName:org.hsqldb.jdbcDriver",
 				"spring.datasource.url:jdbc:hsqldb:mem:testdb",
 				"spring.datasource.type:" + SimpleDriverDataSource.class.getName());
-		this.context.setClassLoader(new HidePackagesClassLoader(
+		this.context.setClassLoader(
-				"org.apache.tomcat", "com.zaxxer.hikari", "org.apache.commons.dbcp",
+				new HidePackagesClassLoader("org.apache.tomcat", "com.zaxxer.hikari",
-				"org.apache.commons.dbcp2"));
+						"org.apache.commons.dbcp", "org.apache.commons.dbcp2"));
 		testExplicitType();
 	}
 
@@ -329,7 +329,6 @@ public class DataSourceAutoConfigurationTests {
 			this.hiddenPackages = hiddenPackages;
 		}
 
-
 		@Override
 		protected Class<?> loadClass(String name, boolean resolve)
 				throws ClassNotFoundException {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java

@@ -39,11 +39,11 @@ public class HikariDriverConfigurationFailureAnalyzerTests {
 	public void failureAnalysisIsPerformed() {
 		FailureAnalysis failureAnalysis = performAnalysis(TestConfiguration.class);
 		assertThat(failureAnalysis).isNotNull();
-		assertThat(failureAnalysis.getDescription()).isEqualTo(
+		assertThat(failureAnalysis.getDescription())
-				"Configuration of the Hikari connection pool failed: " +
+				.isEqualTo("Configuration of the Hikari connection pool failed: "
-						"'dataSourceClassName' is not supported.");
+						+ "'dataSourceClassName' is not supported.");
-		assertThat(failureAnalysis.getAction()).contains(
+		assertThat(failureAnalysis.getAction())
-				"Spring Boot auto-configures only a driver");
+				.contains("Spring Boot auto-configures only a driver");
 	}
 
 	@Test

spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextCustomizer.java

@@ -23,7 +23,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.boot.context.embedded.AbstractConfigurableEmbeddedServletContainer;
-import org.springframework.boot.context.embedded.Ssl;
 import org.springframework.boot.test.web.client.LocalHostUriTemplateHandler;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.client.TestRestTemplate.HttpClientOption;
@@ -86,6 +85,10 @@ class SpringBootTestContextCustomizer implements ContextCustomizer {
 	public static class TestRestTemplateFactory
 			implements FactoryBean<TestRestTemplate>, ApplicationContextAware {
 
+		private static final HttpClientOption[] DEFAULT_OPTIONS = {};
+
+		private static final HttpClientOption[] SSL_OPTIONS = { HttpClientOption.SSL };
+
 		private TestRestTemplate object;
 
 		@Override
@@ -93,25 +96,19 @@ class SpringBootTestContextCustomizer implements ContextCustomizer {
 				throws BeansException {
 			RestTemplateBuilder builder = getRestTemplateBuilder(applicationContext);
 			boolean sslEnabled = isSslEnabled(applicationContext);
-			TestRestTemplate template;
+			TestRestTemplate template = new TestRestTemplate(builder.build(), null, null,
-			if (sslEnabled) {
+					sslEnabled ? SSL_OPTIONS : DEFAULT_OPTIONS);
-				template = new TestRestTemplate(builder.build(), null, null,
+			LocalHostUriTemplateHandler handler = new LocalHostUriTemplateHandler(
-						HttpClientOption.SSL);
+					applicationContext.getEnvironment(), sslEnabled ? "https" : "http");
-			}
+			template.setUriTemplateHandler(handler);
-			else {
-				template = new TestRestTemplate(builder.build());
-			}
-			template.setUriTemplateHandler(new LocalHostUriTemplateHandler(
-					applicationContext.getEnvironment(), sslEnabled ? "https" : "http"));
 			this.object = template;
 		}
 
-		private boolean isSslEnabled(ApplicationContext applicationContext) {
+		private boolean isSslEnabled(ApplicationContext context) {
 			try {
-				Ssl ssl = applicationContext
+				AbstractConfigurableEmbeddedServletContainer container = context
-						.getBean(AbstractConfigurableEmbeddedServletContainer.class)
+						.getBean(AbstractConfigurableEmbeddedServletContainer.class);
-						.getSsl();
+				return container.getSsl() != null && container.getSsl().isEnabled();
-				return ssl != null && ssl.isEnabled();
 			}
 			catch (NoSuchBeanDefinitionException ex) {
 				return false;

spring-boot-test/src/main/java/org/springframework/boot/test/web/client/LocalHostUriTemplateHandler.java

@@ -39,7 +39,6 @@ public class LocalHostUriTemplateHandler extends RootUriTemplateHandler {
 	/**
 	 * Create a new {@code LocalHostUriTemplateHandler} that will generate {@code http}
 	 * URIs using the given {@code environment} to determine the port.
-	 *
 	 * @param environment the environment used to determine the port
 	 */
 	public LocalHostUriTemplateHandler(Environment environment) {
@@ -49,7 +48,6 @@ public class LocalHostUriTemplateHandler extends RootUriTemplateHandler {
 	/**
 	 * Create a new {@code LocalHostUriTemplateHandler} the will generate URIs with the
 	 * given {@code scheme} and use the given {@code environment} to determine the port.
-	 *
 	 * @param environment the environment used to determine the port
 	 * @param scheme the scheme of the root uri
 	 * @since 1.4.1

spring-boot/src/main/java/org/springframework/boot/ApplicationInfo.java

@@ -31,7 +31,8 @@ public final class ApplicationInfo {
 
 	private final Banner banner;
 
-	protected ApplicationInfo(SpringApplication application, ApplicationArguments applicationArguments, Banner banner) {
+	protected ApplicationInfo(SpringApplication application,
+			ApplicationArguments applicationArguments, Banner banner) {
 		this.mainApplicationClass = application.getMainApplicationClass();
 		this.applicationArguments = applicationArguments;
 		this.banner = banner;

spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.io.support.SpringFactoriesLoader;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
@@ -53,42 +54,23 @@ public final class FailureAnalyzers {
 
 	private final List<FailureAnalyzer> analyzers;
 
-	public FailureAnalyzers(ConfigurableApplicationContext context) {
-		this.classLoader = context.getClassLoader();
-		this.analyzers = loadFailureAnalyzers(this.classLoader);
-		prepareFailureAnalyzers(this.analyzers, context);
-	}
-
 	/**
-	 * Analyze and report the specified {@code failure}.
+	 * Create a new {@link FailureAnalyzers} instance.
-	 *
+	 * @param context the source application context
-	 * @param failure the failure to analyze
+	 * @since 1.4.1
-	 * @return {@code true} if the failure was handled
 	 */
-	public boolean analyzeAndReport(Throwable failure) {
+	public FailureAnalyzers(ConfigurableApplicationContext context) {
-		FailureAnalysis analysis = analyze(failure, this.analyzers);
+		this(context, null);
-		return report(analysis, this.classLoader);
 	}
 
-	/**
+	FailureAnalyzers(ConfigurableApplicationContext context, ClassLoader classLoader) {
-	 * Analyze and report the specified {@code failure}.
+		Assert.notNull(context, "Context must not be null");
-	 *
+		this.classLoader = (classLoader == null ? context.getClassLoader() : classLoader);
-	 * @param failure the failure to analyze
+		this.analyzers = loadFailureAnalyzers(this.classLoader);
-	 * @param classLoader the classloader to use
+		prepareFailureAnalyzers(this.analyzers, context);
-	 * @param context the context to use
-	 * @return {@code true} if the failure was handled
-	 * @deprecated in favour of {@link #analyzeAndReport(Throwable)}
-	 */
-	@Deprecated
-	public static boolean analyzeAndReport(Throwable failure, ClassLoader classLoader,
-			ConfigurableApplicationContext context) {
-		List<FailureAnalyzer> analyzers = loadFailureAnalyzers(classLoader);
-		prepareFailureAnalyzers(analyzers, context);
-		FailureAnalysis analysis = analyze(failure, analyzers);
-		return report(analysis, classLoader);
 	}
 
-	private static List<FailureAnalyzer> loadFailureAnalyzers(ClassLoader classLoader) {
+	private List<FailureAnalyzer> loadFailureAnalyzers(ClassLoader classLoader) {
 		List<String> analyzerNames = SpringFactoriesLoader
 				.loadFactoryNames(FailureAnalyzer.class, classLoader);
 		List<FailureAnalyzer> analyzers = new ArrayList<FailureAnalyzer>();
@@ -107,15 +89,31 @@ public final class FailureAnalyzers {
 		return analyzers;
 	}
 
-	private static void prepareFailureAnalyzers(List<FailureAnalyzer> analyzers,
+	private void prepareFailureAnalyzers(List<FailureAnalyzer> analyzers,
 			ConfigurableApplicationContext context) {
 		for (FailureAnalyzer analyzer : analyzers) {
 			prepareAnalyzer(context, analyzer);
 		}
 	}
 
-	private static FailureAnalysis analyze(Throwable failure,
+	private void prepareAnalyzer(ConfigurableApplicationContext context,
-			List<FailureAnalyzer> analyzers) {
+			FailureAnalyzer analyzer) {
+		if (analyzer instanceof BeanFactoryAware) {
+			((BeanFactoryAware) analyzer).setBeanFactory(context.getBeanFactory());
+		}
+	}
+
+	/**
+	 * Analyze and report the specified {@code failure}.
+	 * @param failure the failure to analyze
+	 * @return {@code true} if the failure was handled
+	 */
+	public boolean analyzeAndReport(Throwable failure) {
+		FailureAnalysis analysis = analyze(failure, this.analyzers);
+		return report(analysis, this.classLoader);
+	}
+
+	private FailureAnalysis analyze(Throwable failure, List<FailureAnalyzer> analyzers) {
 		for (FailureAnalyzer analyzer : analyzers) {
 			FailureAnalysis analysis = analyzer.analyze(failure);
 			if (analysis != null) {
@@ -125,15 +123,7 @@ public final class FailureAnalyzers {
 		return null;
 	}
 
-	private static void prepareAnalyzer(ConfigurableApplicationContext context,
+	private boolean report(FailureAnalysis analysis, ClassLoader classLoader) {
-			FailureAnalyzer analyzer) {
-		if (analyzer instanceof BeanFactoryAware) {
-			((BeanFactoryAware) analyzer).setBeanFactory(context.getBeanFactory());
-		}
-	}
-
-	private static boolean report(FailureAnalysis analysis,
-			ClassLoader classLoader) {
 		List<FailureAnalysisReporter> reporters = SpringFactoriesLoader
 				.loadFactories(FailureAnalysisReporter.class, classLoader);
 		if (analysis == null || reporters.isEmpty()) {
@@ -145,4 +135,18 @@ public final class FailureAnalyzers {
 		return true;
 	}
 
+	/**
+	 * Analyze and report the specified {@code failure}.
+	 * @param failure the failure to analyze
+	 * @param classLoader the classloader to use
+	 * @param context the context to use
+	 * @return {@code true} if the failure was handled
+	 * @deprecated as of 1.4.1 in favor of {@link #analyzeAndReport(Throwable)}
+	 */
+	@Deprecated
+	public static boolean analyzeAndReport(Throwable failure, ClassLoader classLoader,
+			ConfigurableApplicationContext context) {
+		return new FailureAnalyzers(context, classLoader).analyzeAndReport(failure);
+	}
+
 }

spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java

@@ -50,7 +50,8 @@ import org.springframework.util.ResourceUtils;
  */
 public class EntityManagerFactoryBuilder {
 
-	private static final Log logger = LogFactory.getLog(EntityManagerFactoryBuilder.class);
+	private static final Log logger = LogFactory
+			.getLog(EntityManagerFactoryBuilder.class);
 
 	private JpaVendorAdapter jpaVendorAdapter;
 
@@ -105,8 +106,8 @@ public class EntityManagerFactoryBuilder {
 	protected String determinePersistenceUnitRootLocation() {
 		if (this.applicationClass != null) {
 			try {
-				URL mainLocation = this.applicationClass.getProtectionDomain().
+				URL mainLocation = this.applicationClass.getProtectionDomain()
-						getCodeSource().getLocation();
+						.getCodeSource().getLocation();
 				return ResourceUtils.extractJarFileURL(mainLocation).toString();
 			}
 			catch (Exception ex) {
@@ -116,7 +117,6 @@ public class EntityManagerFactoryBuilder {
 		return null;
 	}
 
-
 	/**
 	 * A fluent builder for a LocalContainerEntityManagerFactoryBean.
 	 */

spring-boot/src/test/java/org/springframework/boot/BannerTests.java

@@ -101,8 +101,8 @@ public class BannerTests {
 		this.context = application.run();
 		assertThat(this.context.containsBean("springBootBanner")).isTrue();
 		assertThat(this.context.containsBean("springApplicationInfo")).isTrue();
-		assertThat(this.context.getBean(
+		assertThat(this.context.getBean("springApplicationInfo", ApplicationInfo.class)
-				"springApplicationInfo", ApplicationInfo.class).getBanner()).isNotNull();
+				.getBanner()).isNotNull();
 	}
 
 	@Test
@@ -132,8 +132,8 @@ public class BannerTests {
 		application.setWebEnvironment(false);
 		this.context = application.run();
 		assertThat(this.context.containsBean("springBootBanner")).isFalse();
-		assertThat(this.context.getBean("springApplicationInfo", ApplicationInfo.class).
+		assertThat(this.context.getBean("springApplicationInfo", ApplicationInfo.class)
-				getBanner()).isNull();
+				.getBanner()).isNull();
 	}
 
 	@Test
@@ -150,8 +150,8 @@ public class BannerTests {
 		this.context = application.run();
 		assertThat(this.out.toString()).contains("I printed a deprecated banner");
 		assertThat(this.context.containsBean("springBootBanner")).isFalse();
-		assertThat(this.context.getBean("springApplicationInfo", ApplicationInfo.class).
+		assertThat(this.context.getBean("springApplicationInfo", ApplicationInfo.class)
-				getBanner()).isNull();
+				.getBanner()).isNull();
 	}
 
 	static class DummyBanner implements Banner {

spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@@ -785,8 +785,8 @@ public class SpringApplicationTests {
 		application.setWebEnvironment(false);
 		this.context = application.run("foo");
 		ApplicationInfo applicationInfo = this.context.getBean(ApplicationInfo.class);
-		assertThat(application.getMainApplicationClass()).isEqualTo(application
+		assertThat(application.getMainApplicationClass())
-				.getMainApplicationClass());
+				.isEqualTo(application.getMainApplicationClass());
 		assertThat(applicationInfo.getApplicationArguments()).isNotNull();
 		assertThat(applicationInfo.getApplicationArguments().getNonOptionArgs())
 				.containsExactly("foo");

spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java

@@ -68,24 +68,10 @@ public class FailureAnalyzersTests {
 		verify(failureAnalyzer, times(1)).analyze(failure);
 	}
 
-	private void analyzeAndReport(final String factoriesName, Throwable failure) {
+	private void analyzeAndReport(String factoriesName, Throwable failure) {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.setClassLoader(
+		ClassLoader classLoader = new CustomSpringFactoriesClassLoader(factoriesName);
-				new ClassLoader(getClass().getClassLoader()) {
+		new FailureAnalyzers(context, classLoader).analyzeAndReport(failure);
-
-					@Override
-					public Enumeration<URL> getResources(String name) throws IOException {
-						if ("META-INF/spring.factories".equals(name)) {
-							return super.getResources(
-									"failure-analyzers-tests/" + factoriesName);
-						}
-						else {
-							return super.getResources(name);
-						}
-					}
-
-				});
-		new FailureAnalyzers(context).analyzeAndReport(failure);
 	}
 
 	static class BasicFailureAnalyzer implements FailureAnalyzer {
@@ -124,4 +110,24 @@ public class FailureAnalyzersTests {
 
 	}
 
+	static class CustomSpringFactoriesClassLoader extends ClassLoader {
+
+		private final String factoriesName;
+
+		CustomSpringFactoriesClassLoader(String factoriesName) {
+			super(CustomSpringFactoriesClassLoader.class.getClassLoader());
+			this.factoriesName = factoriesName;
+		}
+
+		@Override
+		public Enumeration<URL> getResources(String name) throws IOException {
+			if ("META-INF/spring.factories".equals(name)) {
+				return super.getResources(
+						"failure-analyzers-tests/" + this.factoriesName);
+			}
+			return super.getResources(name);
+		}
+
+	}
+
 }