Options without boolean parameter

This is more consistent with the rest of this part of the DSL, where
you specify things once and cannot change/remove them again.

Author: jjohannes

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java

@@ -222,7 +222,7 @@ private void addModuleDescriptor(File originalJar, File moduleJar, ModuleInfo mo
                 mergeJars(moduleInfo, outputStream, providers, packages);
                 outputStream.putNextEntry(new JarEntry("module-info.class"));
                 outputStream.write(addModuleInfo(moduleInfo, providers, versionFromFilePath(originalJar.toPath()),
-                        moduleInfo.getExportAllPackages() ? packages : Collections.emptySet()));
+                        moduleInfo.exportAllPackages ? packages : Collections.emptySet()));
                 outputStream.closeEntry();
             }
         } catch (IOException e) {
@@ -297,7 +297,7 @@ private byte[] addModuleInfo(ModuleInfo moduleInfo, Map<String, List<String>> pr
 
         moduleVisitor.visitRequire("java.base", 0, null);
 
-        if (moduleInfo.getRequiresDirectivesFromMetadata()) {
+        if (moduleInfo.requireAllDefinedDependencies) {
             Set<String> compileDependencies = getParameters().getCompileClasspathDependencies().get().get(moduleInfo.getIdentifier());
             Set<String> runtimeDependencies = getParameters().getRuntimeClasspathDependencies().get().get(moduleInfo.getIdentifier());
 

src/main/java/org/gradlex/javamodule/moduleinfo/ModuleInfo.java

@@ -33,8 +33,8 @@ public class ModuleInfo extends ModuleSpec {
     final Set<String> requiresStatic = new LinkedHashSet<>();
     final Set<String> ignoreServiceProviders = new LinkedHashSet<>();
 
-    private boolean exportAllPackages;
-    private boolean requiresDirectivesFromMetadata;
+    boolean exportAllPackages;
+    boolean requireAllDefinedDependencies;
 
     ModuleInfo(String identifier, String moduleName, String moduleVersion) {
         super(identifier, moduleName);
@@ -89,19 +89,17 @@ private static void addOrThrow(Set<String> target, String element) {
         }
     }
 
-    public void exportAllPackages(boolean exportAllPackages) {
-        this.exportAllPackages = exportAllPackages;
-    }
-
-    public boolean getExportAllPackages() {
-        return exportAllPackages;
-    }
-
-    public void requiresDirectivesFromMetadata(boolean requiresDirectivesFromMetadata) {
-        this.requiresDirectivesFromMetadata = requiresDirectivesFromMetadata;
+    /**
+     * Automatically export all packages of the Jar. Can be used instead of individual 'exports()' statements.
+     */
+    public void exportAllPackages() {
+        this.exportAllPackages = true;
     }
 
-    public boolean getRequiresDirectivesFromMetadata() {
-        return requiresDirectivesFromMetadata;
+    /**
+     * Automatically add 'requires' statements for all dependencies defined in the metadata of the component.
+     */
+    public void requireAllDefinedDependencies() {
+        this.requireAllDefinedDependencies = true;
     }
 }

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/AbstractFunctionalTest.groovy

@@ -567,7 +567,7 @@ abstract class AbstractFunctionalTest extends Specification {
             
             extraJavaModuleInfo {
                 module("${libs.commonsCollections}", "org.apache.commons.collections") {
-                    exportAllPackages(true)
+                    exportAllPackages()
                 }
             }
         """

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/RequiresFromMetadataFunctionalTest.groovy renamed to src/test/groovy/org/gradlex/javamodule/moduleinfo/test/RequireAllDefinedDependenciesFunctionalTest.groovy

@@ -5,7 +5,7 @@ import org.gradlex.javamodule.moduleinfo.test.fixture.GradleBuild
 import org.gradlex.javamodule.moduleinfo.test.fixture.LegacyLibraries
 import spock.lang.Specification
 
-class RequiresFromMetadataFunctionalTest extends Specification {
+class RequireAllDefinedDependenciesFunctionalTest extends Specification {
 
     @Delegate
     GradleBuild build = new GradleBuild()
@@ -63,12 +63,12 @@ class RequiresFromMetadataFunctionalTest extends Specification {
             
             extraJavaModuleInfo {
                 module("${libs.commonsHttpClient}", "org.apache.httpcomponents.httpclient") {
-                    exportAllPackages(true)
-                    requiresDirectivesFromMetadata(true)
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
                 }
                 module("${libs.commonsLogging}", "org.apache.commons.logging") {
-                    exportAllPackages(true)
-                    requiresDirectivesFromMetadata(true)
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
                 }
                 knownModule("commons-codec:commons-codec", "org.apache.commons.codec")
                 knownModule("org.apache.httpcomponents:httpcore", "org.apache.httpcomponents.httpcore")
@@ -101,12 +101,12 @@ class RequiresFromMetadataFunctionalTest extends Specification {
             
             extraJavaModuleInfo {
                 module("${new LegacyLibraries(true).commonsHttpClient}", "org.apache.httpcomponents.httpclient") {
-                    exportAllPackages(true)
-                    requiresDirectivesFromMetadata(true)
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
                 }
                 module("${libs.commonsLogging}", "org.apache.commons.logging") {
-                    exportAllPackages(true)
-                    requiresDirectivesFromMetadata(true)
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
                 }
                 knownModule("commons-codec:commons-codec", "org.apache.commons.codec")
                 knownModule("org.apache.httpcomponents:httpcore", "org.apache.httpcomponents.httpcore")
@@ -141,12 +141,12 @@ class RequiresFromMetadataFunctionalTest extends Specification {
             
             extraJavaModuleInfo {
                 module("${libs.commonsHttpClient}", "org.apache.httpcomponents.httpclient") {
-                    exportAllPackages(true)
-                    requiresDirectivesFromMetadata(true)
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
                 }
                 module("${libs.commonsLogging}", "org.apache.commons.logging") {
-                    exportAllPackages(true)
-                    requiresDirectivesFromMetadata(true)
+                    exportAllPackages()
+                    requireAllDefinedDependencies()
                 }
                 knownModule("commons-codec:commons-codec", "org.apache.commons.codec")
             }