trying to fix test bug

mageddo · mageddo · commit 5dc850adef1e · 2023-01-29T22:28:26.000-03:00
diff --git a/aptools/src/main/java/com/mageddo/aptools/ClassUtils.java b/aptools/src/main/java/com/mageddo/aptools/ClassUtils.java
@@ -29,4 +29,8 @@ public static Class<?> forName(String className) {
 			throw new RuntimeException(e);
 		}
 	}
+
+	public static boolean doClassOwnPossibleSubClassOrIsTheSame(String expected, String current) {
+		return current.startsWith(expected); // todo talvez tenha que ser melhor validado
+	}
 }
diff --git a/aptools/src/main/java/com/mageddo/aptools/elements/ElementFinder.java b/aptools/src/main/java/com/mageddo/aptools/elements/ElementFinder.java
@@ -40,4 +40,7 @@ private static <T>void find(Element e, Predicate<Element> predicate, List<Elemen
     }
   }
 
+	public static List<Element> findNestedClasses(Element element) {
+		return find(element, ElementKind.CLASS);
+	}
 }
diff --git a/aptools/src/main/java/com/mageddo/aptools/elements/ElementUtils.java b/aptools/src/main/java/com/mageddo/aptools/elements/ElementUtils.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.lang.model.element.Element;
@@ -41,4 +42,7 @@ private static boolean isTypeElement(Element e) {
     return TYPE_ELEMENTS.contains(e.getKind());
   }
 
+	public static boolean isEquals(Element element, String className) {
+		return Objects.equals(ElementUtils.toClassName(element), className);
+	}
 }
diff --git a/reflection-config-generator/acceptance-tests/src/main/java/com/acme/ClassWithNestedClass.java b/reflection-config-generator/acceptance-tests/src/main/java/com/acme/ClassWithNestedClass.java
@@ -0,0 +1,10 @@
+package com.acme;
+
+import nativeimage.Reflection;
+
+@Reflection(scanClass = ClassWithNestedClass.class)
+public class ClassWithNestedClass {
+	public static class NestedClass {
+
+	}
+}
diff --git a/reflection-config-generator/acceptance-tests/src/test/java/com/acme/ReflectionConfigGenerationTest.java b/reflection-config-generator/acceptance-tests/src/test/java/com/acme/ReflectionConfigGenerationTest.java
@@ -1,18 +1,18 @@
 package com.acme;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import org.junit.jupiter.api.Test;
 
 import static com.acme.TestUtils.getResourceAsString;
