Reverting shared library annotation processing configs

Author: mageddo

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

@@ -20,7 +20,7 @@ public static boolean doPackageOwnClass(String packageName, String className) {
 		return getClassPackage(className).contains(packageName);
 	}
 
-	public static List<String> findNestClasses(String clazz) {
+	public static List<Class<?>> findNestClasses(Class<?> clazz) {
 		throw new UnsupportedOperationException("Not able to find class nested classes yet");
 	}
 

build.gradle

@@ -20,7 +20,7 @@ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
 
 subprojects {
 
-  apply plugin: "java"
+  apply plugin: "java-library"
 
   repositories {
     mavenLocal()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reflection-config-generator/acceptance-tests/src/main/java/com/acme/ReflectionConfig.java

@@ -22,10 +22,6 @@
 		@Reflection(
 				scanPackage = "com.acme.subpackage",
 				declaredFields = true
-		),
-		@Reflection(
-				scanPackage = "com.fasterxml.jackson.core.util",
-				scanLibs = true
 		)
 })
 public class ReflectionConfig {

reflection-config-generator/build.gradle

@@ -1,12 +1,34 @@
+plugins {
+	id "com.github.johnrengelman.shadow" version "5.2.0"
+}
+
+def mainClassName = "nativeimage.core.thirdparty.Main"
+
+jar {
+	manifest {
+		attributes(
+				"Main-Class": mainClassName
+		)
+	}
+}
+
+shadowJar {
+	mergeServiceFiles()
+	transform(com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer) {
+		mergeStrategy = "append"
+	}
+}
+
 dependencies {
 
-  compile(project(":aptools"))
-  compile("org.apache.commons:commons-lang3:3.9")
-  compile("com.fasterxml.jackson.core:jackson-databind:2.10.1")
-  compileOnly files(org.gradle.internal.jvm.Jvm.current().toolsJar)
+	api(project(":aptools"))
+	compile("org.apache.commons:commons-lang3:3.9")
+	compile('com.fasterxml.jackson.core:jackson-databind:2.12.7.1')
+	compile("org.slf4j:slf4j-api:2.0.6")
+	compileOnly files(org.gradle.internal.jvm.Jvm.current().toolsJar)
 
-  testCompile group: 'commons-io', name: 'commons-io', version: '2.6'
-  testCompile "org.junit.jupiter:junit-jupiter:5.4.2"
-  testCompile "org.mockito:mockito-junit-jupiter:3.1.0"
+	testCompile group: 'commons-io', name: 'commons-io', version: '2.7'
+	testCompile "org.junit.jupiter:junit-jupiter:5.4.2"
+	testCompile "org.mockito:mockito-junit-jupiter:3.1.0"
 
 }

reflection-config-generator/src/main/java/nativeimage/Reflection.java

@@ -67,9 +67,4 @@
    */
   boolean declaredFields() default false;
 
-  /**
-   * If must scan for package or class in project libs instead of in the source.
-   */
-  boolean scanLibs() default false;
-
 }

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

@@ -26,7 +26,6 @@
 import nativeimage.core.domain.ReflectionConfig;
 import nativeimage.core.io.NativeImagePropertiesWriter;
 import nativeimage.core.io.ReflectionConfigWriter;
-import static nativeimage.core.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
 
 /**
  * Will generate native image reflection config to project source classes.
@@ -36,13 +35,11 @@ public class NativeImageReflectionConfigGenerator implements Processor {
 	private final Logger log = LoggerFactory.getLogger();
 	private final ProcessingEnvironment processingEnv;
 	private final Set<ReflectionConfig> classes;
-	private final Set<ReflectionConfig> thirdPartyClasses;
 	private String classPackage;
 
 	public NativeImageReflectionConfigGenerator(ProcessingEnvironment processingEnv) {
 		this.processingEnv = processingEnv;
 		this.classes = new LinkedHashSet<>();
-		this.thirdPartyClasses = new LinkedHashSet<>();
 	}
 
 	@Override
@@ -79,42 +76,9 @@ void processElementsForAnnotation(
 			RoundEnvironment roundEnv, Element element, Reflection reflection
 	) {
 		log.debug(
-				"m=processElementsForAnnotation, scanLibs=%b, reflection=%s",
-				reflection.scanLibs(), reflection
+				"m=processElementsForAnnotation, reflection=%s", reflection
 		);
-		if (reflection.scanLibs()) {
-			this.addMatchingProjectLibsClasses(reflection);
-		} else {
-			this.addMatchingProjectSourceElements(roundEnv, element, reflection);
-		}
-	}
-
-	void addMatchingProjectLibsClasses(Reflection reflection) {
-		if (reflection.scanPackage().isEmpty()) {
-			this.addClassAndNested(reflection, ReflectionUtils.getClassName(reflection));
-		} else {
-			final Set<String> classes = findPackageClasses(reflection.scanPackage());
-			for (final String clazz : classes) {
-				this.addClass(clazz, reflection);
-			}
-		}
-	}
-
-	void addClassAndNested(Reflection reflection, String clazz) {
-		this.addClass(clazz, reflection);
-		for (final String innerClass : ClassUtils.findNestClasses(clazz)) {
-			this.addClass(innerClass, reflection);
-			log.debug("m=addMatchingProjectLibsClasses, innerClass=%s", innerClass);
-		}
-	}
-
-	void addClass(String clazz, Reflection reflection) {
-		log.debug("m=addClass, clazz=%s", clazz, clazz);
-		// todo check if the name is correct
-		for (final ReflectionConfig config : ReflectionConfigBuilder.of(reflection, clazz)) {
-			this.thirdPartyClasses.remove(config);
-			this.thirdPartyClasses.add(config);
-		}
+		this.addMatchingProjectSourceElements(roundEnv, element, reflection);
 	}
 
 	void addMatchingProjectSourceElements(
@@ -185,38 +149,27 @@ private void writeObjects() {
 		final String reflectFile = solvePath(classPackage, "reflect.json");
 		final String reflectFileThirdParty = solvePath(classPackage, "reflect-third-party.json");
 
-		this.subtractSourceFromThirdPartyClass();
-
 		try (
 				ReflectionConfigWriter appender =
 						new ReflectionConfigWriter(this.processingEnv, reflectFile);
-
-				ReflectionConfigWriter appenderThirdParty =
-						new ReflectionConfigWriter(this.processingEnv, reflectFileThirdParty)
 		) {
 
 			appender.writeAll(this.classes);
-			appenderThirdParty.writeAll(this.thirdPartyClasses);
 
 			final URI nativeImageFile = NativeImagePropertiesWriter.write(
 					this.processingEnv, classPackage, reflectFile, reflectFileThirdParty
 			);
 			log.info(
-					"status=reflect-generation-done, objects=%d, 3rdObjects=%s, path=%s",
-					this.classes.size(), this.thirdPartyClasses.size(), nativeImageFile
+					"status=reflect-generation-done, objects=%d, path=%s",
+					this.classes.size(), nativeImageFile
 			);
 
 			log.debug("objects=%s", this.classes);
-			log.debug("3rdObjects=%s", this.classes);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	boolean subtractSourceFromThirdPartyClass() {
-		return this.classes.removeAll(this.thirdPartyClasses);
-	}
-
 	private String getClassPackage() {
 		return this.classPackage == null ? "graal-reflection-configuration" : this.classPackage;
 	}

reflection-config-generator/src/main/java/nativeimage/core/thirdparty/Main.java

@@ -0,0 +1,12 @@
+package nativeimage.core.thirdparty;
+
+import static nativeimage.core.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
+
+public class Main {
+	public static void main(String[] args) {
+		System.out.println("> Finding classes for package: " + args[0]);
+		for (Class<?> clazz : findPackageClasses(args[0])) {
+			System.out.println(clazz);
+		}
+	}
+}

reflection-config-generator/src/main/java/nativeimage/core/thirdparty/ThirdPartyPackageScanner.java

@@ -1,14 +1,16 @@
 package nativeimage.core.thirdparty;
 
-import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.mageddo.aptools.ClassUtils;
 import com.mageddo.aptools.log.Logger;
 import com.mageddo.aptools.log.LoggerFactory;
 
 import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
+import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.SubTypesScanner;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
+import org.reflections.util.FilterBuilder;
 
 public class ThirdPartyPackageScanner {
 
@@ -19,27 +21,36 @@ public class ThirdPartyPackageScanner {
 	 *
 	 * @param packageName something like com.mageddo
 	 */
-	public static Set<String> findPackageClasses(String packageName) {
-
-		final Set<String> classes = new Reflections(packageName)
-				.getAll(Scanners.SubTypes);
-
-		final Set<String> filteredClasses = new LinkedHashSet<>();
-		for (String clazz : classes) {
-			if (ClassUtils.doPackageOwnClass(packageName, clazz)) {
-				filteredClasses.add(clazz);
-			}
-		}
+	public static Set<Class<?>> findPackageClasses(String packageName) {
+
+		Set<Class<?>> classes = new Reflections(
+				new ConfigurationBuilder()
+						.setScanners(new SubTypesScanner(false), new ResourcesScanner())
+						.addUrls(ClasspathHelper.forJavaClassPath())
+						.filterInputsBy(new FilterBuilder()
+								.includePackage(packageName))
+		)
+				.getSubTypesOf(Object.class);
+
+//		final Set<String> classes = new Reflections(packageName)
+//				.getAll(Scanners.SubTypes);
+
+//		final Set<String> filteredClasses = new LinkedHashSet<>();
+//		for (String clazz : classes) {
+//			if (ClassUtils.doPackageOwnClass(packageName, clazz)) {
+//				filteredClasses.add(clazz);
+//			}
+//	}
 //		final Set<String> filteredClasses = classes
 //				.stream()
 //				.filter(it -> ClassUtils.doPackageOwnClass(packageName, it))
 //				.collect(Collectors.toSet());
 
-		log.warn(
-				"status=packageScanned, classes=%d, afterFilter=%d, package=%s",
-				classes.size(), filteredClasses.size(), packageName
-		);
-		return filteredClasses;
-	}
+//		log.debug(
+//				"status=packageScanned, classes=%d, afterFilter=%d, package=%s",
+//				classes.size(),filteredClasses.size(),packageName
+//		);
+		return classes;
+}
 
 }

