Make spotless happy

Author: melix

org.graalvm.python.embedding/src/main/java/org/graalvm/python/embedding/VirtualFileSystem.java

@@ -107,7 +107,7 @@ public static final class Builder {
 		private HostIO allowHostIO = HostIO.READ_WRITE;
 		private boolean caseInsensitive = VirtualFileSystemImpl.isWindows();
 
-        private ClassLoader resourceClassLoader;
+		private ClassLoader resourceClassLoader;
 
 		private String resourceDirectory;
 
@@ -244,7 +244,8 @@ public Builder unixMountPoint(String unixMountPoint) {
 		 * cases when for example <code>VirtualFileSystem</code> is on module path and
 		 * the jar containing the resources is on class path.
 		 *
-		 * @param c the class for loading the resources
+		 * @param c
+		 *            the class for loading the resources
 		 * @return the builder
 		 * @since 24.2.0
 		 */
@@ -253,21 +254,22 @@ public Builder resourceLoadingClass(Class<?> c) {
 			return this;
 		}
 
-        /**
-         * By default, virtual filesystem resources are loaded by delegating to
-         * <code>VirtualFileSystem.class.getClassLoader().getResource(name)</code>. Use
-         * <code>resourceClassLoader</code> to determine where to locate resources in
-         * cases when for example <code>VirtualFileSystem</code> is on module path and
-         * the jar containing the resources is on class path.
-         *
-         * @param cl the classloader used to load resources
-         * @return this builder
-         * @since 26.0.0
-         */
-        public Builder resourceClassLoader(ClassLoader cl) {
-            resourceClassLoader = cl;
-            return this;
-        }
+		/**
+		 * By default, virtual filesystem resources are loaded by delegating to
+		 * <code>VirtualFileSystem.class.getClassLoader().getResource(name)</code>. Use
+		 * <code>resourceClassLoader</code> to determine where to locate resources in
+		 * cases when for example <code>VirtualFileSystem</code> is on module path and
+		 * the jar containing the resources is on class path.
+		 *
+		 * @param cl
+		 *            the classloader used to load resources
+		 * @return this builder
+		 * @since 26.0.0
+		 */
+		public Builder resourceClassLoader(ClassLoader cl) {
+			resourceClassLoader = cl;
+			return this;
+		}
 
 		/**
 		 * This filter applied to files in the virtual filesystem treats them as
@@ -308,8 +310,8 @@ public VirtualFileSystem build() {
 						? Path.of(DEFAULT_WINDOWS_MOUNT_POINT)
 						: Path.of(DEFAULT_UNIX_MOUNT_POINT);
 			}
-			return new VirtualFileSystem(extractFilter, mountPoint, allowHostIO, resourceClassLoader,
-					resourceDirectory, caseInsensitive);
+			return new VirtualFileSystem(extractFilter, mountPoint, allowHostIO, resourceClassLoader, resourceDirectory,
+					caseInsensitive);
 		}
 	}
 
@@ -327,7 +329,7 @@ private VirtualFileSystem(Predicate<Path> extractFilter, Path mountPoint, HostIO
 			ClassLoader resourceClassLoader, String resourceDirectory, boolean caseInsensitive) {
 
 		this.impl = new VirtualFileSystemImpl(extractFilter, mountPoint, resourceDirectory, allowHostIO,
-				resourceClassLoader,  caseInsensitive);
+				resourceClassLoader, caseInsensitive);
 		this.delegatingFileSystem = VirtualFileSystemImpl.createDelegatingFileSystem(impl);
 	}
 

org.graalvm.python.embedding/src/main/java/org/graalvm/python/embedding/VirtualFileSystemImpl.java

@@ -169,12 +169,12 @@ private static String absoluteResourcePath(String... components) {
 	 * Maps platform-specific paths to entries.
 	 */
 	private final Map<String, BaseEntry> vfsEntries = new HashMap<>();
-    
-    /**
-     * Classloader used to read resources. By defaut, the classloader of
-     * VirtualFileSystem.class.
-     */
-    private final ClassLoader resourceClassLoader;
+
+	/**
+	 * Classloader used to read resources. By defaut, the classloader of
+	 * VirtualFileSystem.class.
+	 */
+	private final ClassLoader resourceClassLoader;
 
 	static final String PLATFORM_SEPARATOR = Paths.get("").getFileSystem().getSeparator();
 	private static final char RESOURCE_SEPARATOR_CHAR = '/';
@@ -311,24 +311,26 @@ private void removeExtractDir() {
 	 */
 	VirtualFileSystemImpl(Predicate<Path> extractFilter, Path mountPoint, String resourceDirectory, HostIO allowHostIO,
 			ClassLoader resourceClassLoader, boolean caseInsensitive) {
-        if (resourceClassLoader != null) {
-            this.resourceClassLoader = resourceClassLoader;
-        } else {
-            this.resourceClassLoader = VirtualFileSystem.class.getClassLoader();
-        }
+		if (resourceClassLoader != null) {
+			this.resourceClassLoader = resourceClassLoader;
+		} else {
+			this.resourceClassLoader = VirtualFileSystem.class.getClassLoader();
+		}
 		this.caseInsensitive = caseInsensitive;
 		this.mountPoint = mountPoint;
 		this.mountPointLowerCase = mountPoint.toString().toLowerCase(Locale.ROOT);
 		this.vfsRoot = resourceDirectory == null ? DEFAULT_VFS_ROOT : resourceDirectory;
 		this.platformVenvPath = resourcePathToPlatformPath(absoluteResourcePath(vfsRoot, VFS_VENV));
 		this.platformSrcPath = resourcePathToPlatformPath(absoluteResourcePath(vfsRoot, VFS_SRC));
 
-        if (LOGGER.isLoggable(Level.FINE)) {
-            var classLoaderLabel = this.resourceClassLoader == VirtualFileSystem.class.getClassLoader() ? "VirtualFileSystem" : "custom";
-            fine("VirtualFilesystem %s, allowHostIO: %s, resourceClassLoader: %s, caseInsensitive: %s, extractOnStartup: %s%s",
-                mountPoint, allowHostIO.toString(), classLoaderLabel, caseInsensitive,
-                extractOnStartup, extractFilter != null ? "" : ", extractFilter: null");
-        }
+		if (LOGGER.isLoggable(Level.FINE)) {
+			var classLoaderLabel = this.resourceClassLoader == VirtualFileSystem.class.getClassLoader()
+					? "VirtualFileSystem"
+					: "custom";
+			fine("VirtualFilesystem %s, allowHostIO: %s, resourceClassLoader: %s, caseInsensitive: %s, extractOnStartup: %s%s",
+					mountPoint, allowHostIO.toString(), classLoaderLabel, caseInsensitive, extractOnStartup,
+					extractFilter != null ? "" : ", extractFilter: null");
+		}
 		this.extractFilter = extractFilter;
 		if (extractFilter != null) {
 			try {
@@ -747,8 +749,7 @@ private void validateMultipleVFSLocations(List<URL> filelistUrls) {
 		// by the Maven/Gradle plugin and should contain "pip freeze" of the venv
 		ArrayList<URL> installedUrls;
 		try {
-			installedUrls = Collections.list(
-                resourceClassLoader.getResources(resourcePath(vfsRoot, INSTALLED_FILE)));
+			installedUrls = Collections.list(resourceClassLoader.getResources(resourcePath(vfsRoot, INSTALLED_FILE)));
 		} catch (IOException e) {
 			warn("Cannot check compatibility of the merged virtual environments. Cannot read list of packages installed in the virtual environments. IOException: "
 					+ e.getMessage());
@@ -792,8 +793,7 @@ private void validateMultipleVFSLocations(List<URL> filelistUrls) {
 		// Check compatibility of GraalPy versions that were used to create the VFSs
 		ArrayList<URL> contentsUrls;
 		try {
-			contentsUrls = Collections.list(
-					resourceClassLoader.getResources(resourcePath(vfsRoot, CONTENTS_FILE)));
+			contentsUrls = Collections.list(resourceClassLoader.getResources(resourcePath(vfsRoot, CONTENTS_FILE)));
 		} catch (IOException e) {
 			warn("Cannot check compatibility of the merged virtual environments. Cannot read GraalPy version of the virtual environments. IOException: "
 					+ e.getMessage());