From 7d594aa3011568bc62a5dd8b4250c9fc1fac0752 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Wed, 3 Nov 2021 22:38:00 +0100 Subject: [PATCH 1/2] Avoid duplicate AOP proxy class definition with FilteredClassLoader See gh-28531 --- .../test/context/FilteredClassLoader.java | 16 +++++++-- .../context/FilteredClassLoaderTests.java | 12 ++++++- ...AbstractApplicationContextRunnerTests.java | 36 +++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java index 903da876d78a..5d6a8236c39f 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -20,12 +20,14 @@ import java.io.InputStream; import java.net.URL; import java.net.URLClassLoader; +import java.security.ProtectionDomain; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.function.Predicate; +import org.springframework.core.SmartClassLoader; import org.springframework.core.io.ClassPathResource; /** @@ -37,7 +39,7 @@ * @author Roy Jacobs * @since 2.0.0 */ -public class FilteredClassLoader extends URLClassLoader { +public class FilteredClassLoader extends URLClassLoader implements SmartClassLoader { private final Collection> classesFilters; @@ -129,6 +131,16 @@ public InputStream getResourceAsStream(String name) { return super.getResourceAsStream(name); } + @Override + public Class publicDefineClass(String name, byte[] b, ProtectionDomain protectionDomain) { + for (Predicate filter : this.classesFilters) { + if (filter.test(name)) { + throw new IllegalArgumentException(String.format("Defining class with name %s is not supported", name)); + } + } + return defineClass(name, b, 0, b.length, protectionDomain); + } + /** * Filter to restrict the classes that can be loaded. */ diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/FilteredClassLoaderTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/FilteredClassLoaderTests.java index e18465289986..a488d433e471 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/FilteredClassLoaderTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/FilteredClassLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; /** * Tests for {@link FilteredClassLoader}. @@ -111,4 +112,13 @@ void loadResourceAsStreamWhenNotFilteredShouldLoadResource() throws Exception { } } + @Test + void publicDefineClassWhenFilteredThrowsException() throws Exception { + Class hiddenClass = FilteredClassLoaderTests.class; + try (FilteredClassLoader classLoader = new FilteredClassLoader(hiddenClass)) { + assertThatIllegalArgumentException() + .isThrownBy(() -> classLoader.publicDefineClass(hiddenClass.getName(), new byte[] {}, null)); + } + } + } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java index 4a12319aa699..ced8d3d6ee78 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java @@ -25,6 +25,8 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.boot.context.annotation.UserConfigurations; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.assertj.ApplicationContextAssertProvider; import org.springframework.context.ConfigurableApplicationContext; @@ -33,6 +35,7 @@ import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.env.Environment; import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.util.ClassUtils; @@ -165,6 +168,15 @@ void runWithClassLoaderShouldSetClassLoaderOnConditionContext() { .run((context) -> assertThat(context).hasSingleBean(ConditionalConfig.class)); } + @Test + void consecutiveRunWithFilteredClassLoaderShouldHaveBeanWithLazyProperties() { + get().withClassLoader(new FilteredClassLoader(Gson.class)).withUserConfiguration(LazyConfig.class) + .run((context) -> assertThat(context).hasSingleBean(ExampleBeanWithLazyProperties.class)); + + get().withClassLoader(new FilteredClassLoader(Gson.class)).withUserConfiguration(LazyConfig.class) + .run((context) -> assertThat(context).hasSingleBean(ExampleBeanWithLazyProperties.class)); + } + @Test void thrownRuleWorksWithCheckedException() { get().run((context) -> assertThatIOException().isThrownBy(() -> throwCheckedException("Expected message")) @@ -241,6 +253,30 @@ static class ConditionalConfig { } + @Configuration(proxyBeanMethods = false) + @EnableConfigurationProperties(ExampleProperties.class) + static class LazyConfig { + + @Bean + ExampleBeanWithLazyProperties exampleBeanWithLazyProperties() { + return new ExampleBeanWithLazyProperties(); + } + + } + + static class ExampleBeanWithLazyProperties { + + @Autowired + @Lazy + ExampleProperties exampleProperties; + + } + + @ConfigurationProperties + public static class ExampleProperties { + + } + static class FilteredClassLoaderCondition implements Condition { @Override From 4304eea3197c7bc83c9c721c1f438b298be8b3e3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 6 Nov 2021 12:03:22 +0100 Subject: [PATCH 2/2] Polish contribution See gh-28531 --- .../context/runner/AbstractApplicationContextRunnerTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java index ced8d3d6ee78..ea2cace318fd 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java @@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanDefinitionStoreException; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.annotation.UserConfigurations; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;