reflection-config-generator/src/main/java/nativeimage/core/thirdparty/ThirdPartyReflectionConfigGenerator.java

@@ -0,0 +1,45 @@
+package nativeimage.core.thirdparty;
+
+import java.util.Set;
+
+import com.mageddo.aptools.ClassUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nativeimage.Reflection;
+import static nativeimage.core.ReflectionUtils.getClassName;
+import static nativeimage.core.thirdparty.ThirdPartyPackageScanner.findPackageClasses;
+
+public class ThirdPartyReflectionConfigGenerator {
+
+	private final Logger log = LoggerFactory.getLogger(getClass());
+
+	void addClass(Class<?> clazz, Reflection reflection) {
+		log.debug("m=addClass, clazz=%s", clazz, clazz);
+		// todo check if the name is correct
+//		for (final ReflectionConfig config : ReflectionConfigBuilder.of(reflection, clazz)) {
+//		}
+	}
+
+
+	void addClassAndNested(Reflection reflection, Class<?> clazz) {
+		this.addClass(clazz, reflection);
+		for (final Class<?> innerClass : ClassUtils.findNestClasses(clazz)) {
+			this.addClass(innerClass, reflection);
+			log.debug("m=addMatchingProjectLibsClasses, innerClass=%s", innerClass);
+		}
+	}
+
+	void addMatchingProjectLibsClasses(Reflection reflection) {
+		if (reflection.scanPackage().isEmpty()) {
+			this.addClassAndNested(reflection, ClassUtils.forName(getClassName(reflection)));
+		} else {
+			final Set<Class<?>> classes = findPackageClasses(reflection.scanPackage());
+			for (final Class<?> clazz : classes) {
+				this.addClass(clazz, reflection);
+			}
+		}
+	}
+
+}