From 67998e983f3a57c11919ea04b4f26f8cc8183b18 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 28 Feb 2018 09:41:39 -0800 Subject: [PATCH] Revert "Include WebSecurityConfigurer beans in @WebMvcTest" This reverts commit eef6fdb0664526f027c7fb59eda05ff1acebce07. --- .../web/servlet/WebMvcTypeExcludeFilter.java | 13 +------------ .../web/servlet/WebMvcTypeExcludeFilterTests.java | 11 +---------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java index 10c5463a6d..f8cda83e81 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.stereotype.Controller; -import org.springframework.util.ClassUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.method.support.HandlerMethodArgumentResolver; @@ -46,9 +45,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; */ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { - private static final String[] OPTIONAL_INCLUDES = { - "org.springframework.security.config.annotation.web.WebSecurityConfigurer" }; - private static final Set> DEFAULT_INCLUDES; static { @@ -64,13 +60,6 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { includes.add(ErrorAttributes.class); includes.add(Converter.class); includes.add(GenericConverter.class); - for (String optionalInclude : OPTIONAL_INCLUDES) { - try { - includes.add(ClassUtils.forName(optionalInclude, null)); - } - catch (Exception ex) { - } - } DEFAULT_INCLUDES = Collections.unmodifiableSet(includes); } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java index 105b0dcf11..b11acf59b8 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.stereotype.Controller; import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; @@ -55,7 +54,6 @@ public class WebMvcTypeExcludeFilterTests { assertThat(excludes(filter, ExampleMessageConverter.class)).isFalse(); assertThat(excludes(filter, ExampleService.class)).isTrue(); assertThat(excludes(filter, ExampleRepository.class)).isTrue(); - assertThat(excludes(filter, ExampleWebSecurityConfigurer.class)).isFalse(); } @Test @@ -69,7 +67,6 @@ public class WebMvcTypeExcludeFilterTests { assertThat(excludes(filter, ExampleMessageConverter.class)).isFalse(); assertThat(excludes(filter, ExampleService.class)).isTrue(); assertThat(excludes(filter, ExampleRepository.class)).isTrue(); - assertThat(excludes(filter, ExampleWebSecurityConfigurer.class)).isFalse(); } @Test @@ -83,7 +80,6 @@ public class WebMvcTypeExcludeFilterTests { assertThat(excludes(filter, ExampleMessageConverter.class)).isTrue(); assertThat(excludes(filter, ExampleService.class)).isTrue(); assertThat(excludes(filter, ExampleRepository.class)).isTrue(); - assertThat(excludes(filter, ExampleWebSecurityConfigurer.class)).isTrue(); } @Test @@ -110,7 +106,6 @@ public class WebMvcTypeExcludeFilterTests { assertThat(excludes(filter, ExampleMessageConverter.class)).isFalse(); assertThat(excludes(filter, ExampleService.class)).isTrue(); assertThat(excludes(filter, ExampleRepository.class)).isTrue(); - assertThat(excludes(filter, ExampleWebSecurityConfigurer.class)).isFalse(); } private boolean excludes(WebMvcTypeExcludeFilter filter, Class type) @@ -178,8 +173,4 @@ public class WebMvcTypeExcludeFilterTests { } - static class ExampleWebSecurityConfigurer extends WebSecurityConfigurerAdapter { - - } - }