Fixing tests

Author: mageddo

reflection-config-generator/acceptance-tests/src/test/java/com/acme/ReflectionConfigGenerationTest.java

@@ -29,7 +29,7 @@ void mustConfigureReflectJson() throws JsonProcessingException {
 		final List<JsonNode> items = readReflectConfig();
 
 		// assert
-		assertEquals(11, items.size());
+		assertEquals(13, items.size());
 		assertEquals(getResourceAsString("/reflection-config-generation-test/001.json"), objectMapper.writeValueAsString(items));
 	}
 

reflection-config-generator/acceptance-tests/src/test/resources/reflection-config-generation-test/001.json

@@ -6,6 +6,22 @@
   "allPublicMethods" : false,
   "allPublicFields" : false,
   "allDeclaredFields" : true
+}, {
+  "name" : "com.acme.ClassWithNestedClass",
+  "allDeclaredConstructors" : false,
+  "allPublicConstructors" : false,
+  "allDeclaredMethods" : false,
+  "allPublicMethods" : false,
+  "allPublicFields" : false,
+  "allDeclaredFields" : false
+}, {
+  "name" : "com.acme.ClassWithNestedClass$NestedClass",
+  "allDeclaredConstructors" : false,
+  "allPublicConstructors" : false,
+  "allDeclaredMethods" : false,
+  "allPublicMethods" : false,
+  "allPublicFields" : false,
+  "allDeclaredFields" : false
 }, {
   "name" : "com.acme.Fruit",
   "allDeclaredConstructors" : true,
@@ -14,6 +30,14 @@
   "allPublicMethods" : true,
   "allPublicFields" : true,
   "allDeclaredFields" : true
+}, {
+  "name" : "com.acme.Fruit$ShouldNotScan",
+  "allDeclaredConstructors" : true,
+  "allPublicConstructors" : true,
+  "allDeclaredMethods" : true,
+  "allPublicMethods" : true,
+  "allPublicFields" : true,
+  "allDeclaredFields" : true
 }, {
   "name" : "com.acme.Person",
   "allDeclaredConstructors" : true,

reflection-config-generator/src/main/java/nativeimage/core/NativeImageReflectionConfigGenerator.java

@@ -17,9 +17,11 @@
 import com.mageddo.aptools.log.Logger;
 import com.mageddo.aptools.log.LoggerFactory;
 
+import org.apache.commons.lang3.StringUtils;
+
+import static com.mageddo.aptools.elements.ElementUtils.toClassName;
 import nativeimage.Reflection;
 import nativeimage.Reflections;
-import static com.mageddo.aptools.elements.ElementUtils.toClassName;
 import static nativeimage.core.NativeImages.solvePath;
 import nativeimage.core.domain.ReflectionConfig;
 import nativeimage.core.io.NativeImagePropertiesWriter;
@@ -135,10 +137,9 @@ void addMatchingProjectSourceElements(
 	private Element chooseElement(
 			Element element, Reflection reflection, RoundEnvironment roundEnv
 	) {
-		if (!ReflectionUtils.isVoid(reflection)) {
-			return this.findElementAndNested(ClassUtils.getName(reflection.scanClass()), roundEnv);
-		} else if (!reflection.scanClassName().isEmpty()) {
-			return this.findElementAndNested(reflection.scanClassName(), roundEnv);
+		final String className = ReflectionUtils.getClassName(reflection);
+		if (StringUtils.isNotBlank(className)) {
+			return this.findElementAndNested(className, roundEnv);
 		}
 		return element;
 	}

reflection-config-generator/src/main/java/nativeimage/core/ReflectionUtils.java

@@ -1,5 +1,9 @@
 package nativeimage.core;
 
+import nativeimage.Reflection;
+
+import org.apache.commons.lang3.StringUtils;
+
 import javax.lang.model.type.MirroredTypeException;
 
 public class ReflectionUtils {
@@ -10,4 +14,20 @@ public static boolean isVoid(nativeimage.Reflection reflection) {
 			return e.getTypeMirror().toString().startsWith(Void.class.getName());
 		}
 	}
+
+	public static String getClassName(Reflection reflectionAnn){
+		return StringUtils.firstNonBlank(getScanClass(reflectionAnn), reflectionAnn.scanClassName());
+	}
+
+	private static String getScanClass(Reflection reflectionAnn) {
+		if (ReflectionUtils.isVoid(reflectionAnn)) {
+			return null;
+		}
+		try {
+			return reflectionAnn.scanClass().getName();
+		} catch (MirroredTypeException e) {
+			return e.getTypeMirror().toString();
+		}
+	}
+
 }

reflection-config-generator/src/main/java/nativeimage/core/TypeBuilder.java

@@ -3,8 +3,6 @@
 import java.util.Collections;
 import java.util.Set;
 
-import javax.lang.model.type.MirroredTypeException;
-
 import com.mageddo.aptools.ClassUtils;
 
 import org.apache.commons.lang3.StringUtils;
@@ -18,9 +16,7 @@ private TypeBuilder() {
 	}
 
 	public static Set<String> of(Reflection reflectionAnn, String clazzName) {
-		final String expectedClassName = StringUtils.firstNonBlank(
-				getScanClass(reflectionAnn), reflectionAnn.scanClassName()
-		);
+		final String expectedClassName = ReflectionUtils.getClassName(reflectionAnn);
 		if(StringUtils.isNotBlank(expectedClassName)){
 			if(ClassUtils.doClassOwnPossibleSubClassOrIsTheSame(expectedClassName, clazzName)){
 				return toSet(clazzName);
@@ -35,17 +31,6 @@ public static Set<String> of(Reflection reflectionAnn, String clazzName) {
 		return toSet(clazzName);
 	}
 
-	private static String getScanClass(Reflection reflectionAnn) {
-		if (reflectionAnn.scanClass() == Void.class) {
-			return null;
-		}
-		try {
-			return reflectionAnn.scanClass().getName();
-		} catch (MirroredTypeException e) {
-			return e.getTypeMirror().toString();
-		}
-	}
-
 	private static Set<String> toSet(String type) {
 		return Collections.singleton(type);
 	}