Refactor artifact attachment logic into separate method with guard clauses

Author: peter277

src/it/projects/attach_skip/verify.groovy

@@ -23,8 +23,7 @@ import java.util.*;
 import java.util.jar.*;
 import org.codehaus.plexus.util.*;
 
-try
-{
+try {
     File target = new File( basedir, "target" )
     if ( !target.exists() || !target.isDirectory() ) {
         System.err.println( "target file is missing or not a directory." )
@@ -87,9 +86,7 @@ try
     }
 
     return true
-}
-catch( Throwable e )
-{
+} catch( Throwable e ) {
     e.printStackTrace()
     return false
 }

src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java

@@ -474,17 +474,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
         File createZipArchiveFromImage = createZipArchiveFromImage(buildDirectory, outputDirectoryImage);
 
-        if (attach) {
-            if (hasClassifier()) {
-                projectHelper.attachArtifact(getProject(), "jlink", getClassifier(), createZipArchiveFromImage);
-            } else {
-                if (projectHasAlreadySetAnArtifact()) {
-                    throw new MojoExecutionException("You have to use a classifier "
-                            + "to attach supplemental artifacts to the project instead of replacing them.");
-                }
-                getProject().getArtifact().setFile(createZipArchiveFromImage);
-            }
-        }
+        attachArtifactUnlessDisabled(createZipArchiveFromImage);
     }
 
     /**
@@ -640,6 +630,22 @@ private File createZipArchiveFromImage(File outputDirectory, File outputDirector
         return resultArchive;
     }
 
+    private void attachArtifactUnlessDisabled(File artifactFile) throws MojoExecutionException {
+        if (!attach) {
+            return;
+        }
+
+        if (hasClassifier()) {
+            projectHelper.attachArtifact(getProject(), "jlink", getClassifier(), artifactFile);
+        } else {
+            if (projectHasAlreadySetAnArtifact()) {
+                throw new MojoExecutionException("You have to use a classifier "
+                        + "to attach supplemental artifacts to the project instead of replacing them.");
+            }
+            getProject().getArtifact().setFile(artifactFile);
+        }
+    }
+
     private void failIfParametersAreNotInTheirValidValueRanges() throws MojoFailureException {
         if (endian != null && (!"big".equals(endian) && !"little".equals(endian))) {
             String message = "The given endian parameter " + endian