Hacking

See spring-projectsgh-28585

Author: snicoll

spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java

@@ -17,8 +17,6 @@
 package org.springframework.aop.scope;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 import java.util.function.BiConsumer;
 
@@ -27,17 +25,15 @@
 
 import org.springframework.aop.framework.AopInfrastructureBean;
 import org.springframework.aot.generate.DefaultGenerationContext;
-import org.springframework.aot.generate.GeneratedMethods;
 import org.springframework.aot.generate.InMemoryGeneratedFiles;
-import org.springframework.aot.generate.MethodGenerator;
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.test.generator.compile.Compiled;
 import org.springframework.aot.test.generator.compile.TestCompiler;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.aot.AotFactoriesLoader;
 import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
-import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
+import org.springframework.beans.factory.aot.MockBeanFactoryInitializationCode;
 import org.springframework.beans.factory.aot.TestBeanRegistrationsAotProcessor;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -158,27 +154,4 @@ private void testCompile(BiConsumer<DefaultListableBeanFactory, Compiled> result
 		});
 	}
 
-
-	static class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
-
-		private final GeneratedMethods generatedMethods = new GeneratedMethods();
-
-		private final List<MethodReference> initializers = new ArrayList<>();
-
-		@Override
-		public MethodGenerator getMethodGenerator() {
-			return this.generatedMethods;
-		}
-
-		@Override
-		public void addInitializer(MethodReference methodReference) {
-			this.initializers.add(methodReference);
-		}
-
-		List<MethodReference> getInitializers() {
-			return this.initializers;
-		}
-
-	}
-
 }

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanFactoryInitializationCode.java

@@ -18,7 +18,6 @@
 
 import org.springframework.aot.generate.MethodGenerator;
 import org.springframework.aot.generate.MethodReference;
-import org.springframework.lang.Nullable;
 
 /**
  * Interface that can be used to configure the code that will be generated to
@@ -35,23 +34,7 @@ public interface BeanFactoryInitializationCode {
 	 */
 	String BEAN_FACTORY_VARIABLE = "beanFactory";
 
-	/**
-	 * Return the target class for this bean factory or {@code null} if there is
-	 * no target.
-	 * @return the target
-	 */
-	@Nullable
-	default Class<?> getTarget() {
-		return null;
-	}
-
-	/**
-	 * Return the name of the bean factory or and empty string if no ID is available.
-	 * @return the bean factory name
-	 */
-	default String getName() {
-		return "";
-	}
+	BeanFactoryNamingConvention getBeanFactoryNamingConvention();
 
 	/**
 	 * Return a {@link MethodGenerator} that can be used to add more methods to

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanFactoryNamingConvention.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.aot;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.javapoet.ClassName;
+
+/**
+ * Naming strategy to use when processing a particular {@link BeanFactory}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public interface BeanFactoryNamingConvention {
+
+	/**
+	 * Generate a new {@link ClassName} for the specified {@code featureName}.
+	 * @param featureName the name of the feature that the generated class
+	 * supports for the bean factory this instance handles
+	 * @return a unique generated class name
+	 */
+	ClassName generateClassName(String featureName);
+
+	/**
+	 * Return the name of the bean factory or and empty string if no ID is available.
+	 * @return the bean factory name
+	 */
+	default String getBeanFactoryName() {
+		return "";
+	}
+
+}

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContribution.java

@@ -61,16 +61,16 @@ class BeanRegistrationsAotContribution
 	public void applyTo(GenerationContext generationContext,
 			BeanFactoryInitializationCode beanFactoryInitializationCode) {
 
-		ClassName className = generationContext.getClassNameGenerator().generateClassName(
-				beanFactoryInitializationCode.getTarget(),
-				beanFactoryInitializationCode.getName() + "BeanFactoryRegistrations");
+		ClassName className = beanFactoryInitializationCode.getBeanFactoryNamingConvention()
+				.generateClassName("BeanFactoryRegistrations");
 		BeanRegistrationsCodeGenerator codeGenerator = new BeanRegistrationsCodeGenerator(
 				className);
+		String beanFactoryName = beanFactoryInitializationCode.getBeanFactoryNamingConvention()
+				.getBeanFactoryName();
 		GeneratedMethod registerMethod = codeGenerator.getMethodGenerator()
 				.generateMethod("registerBeanDefinitions")
 				.using(builder -> generateRegisterMethod(builder, generationContext,
-						beanFactoryInitializationCode.getName(),
-						codeGenerator));
+						beanFactoryName, codeGenerator));
 		JavaFile javaFile = codeGenerator.generatedJavaFile(className);
 		generationContext.getGeneratedFiles().addSourceFile(javaFile);
 		beanFactoryInitializationCode

