Format code

Author: jjohannes

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java

@@ -1,19 +1,4 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing;
 
 import org.gradle.api.Plugin;
@@ -31,7 +16,7 @@ public void apply(Project project) {
         if (GradleVersion.current().compareTo(GradleVersion.version("7.4")) < 0) {
             throw new RuntimeException("This plugin requires Gradle 7.4+");
         }
-        project.getPlugins().withType(JvmTestSuitePlugin.class, p->
-                project.getExtensions().create("javaModuleTesting", JavaModuleTestingExtension.class));
+        project.getPlugins().withType(JvmTestSuitePlugin.class, p -> project.getExtensions()
+                .create("javaModuleTesting", JavaModuleTestingExtension.class));
     }
 }

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingPlugin.java

@@ -1,19 +1,4 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing;
 
 import org.gradle.api.services.BuildService;

src/main/java/org/gradlex/javamodule/testing/TaskLockService.java

@@ -1,19 +1,4 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing;
 
 import org.gradle.api.provider.ListProperty;

src/main/java/org/gradlex/javamodule/testing/WhiteboxJvmTestSuite.java

@@ -1,30 +1,14 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing.internal;
 
-import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.file.RegularFile;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.provider.ProviderFactory;
-
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.gradle.api.file.ProjectLayout;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderFactory;
 
 public class ModuleInfoParser {
 
@@ -38,8 +22,10 @@ public ModuleInfoParser(ProjectLayout layout, ProviderFactory providers) {
 
     public String moduleName(Set<File> sourceFolders) {
         for (File folder : sourceFolders) {
-            Provider<RegularFile> moduleInfoFile = layout.file(providers.provider(() -> new File(folder, "module-info.java")));
-            Provider<String> moduleInfoContent = providers.fileContents(moduleInfoFile).getAsText();
+            Provider<RegularFile> moduleInfoFile =
+                    layout.file(providers.provider(() -> new File(folder, "module-info.java")));
+            Provider<String> moduleInfoContent =
+                    providers.fileContents(moduleInfoFile).getAsText();
             if (moduleInfoContent.isPresent()) {
                 return moduleName(moduleInfoContent.get());
             }
@@ -51,9 +37,8 @@ static String moduleName(String moduleInfoFileContent) {
         boolean inComment = false;
         boolean moduleKeywordFound = false;
 
-        for(String line: moduleInfoFileContent.split("\n")) {
-            String cleanedLine = line
-                    .replaceAll("/\\*.*\\*/", "") // open & close in this line
+        for (String line : moduleInfoFileContent.split("\n")) {
+            String cleanedLine = line.replaceAll("/\\*.*\\*/", "") // open & close in this line
                     .replaceAll("//.*", ""); // line comment
             inComment = inComment || cleanedLine.contains("/*");
             cleanedLine = cleanedLine.replaceAll("/\\*.*", ""); // open in this line

src/main/java/org/gradlex/javamodule/testing/internal/ModuleInfoParser.java

@@ -1,19 +1,4 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing.internal;
 
 import java.util.ArrayList;
@@ -26,7 +11,7 @@ public class ModuleInfoRequiresParser {
     public static List<String> parse(String moduleInfoFileContent, boolean runtimeOnly) {
         List<String> requires = new ArrayList<>();
         boolean insideComment = false;
-        for(String line: moduleInfoFileContent.split("\n")) {
+        for (String line : moduleInfoFileContent.split("\n")) {
             insideComment = parseLine(line, insideComment, requires, runtimeOnly);
         }
         return requires;
@@ -35,7 +20,8 @@ public static List<String> parse(String moduleInfoFileContent, boolean runtimeOn
     /**
      * @return true, if we are inside a multi-line comment after this line
      */
-    private static boolean parseLine(String moduleLine, boolean insideComment, List<String> requires, boolean runtimeOnly) {
+    private static boolean parseLine(
+            String moduleLine, boolean insideComment, List<String> requires, boolean runtimeOnly) {
         if (insideComment) {
             return !moduleLine.contains("*/");
         }
@@ -45,7 +31,8 @@ private static boolean parseLine(String moduleLine, boolean insideComment, List<
                 .replace("{", "")
                 .replace(RUNTIME_KEYWORD, "runtime")
                 .replaceAll("/\\*.*?\\*/", " ")
-                .trim().split("\\s+"));
+                .trim()
+                .split("\\s+"));
         int singleLineCommentStartIndex = tokens.indexOf("//");
         if (singleLineCommentStartIndex >= 0) {
             tokens = tokens.subList(0, singleLineCommentStartIndex);

src/main/java/org/gradlex/javamodule/testing/internal/ModuleInfoRequiresParser.java

@@ -1,21 +1,9 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing.internal.actions;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
 import org.gradle.api.Action;
 import org.gradle.api.Describable;
 import org.gradle.api.Task;
@@ -24,10 +12,6 @@
 import org.gradle.internal.jvm.JavaModuleDetector;
 import org.jspecify.annotations.NullMarked;
 
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
-
 @NullMarked
 public abstract class JavaCompileSetModulePathAction implements Action<Task>, Describable {
 
@@ -47,7 +31,9 @@ public void execute(Task task) {
 
         // Since for Gradle this sources set does not look like a module, we have to define the module path ourselves
         compilerArgs.add("--module-path");
-        compilerArgs.add(getJavaModuleDetector().inferModulePath(true, classpathAndModulePath).getAsPath());
+        compilerArgs.add(getJavaModuleDetector()
+                .inferModulePath(true, classpathAndModulePath)
+                .getAsPath());
         javaCompile.setClasspath(getJavaModuleDetector().inferClasspath(true, classpathAndModulePath));
         javaCompile.getOptions().setCompilerArgs(compilerArgs);
     }

src/main/java/org/gradlex/javamodule/testing/internal/actions/JavaCompileSetModulePathAction.java

@@ -1,32 +1,16 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing.internal.bridges;
 
-import org.gradle.api.Project;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.tasks.SourceSet;
-
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
+import org.gradle.api.Project;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.SourceSet;
 
 public class JavaModuleDependenciesBridge {
 
-    public static Provider<?> create(Project project, String moduleName, SourceSet sourceSetWithModuleInfo)   {
+    public static Provider<?> create(Project project, String moduleName, SourceSet sourceSetWithModuleInfo) {
         Object javaModuleDependencies = project.getExtensions().findByName("javaModuleDependencies");
         if (javaModuleDependencies == null) {
             return null;
@@ -39,13 +23,16 @@ public static Provider<?> create(Project project, String moduleName, SourceSet s
         }
     }
 
-    public static void addRequiresRuntimeSupport(Project project, SourceSet sourceSetForModuleInfo, SourceSet sourceSetForClasspath) {
+    public static void addRequiresRuntimeSupport(
+            Project project, SourceSet sourceSetForModuleInfo, SourceSet sourceSetForClasspath) {
         Object javaModuleDependencies = project.getExtensions().findByName("javaModuleDependencies");
         if (javaModuleDependencies == null) {
             return;
         }
         try {
-            Method addRequiresRuntimeSupport = javaModuleDependencies.getClass().getMethod("addRequiresRuntimeSupport", SourceSet.class, SourceSet.class);
+            Method addRequiresRuntimeSupport = javaModuleDependencies
+                    .getClass()
+                    .getMethod("addRequiresRuntimeSupport", SourceSet.class, SourceSet.class);
             addRequiresRuntimeSupport.invoke(javaModuleDependencies, sourceSetForModuleInfo, sourceSetForClasspath);
         } catch (NoSuchMethodException e) {
             //noinspection UnnecessaryReturnStatement

src/main/java/org/gradlex/javamodule/testing/internal/bridges/JavaModuleDependenciesBridge.java

@@ -1,35 +1,16 @@
-/*
- * Copyright the GradleX team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+// SPDX-License-Identifier: Apache-2.0
 package org.gradlex.javamodule.testing.internal.provider;
 
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.model.ObjectFactory;
-import org.gradle.api.provider.ListProperty;
-import org.gradle.api.provider.Provider;
-import org.gradlex.javamodule.testing.internal.ModuleInfoParser;
-import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.internal.jvm.JavaModuleDetector;
-import org.gradle.process.CommandLineArgumentProvider;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.ListProperty;
+import org.gradle.api.provider.Provider;
+import org.gradle.process.CommandLineArgumentProvider;
+import org.gradlex.javamodule.testing.internal.ModuleInfoParser;
 
 public class WhiteboxTestCompileArgumentProvider implements CommandLineArgumentProvider {
     private final Set<File> mainSourceFolders;
@@ -39,7 +20,10 @@ public class WhiteboxTestCompileArgumentProvider implements CommandLineArgumentP
     private final ListProperty<String> allTestRequires;
 
     public WhiteboxTestCompileArgumentProvider(
-            Set<File> mainSourceFolders, Set<File> testSourceFolders, ModuleInfoParser moduleInfoParser, ObjectFactory objects) {
+            Set<File> mainSourceFolders,
+            Set<File> testSourceFolders,
+            ModuleInfoParser moduleInfoParser,
+            ObjectFactory objects) {
         this.mainSourceFolders = mainSourceFolders;
         this.testSourceFolders = testSourceFolders;
         this.moduleInfoParser = moduleInfoParser;
@@ -57,8 +41,8 @@ public void testRequires(List<String> testRequires) {
     @Override
     public Iterable<String> asArguments() {
         String moduleName = moduleInfoParser.moduleName(mainSourceFolders);
-        String testSources = testSourceFolders.stream().map(File::getPath)
-                .collect(Collectors.joining(File.pathSeparator));
+        String testSources =
+                testSourceFolders.stream().map(File::getPath).collect(Collectors.joining(File.pathSeparator));
 
         List<String> args = new ArrayList<>();