Fixing void class check bug

Author: mageddo

aptools/src/main/java/com/mageddo/aptools/ClassUtils.java

@@ -10,7 +10,7 @@ private ClassUtils() {
 
 	public static String getClassPackage(String className) {
 		final int lastIndexOf = className.lastIndexOf('.');
-		if(lastIndexOf < 0){
+		if (lastIndexOf < 0) {
 			return className;
 		}
 		return className.substring(0, lastIndexOf);
@@ -20,7 +20,7 @@ public static boolean doPackageOwnClass(String packageName, String className) {
 		return getClassPackage(className).contains(packageName);
 	}
 
-	public static List<Class<?>> findNestClasses(Class<?> clazz){
+	public static List<Class<?>> findNestClasses(Class<?> clazz) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -36,4 +36,12 @@ public static boolean doClassOwnPossibleSubClassOrIsTheSame(String expected, Str
 		// todo talvez tenha que ser melhor validado
 		return StringUtils.trimToEmpty(current).startsWith(expected);
 	}
+
+	public static boolean isAssignableFrom(Class a, Class b) {
+		return a.isAssignableFrom(b);
+	}
+
+	public static String getName(Class clazz) {
+		return clazz.getName();
+	}
 }

aptools/src/main/java/com/mageddo/aptools/log/ApLogger.java

@@ -3,11 +3,14 @@
 import javax.annotation.processing.Messager;
 import javax.tools.Diagnostic.Kind;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 /**
  *
  */
 public class ApLogger implements Logger {
 
+	public static final Kind LOG_LEVEL = Kind.OTHER;
 	private final Messager messager;
 
 	public ApLogger(Messager messager) {
@@ -16,6 +19,14 @@ public ApLogger(Messager messager) {
 
 	@Override
 	public void error(String format, Object... args) {
+		if (args.length > 0 && args[args.length - 1] instanceof Throwable) {
+			args[args.length - 1] = ExceptionUtils.getStackTrace((Throwable) args[args.length - 1]);
+			this.log(
+					Kind.ERROR,
+					format + "\n%s",
+					args
+			);
+		}
 		this.log(Kind.ERROR, format, args);
 	}
 
@@ -35,7 +46,7 @@ public void debug(String format, Object... args) {
 	}
 
 	private void log(Kind level, String format, Object[] args) {
-		if(level.ordinal() > Kind.NOTE.ordinal()){
+		if (level.ordinal() > LOG_LEVEL.ordinal()) {
 			return;
 		}
 		messager.printMessage(level, String.format(format, args));

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

@@ -24,7 +24,7 @@
 import nativeimage.core.domain.ReflectionConfig;
 import nativeimage.core.io.NativeImagePropertiesWriter;
 import nativeimage.core.io.ReflectionConfigWriter;
-import static nativeimage.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
+import static nativeimage.core.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
 
 /**
  * Will generate native image reflection config to project source classes.
@@ -95,9 +95,9 @@ void addMatchingProjectLibsClasses(Reflection reflection) {
 	}
 
 	static Class<?> chooseClass(Reflection reflection) {
-		return reflection.scanClass() != Void.class
-				? reflection.scanClass()
-				: ClassUtils.forName(reflection.scanClassName());
+		return ReflectionUtils.isVoid(reflection)
+				? ClassUtils.forName(reflection.scanClassName())
+				: reflection.scanClass();
 	}
 
 	void addClassAndNested(Reflection reflection, Class<?> clazz) {
@@ -135,8 +135,8 @@ void addMatchingProjectSourceElements(
 	private Element chooseElement(
 			Element element, Reflection reflection, RoundEnvironment roundEnv
 	) {
-		if (reflection.scanClass() != Void.class) {
-			return this.findElementAndNested(reflection.scanClass().getName(), roundEnv);
+		if (!ReflectionUtils.isVoid(reflection)) {
+			return this.findElementAndNested(ClassUtils.getName(reflection.scanClass()), roundEnv);
 		} else if (!reflection.scanClassName().isEmpty()) {
 			return this.findElementAndNested(reflection.scanClassName(), roundEnv);
 		}

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

@@ -0,0 +1,13 @@
+package nativeimage.core;
+
+import javax.lang.model.type.MirroredTypeException;
+
+public class ReflectionUtils {
+	public static boolean isVoid(nativeimage.Reflection reflection) {
+		try {
+			return reflection.scanClass() == Void.class;
+		} catch (MirroredTypeException e) {
+			return e.getTypeMirror().toString().startsWith(Void.class.getName());
+		}
+	}
+}

…thirdparty/ThirdPartyPackageScanner.java …thirdparty/ThirdPartyPackageScanner.javareflection-config-generator/src/main/java/nativeimage/thirdparty/ThirdPartyPackageScanner.java renamed to reflection-config-generator/src/main/java/nativeimage/core/thirdparty/ThirdPartyPackageScanner.java reflection-config-generator/src/main/java/nativeimage/thirdparty/ThirdPartyPackageScanner.java renamed to reflection-config-generator/src/main/java/nativeimage/core/thirdparty/ThirdPartyPackageScanner.java

@@ -1,4 +1,4 @@
-package nativeimage.thirdparty;
+package nativeimage.core.thirdparty;
 
 import java.lang.reflect.Modifier;
 import java.util.LinkedHashSet;

reflection-config-generator/src/main/java/nativeimage/processor/AnnotationProcessor.java

@@ -17,8 +17,6 @@
 import com.mageddo.aptools.log.Logger;
 import com.mageddo.aptools.log.LoggerFactory;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
 import nativeimage.core.NativeImageReflectionConfigGenerator;
 
 @SupportedAnnotationTypes("*")
@@ -43,7 +41,12 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 				processor.process(new LinkedHashSet<>(annotations), roundEnv);
 			}
 		} catch (Exception e){
-			this.logger.error("fatal: %s\n ", e.getMessage(), ExceptionUtils.getStackTrace(e));
+			this.logger.error("fatal: %s", e.getMessage(), e);
+//			this.logger.error("%s fatal: %s\n %s",
+//					ClassUtils.getSimpleName(this),
+//					e.getMessage(),
+//					ExceptionUtils.getStackTrace(e)
+//			);
 		}
 		return false;
 	}