spring-beans/src/main/java/org/springframework/beans/factory/aot/DefaultBeanFactoryNamingConvention.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2002-2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.aot;
+
+import org.springframework.aot.generate.ClassNameGenerator;
+import org.springframework.javapoet.ClassName;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
+/**
+ * Default {@link BeanFactoryNamingConvention} implementation.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class DefaultBeanFactoryNamingConvention implements BeanFactoryNamingConvention {
+
+	private final ClassNameGenerator classNameGenerator;
+
+	@Nullable
+	private final Class<?> target;
+
+	private final String name;
+
+	public DefaultBeanFactoryNamingConvention(ClassNameGenerator classNameGenerator,
+			@Nullable Class<?> target, @Nullable String name) {
+		this.classNameGenerator = classNameGenerator;
+		this.target = target;
+		this.name = (!StringUtils.hasText(name)) ? "" : name;
+	}
+
+	@Override
+	public ClassName generateClassName(String featureName) {
+		return this.classNameGenerator.generateClassName(this.target, this.name + featureName);
+	}
+
+	@Override
+	public String getBeanFactoryName() {
+		return this.name;
+	}
+
+}

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java

@@ -30,10 +30,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aot.generate.DefaultGenerationContext;
-import org.springframework.aot.generate.GeneratedMethods;
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.generate.InMemoryGeneratedFiles;
-import org.springframework.aot.generate.MethodGenerator;
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.test.generator.compile.Compiled;
 import org.springframework.aot.test.generator.compile.TestCompiler;
@@ -64,8 +62,6 @@ class BeanRegistrationsAotContributionTests {
 
 	private DefaultListableBeanFactory beanFactory;
 
-	private MockSpringFactoriesLoader springFactoriesLoader;
-
 	private BeanDefinitionMethodGeneratorFactory methodGeneratorFactory;
 
 	private MockBeanFactoryInitializationCode beanFactoryInitializationCode = new MockBeanFactoryInitializationCode();
@@ -75,9 +71,8 @@ void setup() {
 		this.generatedFiles = new InMemoryGeneratedFiles();
 		this.generationContext = new DefaultGenerationContext(this.generatedFiles);
 		this.beanFactory = new DefaultListableBeanFactory();
-		this.springFactoriesLoader = new MockSpringFactoriesLoader();
 		this.methodGeneratorFactory = new BeanDefinitionMethodGeneratorFactory(
-				new AotFactoriesLoader(this.beanFactory, this.springFactoriesLoader));
+				new AotFactoriesLoader(this.beanFactory, new MockSpringFactoriesLoader()));
 	}
 
 	@Test
@@ -164,7 +159,7 @@ private void testCompiledResult(
 	}
 
 	private JavaFile createJavaFile() {
-		MethodReference initializer = this.beanFactoryInitializationCode.initializers
+		MethodReference initializer = this.beanFactoryInitializationCode.getInitializers()
 				.get(0);
 		TypeSpec.Builder builder = TypeSpec.classBuilder("BeanFactoryConsumer");
 		builder.addModifiers(Modifier.PUBLIC);
@@ -177,37 +172,4 @@ private JavaFile createJavaFile() {
 		return JavaFile.builder("__", builder.build()).build();
 	}
 
-	class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
-
-		private final GeneratedMethods generatedMethods = new GeneratedMethods();
-
-		private final List<MethodReference> initializers = new ArrayList<>();
-
-		private final String name;
-
-		MockBeanFactoryInitializationCode() {
-			this("");
-		}
-
-		MockBeanFactoryInitializationCode(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public String getName() {
-			return this.name;
-		}
-
-		@Override
-		public MethodGenerator getMethodGenerator() {
-			return this.generatedMethods;
-		}
-
-		@Override
-		public void addInitializer(MethodReference methodReference) {
-			this.initializers.add(methodReference);
-		}
-
-	}
-
 }

spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/MockBeanFactoryInitializationCode.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.aot;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.aot.generate.ClassNameGenerator;
+import org.springframework.aot.generate.GeneratedMethods;
+import org.springframework.aot.generate.MethodReference;
+
+/**
+ * Mock {@link BeanFactoryInitializationCode} implementation.
+ *
+ * @author Stephane Nicoll
+ */
+public class MockBeanFactoryInitializationCode implements BeanFactoryInitializationCode {
+
+	private final BeanFactoryNamingConvention namingConvention;
+
+	private final GeneratedMethods generatedMethods = new GeneratedMethods();
+
+	private final List<MethodReference> initializers = new ArrayList<>();
+
+	public MockBeanFactoryInitializationCode() {
+		this("");
+	}
+
+	public MockBeanFactoryInitializationCode(String name) {
+		this.namingConvention = new DefaultBeanFactoryNamingConvention(
+				new ClassNameGenerator(), null, name);
+	}
+
+	@Override
+	public BeanFactoryNamingConvention getBeanFactoryNamingConvention() {
+		return this.namingConvention;
+	}
+
+	@Override
+	public GeneratedMethods getMethodGenerator() {
+		return this.generatedMethods;
+	}
+
+	@Override
+	public void addInitializer(MethodReference methodReference) {
+		this.initializers.add(methodReference);
+	}
+
+	public List<MethodReference> getInitializers() {
+		return Collections.unmodifiableList(this.initializers);
+	}
+
+}