spring-projects · dreis2211 · Dec 17, 2018
diff --git a/...src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java b/...src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java
@@ -23,12 +23,10 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.ldap.pool2.factory.PoolConfig;
 import org.springframework.ldap.pool2.factory.PooledContextSource;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -58,7 +56,7 @@ public void contextSourceWithDefaultUrl() {
 	public void contextSourceWithSingleUrl() {
 		this.contextRunner.withPropertyValues("spring.ldap.urls:ldap://localhost:123")
 				.run((context) -> {
-					ContextSource contextSource = context
+					LdapContextSource contextSource = context
 							.getBean(LdapContextSource.class);
 					String[] urls = getUrls(contextSource);
 					assertThat(urls).containsExactly("ldap://localhost:123");
@@ -71,7 +69,7 @@ public void contextSourceWithSeveralUrls() {
 				.withPropertyValues(
 						"spring.ldap.urls:ldap://localhost:123,ldap://mycompany:123")
 				.run((context) -> {
-					ContextSource contextSource = context
+					LdapContextSource contextSource = context
 							.getBean(LdapContextSource.class);
 					LdapProperties ldapProperties = context.getBean(LdapProperties.class);
 					String[] urls = getUrls(contextSource);
@@ -120,8 +118,8 @@ public void contextSourceWithUserProvidedPooledContextSource() {
 				});
 	}
 
-	private String[] getUrls(ContextSource contextSource) {
-		return (String[]) ReflectionTestUtils.getField(contextSource, "urls");
+	private String[] getUrls(LdapContextSource contextSource) {
+		return contextSource.getUrls();
 	}
 
 	@Configuration

diff --git a/...e/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java b/...e/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java
@@ -21,15 +21,12 @@
 import com.mongodb.MongoClient;
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
-import com.mongodb.connection.Cluster;
-import com.mongodb.connection.ClusterSettings;
 import org.junit.Test;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.mock.env.MockEnvironment;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -50,7 +47,7 @@ public void portCanBeCustomized() {
 		MongoProperties properties = new MongoProperties();
 		properties.setPort(12345);
 		MongoClient client = createMongoClient(properties);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "localhost", 12345);
 	}
@@ -60,7 +57,7 @@ public void hostCanBeCustomized() {
 		MongoProperties properties = new MongoProperties();
 		properties.setHost("mongo.example.com");
 		MongoClient client = createMongoClient(properties);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "mongo.example.com", 27017);
 	}
@@ -103,7 +100,7 @@ public void uriCanBeCustomized() {
 		properties.setUri("mongodb://user:[email protected]:12345,"
 				+ "mongo2.example.com:23456/test");
 		MongoClient client = createMongoClient(properties);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(2);
 		assertServerAddress(allAddresses.get(0), "mongo1.example.com", 12345);
 		assertServerAddress(allAddresses.get(1), "mongo2.example.com", 23456);
@@ -118,7 +115,7 @@ public void uriIsIgnoredInEmbeddedMode() {
 		properties.setUri("mongodb://mongo.example.com:1234/mydb");
 		this.environment.setProperty("local.mongo.port", "4000");
 		MongoClient client = createMongoClient(properties, this.environment);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "localhost", 4000);
 	}
@@ -132,14 +129,6 @@ private MongoClient createMongoClient(MongoProperties properties,
 		return new MongoClientFactory(properties, environment).createMongoClient(null);
 	}
 
-	private List<ServerAddress> extractServerAddresses(MongoClient client) {
-		Cluster cluster = (Cluster) ReflectionTestUtils
-				.getField(ReflectionTestUtils.getField(client, "delegate"), "cluster");
-		ClusterSettings clusterSettings = (ClusterSettings) ReflectionTestUtils
-				.getField(cluster, "settings");
-		return clusterSettings.getHosts();
-	}
-
 	private void assertServerAddress(ServerAddress serverAddress, String expectedHost,
 			int expectedPort) {
 		assertThat(serverAddress.getHost()).isEqualTo(expectedHost);

diff --git a/...gure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/...gure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
@@ -21,15 +21,12 @@
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
 import com.mongodb.ServerAddress;
-import com.mongodb.connection.Cluster;
-import com.mongodb.connection.ClusterSettings;
 import org.junit.Test;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -120,7 +117,7 @@ public void uriOverridesHostAndPort() {
 		properties.setUri("mongodb://mongo1.example.com:12345");
 		MongoClient client = new MongoClientFactory(properties, null)
 				.createMongoClient(null);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "mongo1.example.com", 12345);
 	}
@@ -132,7 +129,7 @@ public void onlyHostAndPortSetShouldUseThat() {
 		properties.setPort(27017);
 		MongoClient client = new MongoClientFactory(properties, null)
 				.createMongoClient(null);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "localhost", 27017);
 	}
@@ -143,7 +140,7 @@ public void onlyUriSetShouldUseThat() {
 		properties.setUri("mongodb://mongo1.example.com:12345");
 		MongoClient client = new MongoClientFactory(properties, null)
 				.createMongoClient(null);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "mongo1.example.com", 12345);
 	}
@@ -153,19 +150,11 @@ public void noCustomAddressAndNoUriUsesDefaultUri() {
 		MongoProperties properties = new MongoProperties();
 		MongoClient client = new MongoClientFactory(properties, null)
 				.createMongoClient(null);
-		List<ServerAddress> allAddresses = extractServerAddresses(client);
+		List<ServerAddress> allAddresses = client.getAllAddress();
 		assertThat(allAddresses).hasSize(1);
 		assertServerAddress(allAddresses.get(0), "localhost", 27017);
 	}
 
-	private List<ServerAddress> extractServerAddresses(MongoClient client) {
-		Cluster cluster = (Cluster) ReflectionTestUtils
-				.getField(ReflectionTestUtils.getField(client, "delegate"), "cluster");
-		ClusterSettings clusterSettings = (ClusterSettings) ReflectionTestUtils
-				.getField(cluster, "settings");
-		return clusterSettings.getHosts();
-	}
-
 	private void assertServerAddress(ServerAddress serverAddress, String expectedHost,
 			int expectedPort) {
 		assertThat(serverAddress.getHost()).isEqualTo(expectedHost);

diff --git a/...oot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java b/...oot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java
@@ -165,14 +165,12 @@ public void authorizedClientRepositoryBeanIsConditionalOnMissingBean() {
 				});
 	}
 
-	@SuppressWarnings("unchecked")
 	private List<Filter> getFilters(AssertableApplicationContext context,
 			Class<? extends Filter> filter) {
 		FilterChainProxy filterChain = (FilterChainProxy) context
 				.getBean(BeanIds.SPRING_SECURITY_FILTER_CHAIN);
 		List<SecurityFilterChain> filterChains = filterChain.getFilterChains();
-		List<Filter> filters = (List<Filter>) ReflectionTestUtils
-				.getField(filterChains.get(0), "filters");
+		List<Filter> filters = filterChains.get(0).getFilters();
 		return filters.stream().filter(filter::isInstance).collect(Collectors.toList());
 	}
 

diff --git a/...security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java b/...security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
@@ -18,8 +18,8 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
@@ -175,14 +175,12 @@ public void autoConfigurationWhenSecurityWebFilterChainConfigPresentShouldNotAdd
 				});
 	}
 
