Graal: Report controller methods and generate file to build dir

mrhaki · Sep 5, 2018 · 526ef41 · 526ef41
1 parent 6de2481
commit 526ef41
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 7 deletions.
diff --git a/core/src/main/java/io/micronaut/core/reflect/ClassLoadingReporter.java b/core/src/main/java/io/micronaut/core/reflect/ClassLoadingReporter.java
@@ -93,6 +93,7 @@ static void reportMissing(String type) {
         }
     }
 
+
     /**
      * Finish reporting classloading.
      */

diff --git a/function-web/src/main/java/io/micronaut/function/web/AnnotatedFunctionRouteBuilder.java b/function-web/src/main/java/io/micronaut/function/web/AnnotatedFunctionRouteBuilder.java
@@ -22,6 +22,7 @@
 import io.micronaut.context.processor.ExecutableMethodProcessor;
 import io.micronaut.core.convert.ConversionService;
 import io.micronaut.core.naming.NameUtils;
+import io.micronaut.core.reflect.ClassLoadingReporter;
 import io.micronaut.core.reflect.ClassUtils;
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.StringUtils;
@@ -162,6 +163,11 @@ public void process(BeanDefinition<?> beanDefinition, ExecutableMethod<?, ?> met
                     LOG.debug("Created Route to Function: {}", route);
                 }
 
+                ClassLoadingReporter.reportBeanPresent(method.getReturnType().getType());
+                for (Class argumentType : method.getArgumentTypes()) {
+                    ClassLoadingReporter.reportBeanPresent(argumentType);
+                }
+
                 String functionPath = resolveFunctionPath(methodName, declaringType, functionName);
                 availableFunctions.put(functionName, URI.create(functionPath));
 

diff --git a/graal/src/main/java/io/micronaut/graal/reflect/GraalClassLoadingReporter.java b/graal/src/main/java/io/micronaut/graal/reflect/GraalClassLoadingReporter.java
@@ -61,12 +61,30 @@ public boolean isEnabled() {
             return false;
         } else {
             String f = System.getProperty(REFLECTION_JSON_FILE);
-            File file = new File(StringUtils.isNotEmpty(f) ? f : "./reflect.json");
-            boolean enabled = !file.exists();
-            if (enabled) {
-                System.out.println("Graal Class Loading Analysis Enabled.");
+            if (StringUtils.isNotEmpty(f)) {
+                File file = new File(f);
+                boolean enabled = !file.exists();
+                if (enabled) {
+                    System.out.println("Graal Class Loading Analysis Enabled.");
+                }
+                return enabled;
+            } else {
+                File parent = new File("build");
+                if (!parent.exists() || !parent.isDirectory()) {
+                    parent = new File("target");
+                }
+
+                if (!parent.exists() || !parent.isDirectory()) {
+                    return false;
+                } else {
+                    File file = new File(parent, "reflect.json");
+                    boolean enabled = !file.exists();
+                    if (enabled) {
+                        System.out.println("Graal Class Loading Analysis Enabled.");
+                    }
+                    return enabled;
+                }
             }
-            return enabled;
         }
     }
 
@@ -92,7 +110,21 @@ public void onMissing(String name) {
     @Override
     public void close() {
         String f = System.getProperty(REFLECTION_JSON_FILE);
-        File file = new File(StringUtils.isNotEmpty(f) ? f : "./reflect.json");
+        File file;
+        if (StringUtils.isNotEmpty(f)) {
+            file = new File(f);
+        } else {
+            File parent = new File("build");
+            if (!parent.exists() || !parent.isDirectory()) {
+                parent = new File("target");
+            }
+
+            if (!parent.exists() || !parent.isDirectory()) {
+                return;
+            } else {
+                file = new File(parent, "reflect.json");
+            }
+        }
 
         if (!file.exists()) {
             ClassLoader cls = GraalClassLoadingReporter.class.getClassLoader();

diff --git a/...c/main/java/io/micronaut/management/endpoint/processors/AbstractEndpointRouteBuilder.java b/...c/main/java/io/micronaut/management/endpoint/processors/AbstractEndpointRouteBuilder.java
@@ -22,6 +22,7 @@
 import io.micronaut.core.async.subscriber.Completable;
 import io.micronaut.core.convert.ConversionService;
 import io.micronaut.core.naming.NameUtils;
+import io.micronaut.core.reflect.ClassLoadingReporter;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.uri.UriTemplate;
 import io.micronaut.inject.BeanDefinition;
@@ -98,7 +99,13 @@ public void process(BeanDefinition<?> beanDefinition, ExecutableMethod<?, ?> met
         Class<?> declaringType = method.getDeclaringType();
         if (method.hasStereotype(getSupportedAnnotation())) {
             Optional<String> endPointId = resolveActiveEndPointId(declaringType);
-            endPointId.ifPresent(id -> registerRoute(method, id));
+            endPointId.ifPresent(id -> {
+                ClassLoadingReporter.reportBeanPresent(method.getReturnType().getType());
+                for (Class argumentType : method.getArgumentTypes()) {
+                    ClassLoadingReporter.reportBeanPresent(argumentType);
+                }
+                registerRoute(method, id);
+            });
         }
     }
 

diff --git a/router/src/main/java/io/micronaut/web/router/AnnotatedMethodRouteBuilder.java b/router/src/main/java/io/micronaut/web/router/AnnotatedMethodRouteBuilder.java
@@ -20,6 +20,7 @@
 import io.micronaut.context.processor.ExecutableMethodProcessor;
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.convert.ConversionService;
+import io.micronaut.core.reflect.ClassLoadingReporter;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.MediaType;
@@ -240,6 +241,10 @@ public void process(BeanDefinition<?> beanDefinition, ExecutableMethod<?, ?> met
         actionAnn.ifPresent(annotationClass -> {
                 BiConsumer<BeanDefinition, ExecutableMethod> handler = httpMethodsHandlers.get(annotationClass);
                 if (handler != null) {
+                    ClassLoadingReporter.reportBeanPresent(method.getReturnType().getType());
+                    for (Class argumentType : method.getArgumentTypes()) {
+                        ClassLoadingReporter.reportBeanPresent(argumentType);
+                    }
                     handler.accept(beanDefinition, method);
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,7 @@ static void reportMissing(String type) { @@
             }
         }
         /**
          * Finish reporting classloading.
          */
@@ Expand Down @@