This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git

commit b93726cda7ccc022a3c7a22361d2fbd57dd0a85e
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 06:10:45 2026 +0000

    Simplify redundant code
---
 src/main/java/org/apache/maven/plugins/gpg/BcSigner.java            | 4 ++--
 src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java | 2 +-
 src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java          | 4 ++--
 src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java    | 2 +-
 .../java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java    | 4 ++--
 src/main/java/org/apache/maven/plugins/gpg/SignDeployedMojo.java    | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/gpg/BcSigner.java 
b/src/main/java/org/apache/maven/plugins/gpg/BcSigner.java
index 6c9dbfd..99748f8 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/BcSigner.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/BcSigner.java
@@ -211,7 +211,7 @@ public class BcSigner extends AbstractGpgSigner {
                     String displayFingerprint = 
hexKeyFingerprint.toUpperCase(Locale.ROOT);
                     // 
https://unix.stackexchange.com/questions/71135/how-can-i-find-out-what-keys-gpg-agent-has-cached-like-how-ssh-add-l-shows-yo
                     String instruction = "GET_PASSPHRASE "
-                            + (!isInteractive ? "--no-ask " : "")
+                            + (isInteractive ? "" : "--no-ask ")
                             + hexKeyFingerprint
                             + " "
                             + "X "
@@ -219,7 +219,7 @@ public class BcSigner extends AbstractGpgSigner {
                             + 
"Please+enter+the+passphrase+to+unlock+the+OpenPGP+secret+key+with+fingerprint:+"
                             + displayFingerprint
                             + "+to+use+it+for+signing+Maven+Artifacts\n";
-                    os.write((instruction).getBytes());
+                    os.write(instruction.getBytes());
                     os.flush();
                     return mayExpectOK(in);
                 }
diff --git 
a/src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java 
b/src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java
index bf27576..74f90a1 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java
@@ -93,7 +93,7 @@ public class GpgSignAttachedMojo extends AbstractGpgMojo {
         signer.setBaseDirectory(project.getBasedir());
 
         getLog().info("Signer '" + signer.signerName() + "' is signing " + 
items.size() + " file"
-                + ((items.size() > 1) ? "s" : "") + " with key " + 
signer.getKeyInfo());
+                + (items.size() > 1 ? "s" : "") + " with key " + 
signer.getKeyInfo());
 
         for (FilesCollector.Item item : items) {
             getLog().debug("Generating signature for " + item.getFile());
diff --git a/src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java 
b/src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java
index f1a784d..d5ca727 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
  * @author Robert Scholte
  * @since 3.0.0
  */
-public class GpgVersion implements Comparable<GpgVersion> {
+public final class GpgVersion implements Comparable<GpgVersion> {
 
     private static final Pattern VERSION_PATTERN = 
Pattern.compile("(\\d+\\.)+(\\d+)");
 
@@ -71,7 +71,7 @@ public class GpgVersion implements Comparable<GpgVersion> {
             }
         }
 
-        return (thisSegments.length - otherSegments.length);
+        return thisSegments.length - otherSegments.length;
     }
 
     /**
diff --git a/src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java 
b/src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java
index 8b38188..0803d6d 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java
@@ -46,7 +46,7 @@ import org.codehaus.plexus.util.cli.StreamConsumer;
  * @author Robert Scholte
  * @since 3.0.0
  */
-public class GpgVersionParser {
+public final class GpgVersionParser {
     private final GpgVersionConsumer consumer;
 
     private GpgVersionParser(GpgVersionConsumer consumer) {
diff --git 
a/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java 
b/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
index 5499dd7..14f5389 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
@@ -345,7 +345,7 @@ public class SignAndDeployFileMojo extends AbstractGpgMojo {
         signer.setBaseDirectory(new File("").getAbsoluteFile());
 
         getLog().info("Signer '" + signer.signerName() + "' is signing " + 
artifacts.size() + " file"
-                + ((artifacts.size() > 1) ? "s" : "") + " with key " + 
signer.getKeyInfo());
+                + (artifacts.size() > 1 ? "s" : "") + " with key " + 
signer.getKeyInfo());
 
         ArrayList<Artifact> signatures = new ArrayList<>();
         for (Artifact a : artifacts) {
@@ -460,7 +460,7 @@ public class SignAndDeployFileMojo extends AbstractGpgMojo {
         if (!result.isEmpty()) {
             StringBuilder msg = new StringBuilder("The artifact information is 
incomplete or not valid:\n");
             for (String e : result) {
-                msg.append(" - " + e + '\n');
+                msg.append(" - ").append(e).append('\n');
             }
             throw new MojoFailureException(msg.toString());
         }
diff --git a/src/main/java/org/apache/maven/plugins/gpg/SignDeployedMojo.java 
b/src/main/java/org/apache/maven/plugins/gpg/SignDeployedMojo.java
index 027986a..a94ced9 100644
--- a/src/main/java/org/apache/maven/plugins/gpg/SignDeployedMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/SignDeployedMojo.java
@@ -139,7 +139,7 @@ public class SignDeployedMojo extends AbstractGpgMojo {
             // get artifacts list
             getLog().debug("Collecting artifacts for signing...");
             artifacts.addAll(collectArtifacts(signingSession, 
deploymentRepository));
-            getLog().info("Collected " + artifacts.size() + " artifact" + 
((artifacts.size() > 1) ? "s" : "")
+            getLog().info("Collected " + artifacts.size() + " artifact" + 
(artifacts.size() > 1 ? "s" : "")
                     + " for signing");
 
             // create additional ones if needed
@@ -160,7 +160,7 @@ public class SignDeployedMojo extends AbstractGpgMojo {
             }
 
             // resolve them all
-            getLog().info("Resolving " + artifacts.size() + " artifact" + 
((artifacts.size() > 1) ? "s" : "")
+            getLog().info("Resolving " + artifacts.size() + " artifact" + 
(artifacts.size() > 1 ? "s" : "")
                     + " artifacts for signing...");
             List<ArtifactResult> results = repositorySystem.resolveArtifacts(
                     signingSession,
@@ -173,7 +173,7 @@ public class SignDeployedMojo extends AbstractGpgMojo {
             AbstractGpgSigner signer = newSigner(null);
             signer.setOutputDirectory(tempDirectory.toFile());
             getLog().info("Signer '" + signer.signerName() + "' is signing " + 
artifacts.size() + " file"
-                    + ((artifacts.size() > 1) ? "s" : "") + " with key " + 
signer.getKeyInfo());
+                    + (artifacts.size() > 1 ? "s" : "") + " with key " + 
signer.getKeyInfo());
 
             HashSet<Artifact> signatures = new HashSet<>();
             for (Artifact a : artifacts) {

Reply via email to