Use access-filter for filtering gradle and junit metadata

Author: dnestoro

common/utils/src/main/java/org/graalvm/buildtools/agent/AgentConfiguration.java

@@ -40,13 +40,21 @@
  */
 package org.graalvm.buildtools.agent;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
+import java.nio.file.CopyOption;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 public class AgentConfiguration implements Serializable {
 
+    private static final String DEFAULT_ACCESS_FILTER_FILE = "/access-filter.json";
     private final Collection<String> callerFilterFiles;
     private final Collection<String> accessFilterFiles;
     private final Boolean builtinCallerFilter;
@@ -79,6 +87,7 @@ public AgentConfiguration(Collection<String> callerFilterFiles,
                               AgentMode agentMode) {
         this.callerFilterFiles = callerFilterFiles;
         this.accessFilterFiles = accessFilterFiles;
+        addDefaultAccessFilter();
         this.builtinCallerFilter = builtinCallerFilter;
         this.builtinHeuristicFilter = builtinHeuristicFilter;
         this.experimentalPredefinedClasses = experimentalPredefinedClasses;
@@ -127,4 +136,18 @@ private void addToCmd(String option, Boolean value, List<String> cmdLine) {
         }
     }
 
+    private void addDefaultAccessFilter() {
+        try(InputStream accessFilter = AgentConfiguration.class.getResourceAsStream(DEFAULT_ACCESS_FILTER_FILE)) {
+            if (accessFilter != null) {
+                Path accessFilterPath = Files.createTempFile("access-filter", ".json");
+                Files.copy(accessFilter, accessFilterPath, StandardCopyOption.REPLACE_EXISTING);
+                accessFilterFiles.add(accessFilterPath.toString());
+            } else {
+                throw new IOException("Cannot find access-filter.json on default location: " + DEFAULT_ACCESS_FILTER_FILE);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Cannot add default access-filter.json" ,e);
+        }
+    }
+
 }

common/utils/src/main/resources/access-filter.json

@@ -0,0 +1,13 @@
+{
+  "rules": [
+    {
+      "includeClasses": "**"
+    },
+    {
+      "excludeClasses": "org.gradle.**"
+    },
+    {
+      "excludeClasses": "org.junit.**"
+    }
+  ]
+}

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java

@@ -64,7 +64,6 @@
 import org.graalvm.buildtools.gradle.tasks.NativeRunTask;
 import org.graalvm.buildtools.gradle.tasks.actions.CleanupAgentFilesAction;
 import org.graalvm.buildtools.gradle.tasks.actions.MergeAgentFilesAction;
-import org.graalvm.buildtools.gradle.tasks.actions.ProcessGeneratedGraalResourceFilesAction;
 import org.graalvm.buildtools.utils.SharedConstants;
 import org.graalvm.reachability.DirectoryConfiguration;
 import org.gradle.api.Action;
@@ -871,11 +870,6 @@ public void execute(@Nonnull Task task) {
                 execOperations));
 
         taskToInstrument.doLast(new CleanupAgentFilesAction(mergeInputDirs, fileOperations));
-
-        taskToInstrument.doLast(new ProcessGeneratedGraalResourceFilesAction(
-                outputDir,
-                graalExtension.getAgent().getFilterableEntries()
-        ));
     }
 
     private static void injectTestPluginDependencies(Project project, Property<Boolean> testSupportEnabled) {

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/DefaultGraalVmExtension.java

@@ -78,8 +78,6 @@ public DefaultGraalVmExtension(NamedDomainObjectContainer<NativeImageOptions> na
         agentOpts.getEnabled().convention(false);
         agentOpts.getModes().getConditional().getParallel().convention(true);
         agentOpts.getMetadataCopy().getMergeWithExisting().convention(false);
-        // TODO: replace with agent access filter
-        // agentOpts.getFilterableEntries().convention(Arrays.asList("org.gradle.", "org.junit."));
         agentOpts.getBuiltinHeuristicFilter().convention(true);
         agentOpts.getBuiltinCallerFilter().convention(true);
         agentOpts.getEnableExperimentalPredefinedClasses().convention(false);