Adjust names for consistency

Author: jjohannes

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java

@@ -236,7 +236,9 @@ private void setupOrderingCheckTasks(Project project, TaskProvider<Task> checkAl
 
                 ModuleInfo moduleInfo = javaModuleDependencies.getModuleInfoCache().get().get(sourceSet, project.getProviders());
                 File folder = javaModuleDependencies.getModuleInfoCache().get().getFolder(sourceSet, project.getProviders());
-                t.getModuleInfoPath().convention(folder == null ? "<hasNOModuleInfo>" : new File(folder, "module-info.java").getAbsolutePath());
+                if (folder != null) {
+                    t.getModuleInfoPath().convention(new File(folder, "module-info.java").getAbsolutePath());
+                }
                 t.getModuleNamePrefix().convention(moduleInfo.moduleNamePrefix(project.getName(), sourceSet.getName(), false));
                 t.getModuleInfo().convention(moduleInfo);
 

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

@@ -16,12 +16,10 @@
 
 package org.gradlex.javamodule.dependencies.internal.utils;
 
-import org.gradle.api.Action;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
-import org.gradle.api.provider.ValueSourceSpec;
 import org.gradle.api.tasks.SourceSet;
 import org.slf4j.LoggerFactory;
 
@@ -124,17 +122,8 @@ private boolean maybePutModuleInfo(File folder, ProviderFactory providers) {
     }
 
     private Provider<ModuleInfo> provideModuleInfo(File folder, ProviderFactory providers) {
-        return providers.of(ValueSourceModuleInfo.class, new Action<ValueSourceSpec<ValueSourceModuleInfo.ModuleInfoSourceP>>() {
-            @Override
-            public void execute(ValueSourceSpec<ValueSourceModuleInfo.ModuleInfoSourceP> moduleInfoSourcePValueSourceSpec) {
-                moduleInfoSourcePValueSourceSpec.parameters(new Action<ValueSourceModuleInfo.ModuleInfoSourceP>() {
-                    @Override
-                    public void execute(ValueSourceModuleInfo.ModuleInfoSourceP moduleInfoSourceP) {
-                        moduleInfoSourceP.getDir().set(folder);
-                    }
-                });
-
-            }
-        });
+        return providers.of(ModuleInfoValueSource.class,
+                moduleInfoSourcePValueSourceSpec -> moduleInfoSourcePValueSourceSpec.parameters(
+                        moduleInfoSourceP -> moduleInfoSourceP.getDir().set(folder)));
     }
 }

src/main/java/org/gradlex/javamodule/dependencies/internal/utils/ValueSourceModuleInfo.java renamed to src/main/java/org/gradlex/javamodule/dependencies/internal/utils/ModuleInfoValueSource.java

@@ -25,28 +25,22 @@
 import java.io.IOException;
 import java.util.Scanner;
 
-public abstract class ValueSourceModuleInfo implements ValueSource<ModuleInfo, ValueSourceModuleInfo.ModuleInfoSourceP> {
-
-
-    interface ModuleInfoSourceP extends ValueSourceParameters {
+public abstract class ModuleInfoValueSource implements ValueSource<ModuleInfo, ModuleInfoValueSource.ModuleInfoValueSourceParameter> {
 
+    interface ModuleInfoValueSourceParameter extends ValueSourceParameters {
         DirectoryProperty getDir();
     }
 
-
     @Override
     public @Nullable ModuleInfo obtain() {
-        ModuleInfoSourceP parameters = getParameters();
+        ModuleInfoValueSourceParameter parameters = getParameters();
         File file = new File(parameters.getDir().get().getAsFile(), "module-info.java");
         if (file.isFile()) {
             try {
-                Scanner scan = new Scanner(file);
-                try {
+                try (Scanner scan = new Scanner(file)) {
                     scan.useDelimiter("\\Z");
                     String content = scan.next();
                     return new ModuleInfo(content);
-                } finally {
-                    scan.close();
                 }
             } catch (IOException e) {
                 throw new RuntimeException(e);

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

@@ -36,6 +36,7 @@
 public abstract class ModuleDirectivesOrderingCheck extends DefaultTask {
 
     @Input
+    @Optional
     public abstract Property<String> getModuleInfoPath();
 
     @Input