Avoid generated code in the javax package

This commit updates the existing logic to also exclude code generation
in the javax package.

Closes gh-29123
This commit is contained in:
Stephane Nicoll
2022-10-07 16:46:08 +02:00
parent 76e87ad475
commit 061fa475ee
2 changed files with 43 additions and 1 deletions

View File

@@ -24,6 +24,7 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import javax.lang.model.element.Modifier;
import javax.xml.parsers.DocumentBuilderFactory;
import org.junit.jupiter.api.Test;
@@ -455,6 +456,37 @@ class BeanDefinitionMethodGeneratorTests {
});
}
@Test
void generateBeanDefinitionMethodWhenBeanIsInJavaPackage() {
RootBeanDefinition beanDefinition = (RootBeanDefinition) BeanDefinitionBuilder
.rootBeanDefinition(String.class).addConstructorArgValue("test").getBeanDefinition();
testBeanDefinitionMethodInCurrentFile(String.class, beanDefinition);
}
@Test
void generateBeanDefinitionMethodWhenBeanIsInJavaxPackage() {
RootBeanDefinition beanDefinition = (RootBeanDefinition) BeanDefinitionBuilder
.rootBeanDefinition(DocumentBuilderFactory.class).setFactoryMethod("newDefaultInstance").getBeanDefinition();
testBeanDefinitionMethodInCurrentFile(DocumentBuilderFactory.class, beanDefinition);
}
private void testBeanDefinitionMethodInCurrentFile(Class<?> targetType, RootBeanDefinition beanDefinition) {
RegisteredBean registeredBean = registerBean(new RootBeanDefinition(beanDefinition));
BeanDefinitionMethodGenerator generator = new BeanDefinitionMethodGenerator(
this.methodGeneratorFactory, registeredBean, null,
Collections.emptyList());
MethodReference method = generator.generateBeanDefinitionMethod(
this.generationContext, this.beanRegistrationsCode);
compile(method, (actual, compiled) -> {
DefaultListableBeanFactory freshBeanFactory = new DefaultListableBeanFactory();
freshBeanFactory.registerBeanDefinition("test", actual);
Object bean = freshBeanFactory.getBean("test");
assertThat(bean).isInstanceOf(targetType);
assertThat(compiled.getSourceFiles().stream().filter(sourceFile ->
sourceFile.getClassName().startsWith(targetType.getPackageName()))).isEmpty();
});
}
private RegisteredBean registerBean(RootBeanDefinition beanDefinition) {
String beanName = "testBean";
this.beanFactory.registerBeanDefinition(beanName, beanDefinition);