-	@SuppressWarnings("unchecked")
 	private void assertFilterConfiguredWithJwtAuthenticationManager(
 			AssertableReactiveWebApplicationContext context) {
 		MatcherSecurityWebFilterChain filterChain = (MatcherSecurityWebFilterChain) context
 				.getBean(BeanIds.SPRING_SECURITY_FILTER_CHAIN);
-		List<WebFilter> filters = (List<WebFilter>) ReflectionTestUtils
-				.getField(filterChain, "filters");
-		AuthenticationWebFilter webFilter = (AuthenticationWebFilter) filters.stream()
+		Stream<WebFilter> filters = filterChain.getWebFilters().toStream();
+		AuthenticationWebFilter webFilter = (AuthenticationWebFilter) filters
 				.filter((f) -> f instanceof AuthenticationWebFilter).findFirst()
 				.orElse(null);
 		ReactiveAuthenticationManager authenticationManager = (ReactiveAuthenticationManager) ReflectionTestUtils

diff --git a/...onfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/...onfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java
@@ -47,7 +47,6 @@
 import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter;
 import org.springframework.security.web.FilterChainProxy;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -183,13 +182,11 @@ public void autoConfigurationShouldBeConditionalOnJwtDecoderClass() {
 				.run((context) -> assertThat(getBearerTokenFilter(context)).isNull());
 	}
 
-	@SuppressWarnings("unchecked")
 	private Filter getBearerTokenFilter(AssertableWebApplicationContext context) {
 		FilterChainProxy filterChain = (FilterChainProxy) context
 				.getBean(BeanIds.SPRING_SECURITY_FILTER_CHAIN);
 		List<SecurityFilterChain> filterChains = filterChain.getFilterChains();
-		List<Filter> filters = (List<Filter>) ReflectionTestUtils
-				.getField(filterChains.get(0), "filters");
+		List<Filter> filters = filterChains.get(0).getFilters();
 		return filters.stream()
 				.filter((f) -> f instanceof BearerTokenAuthenticationFilter).findFirst()
 				.orElse(null);

diff --git a/...springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizerTests.java b/...springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizerTests.java
@@ -40,7 +40,6 @@
 import org.springframework.boot.web.embedded.jetty.JettyWebServer;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.context.support.TestPropertySourceUtils;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -172,8 +171,10 @@ public void customMaxHttpHeaderSizeIgnoredIfZero() {
 
 	private List<Integer> getRequestHeaderSizes(JettyWebServer server) {
 		List<Integer> requestHeaderSizes = new ArrayList<>();
-		Connector[] connectors = (Connector[]) ReflectionTestUtils.getField(server,
-				"connectors");
+		// Start (and directly stop) server to have connectors available
+		server.start();
+		server.stop();
+		Connector[] connectors = server.getServer().getConnectors();
 		for (Connector connector : connectors) {
 			connector.getConnectionFactories().stream()
 					.filter((factory) -> factory instanceof ConnectionFactory)

diff --git a/...pringframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/...pringframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java
@@ -16,17 +16,14 @@
 
 package org.springframework.boot.autoconfigure.web.embedded;
 
-import java.util.Map;
 import java.util.function.Consumer;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Valve;
-import org.apache.catalina.mapper.Mapper;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.valves.AccessLogValve;
 import org.apache.catalina.valves.ErrorReportValve;
 import org.apache.catalina.valves.RemoteIpValve;
-import org.apache.catalina.webresources.StandardRoot;
 import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.http11.AbstractHttp11Protocol;
 import org.junit.Before;
@@ -40,7 +37,6 @@
 import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.context.support.TestPropertySourceUtils;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.unit.DataSize;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -186,18 +182,13 @@ public void customRemoteIpValve() {
 		assertThat(remoteIpValve.getInternalProxies()).isEqualTo("192.168.0.1");
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void customStaticResourceAllowCaching() {
 		bind("server.tomcat.resource.allow-caching=false");
 		customizeAndRunServer((server) -> {
-			Mapper mapper = server.getTomcat().getService().getMapper();
-			Object contextObjectToContextVersionMap = ReflectionTestUtils.getField(mapper,
-					"contextObjectToContextVersionMap");
-			Object tomcatEmbeddedContext = ((Map<Context, Object>) contextObjectToContextVersionMap)
-					.values().toArray()[0];
-			assertThat(((StandardRoot) ReflectionTestUtils.getField(tomcatEmbeddedContext,
-					"resources")).isCachingAllowed()).isFalse();
+			Tomcat tomcat = server.getTomcat();
+			Context context = (Context) tomcat.getHost().findChildren()[0];
+			assertThat(context.getResources().isCachingAllowed()).isFalse();
 		});
 	}
 

diff --git a/...work/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java b/...work/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java
@@ -29,7 +29,6 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -64,7 +63,7 @@ public void shouldBeADifferentWebClient() {
 		WebElement element = this.webDriver.findElement(By.tagName("body"));
 		assertThat(element.getText()).isEqualTo("Hello");
 		try {
-			ReflectionTestUtils.invokeMethod(previousWebDriver, "getCurrentWindow");
+			previousWebDriver.getWindowHandle();
 			fail("Did not call quit()");
 		}
 		catch (NoSuchWindowException ex) {

diff --git a/...java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/...java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
@@ -23,9 +23,9 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -49,6 +49,7 @@
 import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
 import org.apache.jasper.servlet.JspServlet;
 import org.apache.tomcat.JarScanFilter;
+import org.apache.tomcat.JarScanType;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -399,7 +400,6 @@ public void sessionIdGeneratorIsConfiguredWithAttributesFromTheManager() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void tldSkipPatternsShouldBeAppliedToContextJarScanner() {
 		TomcatServletWebServerFactory factory = getFactory();
 		factory.addTldSkipPatterns("foo.jar", "bar.jar");
@@ -408,9 +408,9 @@ public void tldSkipPatternsShouldBeAppliedToContextJarScanner() {
 		Tomcat tomcat = ((TomcatWebServer) this.webServer).getTomcat();
 		Context context = (Context) tomcat.getHost().findChildren()[0];
 		JarScanFilter jarScanFilter = context.getJarScanner().getJarScanFilter();
-		Set<String> tldSkipSet = (Set<String>) ReflectionTestUtils.getField(jarScanFilter,
-				"tldSkipSet");
-		assertThat(tldSkipSet).contains("foo.jar", "bar.jar");
+		assertThat(jarScanFilter.check(JarScanType.TLD, "foo.jar")).isFalse();
+		assertThat(jarScanFilter.check(JarScanType.TLD, "bar.jar")).isFalse();
+		assertThat(jarScanFilter.check(JarScanType.TLD, "test.jar")).isTrue();
 	}
 
 	@Test
@@ -463,13 +463,15 @@ protected JspServlet getJspServlet() throws ServletException {
 		return (JspServlet) standardWrapper.getServlet();
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	protected Map<String, String> getActualMimeMappings() {
 		Context context = (Context) ((TomcatWebServer) this.webServer).getTomcat()
 				.getHost().findChildren()[0];
-		return (Map<String, String>) ReflectionTestUtils.getField(context,
-				"mimeMappings");
+		Map<String, String> mimeMappings = new HashMap<>();
+		for (String extension : context.findMimeMappings()) {
+			mimeMappings.put(extension, context.findMimeMapping(extension));
+		}
+		return mimeMappings;
 	}
 
 	@Override