Rename method

Author: jjohannes

src/main/java/org/gradlex/javamodule/dependencies/internal/diagnostics/RenderableModuleDependencyResult.java

@@ -32,7 +32,7 @@
 import java.util.Set;
 
 import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.isRealModule;
-import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.readNameFromModuleFromJarFile;
+import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.readModuleNameFromJarFile;
 
 @NonNullApi
 public class RenderableModuleDependencyResult extends RenderableDependencyResult {
@@ -73,7 +73,7 @@ public String getName() {
             if (artifact == null) {
                 return "[BOM] " + selected.getDisplayName();
             } else {
-                String actualModuleName = readNameFromModuleFromJarFile(artifact.getFile());
+                String actualModuleName = readModuleNameFromJarFile(artifact.getFile());
                 if (actualModuleName == null) {
                     return "[CLASSPATH] " + selected.getDisplayName();
                 } else {

src/main/java/org/gradlex/javamodule/dependencies/internal/utils/ModuleJar.java

@@ -36,7 +36,7 @@ public class ModuleJar {
     private static final String MODULE_INFO_CLASS_FILE = "module-info.class";
     private static final Pattern MODULE_INFO_CLASS_MRJAR_PATH = Pattern.compile("META-INF/versions/\\d+/module-info.class");
 
-    public static String readNameFromModuleFromJarFile(File jarFileOrClassFolder) throws IOException {
+    public static String readModuleNameFromJarFile(File jarFileOrClassFolder) throws IOException {
         if (jarFileOrClassFolder.isDirectory()) {
             // class folder
             File moduleInfo = new File(jarFileOrClassFolder, MODULE_INFO_CLASS_FILE);

src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDirectivesScopeCheck.java

@@ -40,7 +40,7 @@
 import java.util.stream.Collectors;
 
 import static org.gradle.api.plugins.JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME;
-import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.readNameFromModuleFromJarFile;
+import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.readModuleNameFromJarFile;
 
 public abstract class ModuleDirectivesScopeCheck extends AbstractPostProcessingTask {
 
@@ -117,7 +117,7 @@ private String declaration(String conf, String coordinates, Set<String> capabili
         ResolvedArtifactResult moduleJar = getModuleArtifacts().get().stream().flatMap(c -> c.getArtifacts().stream()).filter(a ->
                 coordinatesEquals(coordinates, capability, a)).findFirst().orElse(null);
         try {
-            String moduleName = moduleJar == null ? coordinates : readNameFromModuleFromJarFile(moduleJar.getFile());
+            String moduleName = moduleJar == null ? coordinates : readModuleNameFromJarFile(moduleJar.getFile());
             if (inBuildFile) {
                 return directive(conf, SCOPES_TO_DIRECTIVES_BUILD_FILE_DSL) + "(\"" + moduleName + "\")";
             } else {

src/main/java/org/gradlex/javamodule/dependencies/tasks/ModulePathAnalysis.java

@@ -43,7 +43,7 @@
 import java.util.stream.Stream;
 
 import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.isRealModule;
-import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.readNameFromModuleFromJarFile;
+import static org.gradlex.javamodule.dependencies.internal.utils.ModuleJar.readModuleNameFromJarFile;
 
 public abstract class ModulePathAnalysis extends DefaultTask {
     private final String projectName;
@@ -174,7 +174,7 @@ private void collect(Configuration configuration, Set<String> usedMappings, Set<
                 moduleName = null;
             }
 
-            String actualModuleName = readNameFromModuleFromJarFile(resultFile);
+            String actualModuleName = readModuleNameFromJarFile(resultFile);
             boolean isModuleForReal = actualModuleName != null;
 
             if (moduleName != null && isModuleForReal) {

src/test/groovy/org/gradlex/javamodule/dependencies/test/NonMainVariantsTest.groovy

@@ -31,7 +31,6 @@ class NonMainVariantsTest extends Specification {
         result.output.contains('[lib-test-fixtures.jar, lib.jar]')
     }
 
-
     def "finds feature variant module"() {
         given:
         libBuildFile << '''
@@ -43,7 +42,7 @@ class NonMainVariantsTest extends Specification {
 
         appModuleInfoFile << '''
             module org.gradlex.test.app { 
-                requires org.gradlex.test.lib.extra.feature
+                requires org.gradlex.test.lib.extra.feature;
             }
         '''
         libModuleInfoFile << '''