Skip to content

Remove reflection in AutoConfigurationChecker #getConfigurations #49058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GaetanoCerciello wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −11
Open

Remove reflection in AutoConfigurationChecker #getConfigurations #49058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions ...c/src/main/java/org/springframework/boot/build/architecture/AutoConfigurationChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@

package org.springframework.boot.build.architecture;

import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;

import com.tngtech.archunit.base.DescribedPredicate;
import com.tngtech.archunit.core.domain.JavaAnnotation;
import com.tngtech.archunit.core.domain.JavaClass;
import com.tngtech.archunit.core.domain.JavaClasses;
import com.tngtech.archunit.lang.EvaluationResult;

import org.springframework.util.ReflectionUtils;
import java.util.HashMap;
import java.util.Map;

/**
* Finds all configurations from auto-configurations (either nested configurations or
Expand All @@ -43,7 +39,7 @@ class AutoConfigurationChecker {
.and(ArchitectureRules.areNotKotlinClasses());

EvaluationResult check(JavaClasses javaClasses) {
AutoConfigurations autoConfigurations = new AutoConfigurations();
AutoConfigurations autoConfigurations = new AutoConfigurations(javaClasses);
for (JavaClass javaClass : javaClasses) {
if (isAutoConfigurationOrEnclosedInAutoConfiguration(javaClass)) {
autoConfigurations.add(javaClass);
Expand Down Expand Up @@ -74,8 +70,14 @@ private static final class AutoConfigurations {

private static final String CONFIGURATION = "org.springframework.context.annotation.Configuration";

private final JavaClasses allClasses;

private final Map<String, JavaClass> classes = new HashMap<>();

AutoConfigurations(JavaClasses allClasses) {
this.allClasses = allClasses;
}

void add(JavaClass autoConfiguration) {
if (!autoConfiguration.isMetaAnnotatedWith(CONFIGURATION)) {
return;
Expand All @@ -87,10 +89,11 @@ void add(JavaClass autoConfiguration) {
}

JavaClasses getConfigurations() {
// TODO: Find a way without reflection
Method method = ReflectionUtils.findMethod(JavaClasses.class, "of", Iterable.class);
ReflectionUtils.makeAccessible(method);
return (JavaClasses) ReflectionUtils.invokeMethod(method, null, this.classes.values());
// Return a filtered view of the original JavaClasses containing only the
// configuration classes
DescribedPredicate<JavaClass> inConfigurations = DescribedPredicate
.describe("is in configurations", c -> this.classes.containsKey(c.getName()));
return this.allClasses.that(inConfigurations);
}

private void processImports(JavaClass javaClass, Map<String, JavaClass> result) {
Expand Down
Loading