Style fixes

Author: olpaw

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/ReplaySupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
 import com.oracle.svm.core.util.json.JsonWriter;
 import com.oracle.svm.util.ClassUtil;
 
-class ReplaySupport {
+final class ReplaySupport {
 
     static final String REPLAY_OPTION = "--replay";
 
@@ -276,12 +276,12 @@ Path substituteModulePath(Path origPath) {
     static final class ReplayPathSubstitutionError extends Error {
         public final Path origPath;
 
-        public ReplayPathSubstitutionError(String message, Path origPath) {
+        ReplayPathSubstitutionError(String message, Path origPath) {
             super(message);
             this.origPath = origPath;
         }
 
-        public ReplayPathSubstitutionError(String message, Path origPath, Throwable cause) {
+        ReplayPathSubstitutionError(String message, Path origPath, Throwable cause) {
             super(message, cause);
             this.origPath = origPath;
         }
@@ -453,7 +453,7 @@ private static void printBuildArg(String entry, JsonWriter w) throws IOException
         w.quote(entry);
     }
 
-    private static class PathMapParser extends ConfigurationParser {
+    private static final class PathMapParser extends ConfigurationParser {
 
         private final Map<Path, Path> pathMap;
 
@@ -479,7 +479,7 @@ public void parseAndRegister(Object json, URI origin) throws IOException {
         }
     }
 
-    private static class BuildArgsParser extends ConfigurationParser {
+    private static final class BuildArgsParser extends ConfigurationParser {
 
         private final List<String> args;
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java

@@ -59,8 +59,8 @@
 import com.oracle.svm.core.util.ClasspathUtils;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
-
 import com.oracle.svm.util.ClassUtil;
+
 import jdk.internal.module.Modules;
 
 public class ClassLoaderSupportImpl extends ClassLoaderSupport {
@@ -111,7 +111,7 @@ public void collectResources(ResourceCollector resourceCollector) {
         for (Path classpathFile : classLoaderSupport.classpath()) {
             try {
                 if (Files.isDirectory(classpathFile)) {
-                    scanDirectory(classpathFile, resourceCollector, classLoaderSupport);
+                    scanDirectory(classpathFile, resourceCollector);
                 } else if (ClasspathUtils.isJar(classpathFile)) {
                     scanJar(classpathFile, resourceCollector);
                 }
@@ -143,7 +143,7 @@ private static void collectResourceFromModule(ResourceCollector resourceCollecto
         }
     }
 
-    private static void scanDirectory(Path root, ResourceCollector collector, NativeImageClassLoaderSupport support) throws IOException {
+    private static void scanDirectory(Path root, ResourceCollector collector) throws IOException {
         Map<String, List<String>> matchedDirectoryResources = new HashMap<>();
         Set<String> allEntries = new HashSet<>();
 

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ClassUtil.java

@@ -35,7 +35,7 @@ public final class ClassUtil {
     public static final Path CLASS_MODULE_PATH_EXCLUDE_DIRECTORIES_ROOT = Paths.get("/");
     public static final Set<Path> CLASS_MODULE_PATH_EXCLUDE_DIRECTORIES = getClassModulePathExcludeDirectories();
 
-    static private Set<Path> getClassModulePathExcludeDirectories() {
+    private static Set<Path> getClassModulePathExcludeDirectories() {
         return Stream.of("dev", "sys", "proc", "etc", "var", "tmp", "boot", "lost+found")
                         .map(CLASS_MODULE_PATH_EXCLUDE_DIRECTORIES_ROOT::resolve).collect(Collectors.toUnmodifiableSet());
     }