-import static com.acme.TestUtils.sortJson;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class ReflectionConfigGenerationTest {
@@ -29,7 +29,7 @@ void mustConfigureReflectJson() throws JsonProcessingException {
 		final List<JsonNode> items = readReflectConfig();
 
 		// assert
-		assertEquals(10, items.size());
+		assertEquals(11, items.size());
 		assertEquals(getResourceAsString("/reflection-config-generation-test/001.json"), objectMapper.writeValueAsString(items));
 	}
 
diff --git a/reflection-config-generator/src/main/java/nativeimage/core/NativeImageReflectionConfigGenerator.java b/reflection-config-generator/src/main/java/nativeimage/core/NativeImageReflectionConfigGenerator.java
@@ -8,7 +8,6 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.TypeElement;
 
 import com.mageddo.aptools.ClassUtils;
@@ -20,8 +19,11 @@
 
 import nativeimage.Reflection;
 import nativeimage.Reflections;
-import nativeimage.core.domain.ReflectionConfig;
+import static com.mageddo.aptools.elements.ElementUtils.toClassName;
 import static nativeimage.core.NativeImages.solvePath;
+import nativeimage.core.domain.ReflectionConfig;
+import nativeimage.core.io.NativeImagePropertiesWriter;
+import nativeimage.core.io.ReflectionConfigWriter;
 import static nativeimage.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
 
 /**
@@ -115,20 +117,53 @@ void addClass(Class<?> clazz, Reflection reflection) {
 		}
 	}
 
-	void addMatchingProjectSourceElements(RoundEnvironment roundEnv, Element element,
-			Reflection reflection) {
+	void addMatchingProjectSourceElements(
+			RoundEnvironment roundEnv, Element element, Reflection reflection
+	) {
 		if (reflection.scanPackage().isEmpty()) {
-			this.addElement(element, reflection);
-			// todo must add nested classes too
+			final Element found = this.chooseElement(element, reflection, roundEnv);
+			if (found != null) {
+				this.addToElementAndNested(reflection, found);
+			}
 		} else {
 			for (final Element nestedElement : roundEnv.getRootElements()) {
-				this.addElement(nestedElement, reflection);
-				for (final Element innerClass : ElementFinder.find(nestedElement, ElementKind.CLASS)) {
-					this.addElement(innerClass, reflection);
-					logger.debug("m=addMatchingProjectSourceElements, innerClass=%s", innerClass);
+				this.addToElementAndNested(reflection, nestedElement);
+			}
+		}
+	}
+
+	private Element chooseElement(
+			Element element, Reflection reflection, RoundEnvironment roundEnv
+	) {
+		if (reflection.scanClass() != Void.class) {
+			return this.findElementAndNested(reflection.scanClass().getName(), roundEnv);
+		} else if (!reflection.scanClassName().isEmpty()) {
+			return this.findElementAndNested(reflection.scanClassName(), roundEnv);
+		}
+		return element;
+	}
+
+	private Element findElementAndNested(String className, RoundEnvironment roundEnv) {
+		for (Element element : roundEnv.getRootElements()) {
+			if (ElementUtils.isEquals(element, className)) {
+				return element;
+			}
+			for (Element nestedClass : ElementFinder.findNestedClasses(element)) {
+				if (ElementUtils.isEquals(element, className)) {
+					return nestedClass;
 				}
 			}
 		}
+		logger.info("status=classNotFound, class={}", className);
+		return null;
+	}
+
+	private void addToElementAndNested(Reflection reflection, Element element) {
+		this.addElement(element, reflection);
+		for (final Element innerClass : ElementFinder.findNestedClasses(element)) {
+			this.addElement(innerClass, reflection);
+			logger.debug("m=addMatchingProjectSourceElements, innerClass=%s", innerClass);
+		}
 	}
 
 	private void addElement(Element element, Reflection annotation) {
@@ -141,8 +176,7 @@ private void addElement(Element element, Reflection annotation) {
 		);
 		this.classPackage = this.classPackage == null ?
 				ClassUtils.getClassPackage(element.toString()) : this.classPackage;
-		for (ReflectionConfig config : ReflectionConfigBuilder.of(annotation,
-				ElementUtils.toClassName(element))) {
+		for (ReflectionConfig config : ReflectionConfigBuilder.of(annotation, toClassName(element))) {
 			this.classes.remove(config);
 			this.classes.add(config);
 		}
diff --git a/reflection-config-generator/src/main/java/nativeimage/core/TypeBuilder.java b/reflection-config-generator/src/main/java/nativeimage/core/TypeBuilder.java
@@ -7,6 +7,8 @@
 
 import com.mageddo.aptools.ClassUtils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import nativeimage.Reflection;
 
 public final class TypeBuilder {
@@ -16,15 +18,16 @@ private TypeBuilder() {
 	}
 
 	public static Set<String> of(Reflection reflectionAnn, String clazzName) {
-		if(!reflectionAnn.scanClassName().equals("")){
-			return toSet(reflectionAnn.scanClassName());
-		}
-		final String scanClass = getScanClass(reflectionAnn);
-		if(!scanClass.equals(Void.class.getName())){
-			return toSet(scanClass);
+		final String expectedClassName = StringUtils.firstNonBlank(
+				getScanClass(reflectionAnn), reflectionAnn.scanClassName()
+		);
+		if(StringUtils.isNotBlank(expectedClassName)){
+			if(ClassUtils.doClassOwnPossibleSubClassOrIsTheSame(expectedClassName, clazzName)){
+				return toSet(clazzName);
+			}
 		}
-		if(!reflectionAnn.scanPackage().equals("")){
-			if(ClassUtils.doPackageOwnClass(reflectionAnn.scanPackage(), clazzName)){
+		if (StringUtils.isNotEmpty(reflectionAnn.scanPackage())) {
+			if (ClassUtils.doPackageOwnClass(reflectionAnn.scanPackage(), clazzName)) {
 				return toSet(clazzName);
 			}
 			return Collections.emptySet();
@@ -33,9 +36,12 @@ public static Set<String> of(Reflection reflectionAnn, String clazzName) {
 	}
 
 	private static String getScanClass(Reflection reflectionAnn) {
+		if (reflectionAnn.scanClass() == Void.class) {
+			return null;
+		}
 		try {
 			return reflectionAnn.scanClass().getName();
-		} catch (MirroredTypeException e){
+		} catch (MirroredTypeException e) {
 			return e.getTypeMirror().toString();
 		}
 	}
diff --git a/reflection-config-generator/src/main/java/nativeimage/core/io/NativeImagePropertiesWriter.java b/reflection-config-generator/src/main/java/nativeimage/core/io/NativeImagePropertiesWriter.java
@@ -1,4 +1,4 @@
-package nativeimage.core;
+package nativeimage.core.io;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -10,6 +10,8 @@
 
 import com.mageddo.aptools.IoUtils;
 
+import nativeimage.core.NativeImages;
+
 public class NativeImagePropertiesWriter {
 	public static URI write(
 			ProcessingEnvironment processingEnv, String packageName, String... reflectionResources
diff --git a/reflection-config-generator/src/main/java/nativeimage/core/io/ReflectionConfigFileCreator.java b/reflection-config-generator/src/main/java/nativeimage/core/io/ReflectionConfigFileCreator.java
@@ -1,4 +1,4 @@
-package nativeimage.core;
+package nativeimage.core.io;
 
 import java.io.IOException;
 
diff --git a/reflection-config-generator/src/main/java/nativeimage/core/io/ReflectionConfigWriter.java b/reflection-config-generator/src/main/java/nativeimage/core/io/ReflectionConfigWriter.java
@@ -1,4 +1,4 @@
-package nativeimage.core;
+package nativeimage.core.io;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -10,8 +10,9 @@
 
 import com.fasterxml.jackson.databind.SequenceWriter;
 
-import static nativeimage.core.ReflectionConfigFileCreator.buildFileObject;
-import static nativeimage.core.ReflectionConfigFileCreator.createReflectionConfigWriter;
+import static nativeimage.core.io.ReflectionConfigFileCreator.buildFileObject;
+import static nativeimage.core.io.ReflectionConfigFileCreator.createReflectionConfigWriter;
+import nativeimage.core.ReflectionConfigAppender;
 import nativeimage.core.domain.ReflectionConfig;
 
 public class ReflectionConfigWriter implements ReflectionConfigAppender, Closeable {

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,8 @@ public static Class<?> forName(String className) {`
`29`	`29`	`throw new RuntimeException(e);`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ public static boolean doClassOwnPossibleSubClassOrIsTheSame(String expected, String current) {`
	`34`	`+ return current.startsWith(expected); // todo talvez tenha que ser melhor validado`
	`35`	`+ }`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,7 @@ private static <T>void find(Element e, Predicate<Element> predicate, List<Elemen`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ public static List<Element> findNestedClasses(Element element) {`
	`44`	`+ return find(element, ElementKind.CLASS);`
	`45`	`+ }`
`43`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import java.util.Arrays;`
`4`	`4`	`import java.util.HashSet;`
	`5`	`+import java.util.Objects;`
`5`	`6`	`import java.util.Set;`
`6`	`7`
`7`	`8`	`import javax.lang.model.element.Element;`
`@@ -41,4 +42,7 @@ private static boolean isTypeElement(Element e) {`
`41`	`42`	`return TYPE_ELEMENTS.contains(e.getKind());`
`42`	`43`	`}`
`43`	`44`
	`45`	`+ public static boolean isEquals(Element element, String className) {`
	`46`	`+ return Objects.equals(ElementUtils.toClassName(element), className);`
	`47`	`+ }`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package nativeimage.core;`
	`1`	`+package nativeimage.core.io;`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`