fix: allow for setter chaining

Author: ppkarwasz

src/main/java/org/apache/commons/release/plugin/internal/ArtifactUtils.java

@@ -138,9 +138,9 @@ public static String getPackageUrl(final Artifact artifact) {
      * @throws MojoExecutionException If an I/O error occurs retrieving the artifact.
      */
     public static ResourceDescriptor toResourceDescriptor(final Artifact artifact, final String algorithms) throws MojoExecutionException {
-        final ResourceDescriptor descriptor = new ResourceDescriptor();
-        descriptor.setName(getFileName(artifact));
-        descriptor.setUri(getPackageUrl(artifact));
+        final ResourceDescriptor descriptor = new ResourceDescriptor()
+                .setName(getFileName(artifact))
+                .setUri(getPackageUrl(artifact));
         if (artifact.getFile() != null) {
             try {
                 descriptor.setDigest(getChecksums(artifact, StringUtils.split(algorithms, ",")));

src/main/java/org/apache/commons/release/plugin/internal/BuildDefinitions.java

@@ -21,6 +21,7 @@
 import java.lang.management.ManagementFactory;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -84,11 +85,6 @@ public static Map<String, Object> externalParameters(final MavenSession session)
      * @throws IOException if hashing the JDK directory fails
      */
     public static ResourceDescriptor jvm(final Path javaHome) throws IOException {
-        final ResourceDescriptor descriptor = new ResourceDescriptor();
-        descriptor.setName("JDK");
-        final Map<String, String> digest = new HashMap<>();
-        digest.put("gitTree", GitUtils.gitTree(javaHome));
-        descriptor.setDigest(digest);
         final String[] propertyNames = {
             "java.version", "java.version.date",
             "java.vendor", "java.vendor.url", "java.vendor.version",
@@ -102,8 +98,10 @@ public static ResourceDescriptor jvm(final Path javaHome) throws IOException {
         for (final String prop : propertyNames) {
             annotations.put(prop.substring("java.".length()), System.getProperty(prop));
         }
-        descriptor.setAnnotations(annotations);
-        return descriptor;
+        return new ResourceDescriptor()
+                .setName("JDK")
+                .setDigest(Collections.singletonMap("gitTree", GitUtils.gitTree(javaHome)))
+                .setAnnotations(annotations);
     }
 
     /**
@@ -120,12 +118,10 @@ public static ResourceDescriptor jvm(final Path javaHome) throws IOException {
      * @throws IOException if hashing the Maven home directory fails
      */
     public static ResourceDescriptor maven(final String version, final Path mavenHome, final ClassLoader coreClassLoader) throws IOException {
-        final ResourceDescriptor descriptor = new ResourceDescriptor();
-        descriptor.setName("Maven");
-        descriptor.setUri("pkg:maven/org.apache.maven/apache-maven@" + version);
-        final Map<String, String> digest = new HashMap<>();
-        digest.put("gitTree", GitUtils.gitTree(mavenHome));
-        descriptor.setDigest(digest);
+        final ResourceDescriptor descriptor = new ResourceDescriptor()
+                .setName("Maven")
+                .setUri("pkg:maven/org.apache.maven/apache-maven@" + version)
+                .setDigest(Collections.singletonMap("gitTree", GitUtils.gitTree(mavenHome)));
         final Properties buildProps = new Properties();
         try (InputStream in = coreClassLoader.getResourceAsStream("org/apache/maven/messages/build.properties")) {
             if (in != null) {

src/main/java/org/apache/commons/release/plugin/mojos/BuildAttestationMojo.java

@@ -26,9 +26,7 @@
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -224,24 +222,18 @@ private Path ensureOutputDirectory() throws MojoExecutionException {
 
     @Override
     public void execute() throws MojoFailureException, MojoExecutionException {
-        // Build definition
-        final BuildDefinition buildDefinition = new BuildDefinition();
-        buildDefinition.setExternalParameters(BuildDefinitions.externalParameters(session));
-        buildDefinition.setResolvedDependencies(getBuildDependencies());
-        // Builder
-        final Builder builder = new Builder();
-        // RunDetails
-        final RunDetails runDetails = new RunDetails();
-        runDetails.setBuilder(builder);
-        runDetails.setMetadata(getBuildMetadata());
-        // Provenance
-        final Provenance provenance = new Provenance();
-        provenance.setBuildDefinition(buildDefinition);
-        provenance.setRunDetails(runDetails);
-        // Statement
-        final Statement statement = new Statement();
-        statement.setSubject(getSubjects());
-        statement.setPredicate(provenance);
+        final BuildDefinition buildDefinition = new BuildDefinition()
+                .setExternalParameters(BuildDefinitions.externalParameters(session))
+                .setResolvedDependencies(getBuildDependencies());
+        final RunDetails runDetails = new RunDetails()
+                .setBuilder(new Builder())
+                .setMetadata(getBuildMetadata());
+        final Provenance provenance = new Provenance()
+                .setBuildDefinition(buildDefinition)
+                .setRunDetails(runDetails);
+        final Statement statement = new Statement()
+                .setSubject(getSubjects())
+                .setPredicate(provenance);
 
         final Path outputPath = ensureOutputDirectory();
         final Path artifactPath = outputPath.resolve(ArtifactUtils.getFileName(project.getArtifact(), ATTESTATION_EXTENSION));
@@ -305,14 +297,9 @@ private List<ResourceDescriptor> getProjectDependencies() throws MojoExecutionEx
      * @throws MojoExecutionException If the SCM revision cannot be retrieved.
      */
     private ResourceDescriptor getScmDescriptor() throws IOException, MojoExecutionException {
-        final ResourceDescriptor scmDescriptor = new ResourceDescriptor();
-        final String scmUri = GitUtils.scmToDownloadUri(scmConnectionUrl, scmDirectory.toPath());
-        scmDescriptor.setUri(scmUri);
-        // Compute the revision
-        final Map<String, String> digest = new HashMap<>();
-        digest.put("gitCommit", getScmRevision());
-        scmDescriptor.setDigest(digest);
-        return scmDescriptor;
+        return new ResourceDescriptor()
+                .setUri(GitUtils.scmToDownloadUri(scmConnectionUrl, scmDirectory.toPath()))
+                .setDigest(Collections.singletonMap("gitCommit", getScmRevision()));
     }
 
     /**
@@ -494,13 +481,12 @@ private void signAndWriteStatement(final Statement statement, final Path outputP
         final Path paeFile = DsseUtils.writePaeFile(statementBytes, outputPath);
         final byte[] sigBytes = DsseUtils.signFile(signer, paeFile);
 
-        final Signature sig = new Signature();
-        sig.setKeyid(DsseUtils.getKeyId(sigBytes));
-        sig.setSig(sigBytes);
-
-        final DsseEnvelope envelope = new DsseEnvelope();
-        envelope.setPayload(statementBytes);
-        envelope.setSignatures(Collections.singletonList(sig));
+        final Signature sig = new Signature()
+                .setKeyid(DsseUtils.getKeyId(sigBytes))
+                .setSig(sigBytes);
+        final DsseEnvelope envelope = new DsseEnvelope()
+                .setPayload(statementBytes)
+                .setSignatures(Collections.singletonList(sig));
 
         getLog().info("Writing signed attestation envelope to: " + artifactPath);
         writeAndAttach(envelope, artifactPath);