Fix formatting of closures with no parameters

Signed-off-by: Ben Sherman <bentshermann@gmail.com>

Author: bentsherman

modules/compiler/src/main/java/config/dsl/ConfigOption.java

@@ -23,5 +23,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.FIELD, ElementType.METHOD })
 public @interface ConfigOption {
-    String value();
 }

modules/compiler/src/main/java/config/dsl/ConfigScope.java

@@ -18,6 +18,4 @@
 import org.pf4j.ExtensionPoint;
 
 public interface ConfigScope extends ExtensionPoint {
-    String name();
-    String description();
 }

modules/compiler/src/main/java/config/dsl/PlaceholderName.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013-2024, Seqera Labs
+ *
+ * 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.
+ */
+package nextflow.config.dsl;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD })
+public @interface PlaceholderName {
+    String value();
+}

modules/compiler/src/main/java/config/scopes/ApptainerConfig.java

@@ -18,77 +18,73 @@
 import groovy.transform.CompileStatic;
 import nextflow.config.dsl.ConfigOption;
 import nextflow.config.dsl.ConfigScope;
+import nextflow.script.dsl.Description;
 import nextflow.script.types.Duration;
 
 public class ApptainerConfig implements ConfigScope {
 
-    public ApptainerConfig() {}
-
-    @Override
-    public String name() {
-        return "apptainer";
-    }
-
-    @Override
-    public String description() {
-        return """
-            The `apptainer` scope controls how [Apptainer](https://apptainer.org) containers are executed by Nextflow.
-
-            [Read more](https://nextflow.io/docs/latest/reference/config.html#apptainer)
-            """;
-    }
-
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         When `true` Nextflow automatically mounts host paths in the executed container. It requires the `user bind control` feature to be enabled in your Apptainer installation (default: `true`).
     """)
     public boolean autoMounts;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The directory where remote Apptainer images are stored. When using a computing cluster it must be a shared folder accessible to all compute nodes.
     """)
     public String cacheDir;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Enable Apptainer execution (default: `false`).
     """)
     public boolean enabled;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         This attribute can be used to provide any option supported by the Apptainer engine i.e. `apptainer [OPTIONS]`.
     """)
     public String engineOptions;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Comma separated list of environment variable names to be included in the container environment.
     """)
     public String envWhitelist;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Directory where remote Apptainer images are retrieved. When using a computing cluster it must be a shared folder accessible to all compute nodes.
     """)
     public String libraryDir;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Pull the Apptainer image with http protocol (default: `false`).
     """)
     public boolean noHttps;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         When enabled, OCI (and Docker) container images are pulled and converted to the SIF format by the Apptainer run command, instead of Nextflow (default: `false`).
     """)
     public boolean ociAutoPull;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The amount of time the Apptainer pull can last, exceeding which the process is terminated (default: `20 min`).
     """)
     public Duration pullTimeout;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The registry from where Docker images are pulled. It should be only used to specify a private registry server. It should NOT include the protocol prefix i.e. `http://`.
     """)
     public String registry;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         This attribute can be used to provide any extra command line options supported by `apptainer exec`.
     """)
     public String runOptions;

modules/compiler/src/main/java/config/scopes/AwsBatchConfig.java

@@ -19,95 +19,93 @@
 
 import nextflow.config.dsl.ConfigOption;
 import nextflow.config.dsl.ConfigScope;
+import nextflow.script.dsl.Description;
 import nextflow.script.types.Duration;
 
 public class AwsBatchConfig implements ConfigScope {
 
-    public AwsBatchConfig() {}
-
-    @Override
-    public String name() {
-        return "aws.batch";
-    }
-
-    @Override
-    public String description() {
-        return """
-            The `aws` scope controls the interactions with AWS, including AWS Batch and S3.
-
-            [Read more](https://nextflow.io/docs/latest/reference/config.html#aws)
-            """;
-    }
-
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The path where the AWS command line tool is installed in the host AMI.
     """)
     public String cliPath;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Delay between download attempts from S3 (default: `10 sec`).
     """)
     public Duration delayBetweenAttempts;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The AWS Batch Execution Role ARN that needs to be used to execute the Batch Job.
 
         [Read more](https://docs.aws.amazon.com/batch/latest/userguide/execution-IAM-role.html)
     """)
     public String executionRole;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The AWS Batch Job Role ARN that needs to be used to execute the Batch Job.
     """)
     public String jobRole;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The name of the logs group used by Batch Jobs (default: `/aws/batch`).
     """)
     public String logsGroup;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Max parallel upload/download transfer operations *per job* (default: `4`).
     """)
     public int maxParallelTransfers;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Max number of execution attempts of a job interrupted by a EC2 spot reclaim event (default: `5`)
     """)
     public int maxSpotAttempts;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         Max number of downloads attempts from S3 (default: `1`).
     """)
     public int maxTransferAttempts;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The compute platform type used by AWS Batch. Can be either `ec2` or `fargate`.
     """)
     public String platformType;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The retry mode used to accommodate rate-limiting on AWS services. Can be one of `standard`, `legacy`, `adaptive`, or `built-in` (default: `standard`).
 
         [Read more](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-retries.html)
     """)
     public String retryMode;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The scheduling priority for all tasks when using fair-share scheduling for AWS Batch (default: `0`).
 
         [Read more](https://aws.amazon.com/blogs/hpc/introducing-fair-share-scheduling-for-aws-batch/)
     """)
     public int schedulingPriority;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         The share identifier for all tasks when using fair-share scheduling for AWS Batch.
 
         [Read more](https://aws.amazon.com/blogs/hpc/introducing-fair-share-scheduling-for-aws-batch/)
     """)
     public String shareIdentifier;
 
-    @ConfigOption("""
+    @ConfigOption
+    @Description("""
         One or more container mounts. Mounts can be specified as simple e.g. `/some/path` or canonical format e.g. `/host/path:/mount/path[:ro|rw]`.
     """)
     public List<String> volumes;