From ce8383f744b48356d1f39f5b2c8b446de083b86c Mon Sep 17 00:00:00 2001
From: Abel Salgado Romero <abelromero@gmail.com>
Date: Thu, 15 Jun 2023 23:00:40 +0200
Subject: [PATCH] Remove use of destinationDir

Closes #650
---
 CHANGELOG.adoc                                       |  1 +
 .../java/org/asciidoctor/maven/AsciidoctorMojo.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index dd4b19d4..f69a0af5 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -26,6 +26,7 @@ Improvements::
   * Reimplement resource copy using 'plexus.util.DirectorScanner' instead of 'maven-filtering' to reduce dependencies and build time (#597)
   * Set minimal Maven version to v3.8.5 (#629)
   * Replace deprecated 'headerFooter' by 'standalone' in configuration (#649)
+  * Remove internal use of 'destinationDir' AsciidoctorJ method (no changes for users) (#650)
 
 Build / Infrastructure::
 
diff --git a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
index 006773bc..03c579d2 100644
--- a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
+++ b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
@@ -286,18 +286,18 @@ public File setDestinationPaths(final File sourceFile, final OptionsBuilder opti
             if (configuration.isPreserveDirectories()) {
                 final String candidatePath = sourceFile.getParentFile().getCanonicalPath().substring(sourceDirectory.getCanonicalPath().length());
                 final File relativePath = new File(outputDir.getCanonicalPath() + candidatePath);
-                optionsBuilder.toDir(relativePath).destinationDir(relativePath);
+                optionsBuilder.toDir(relativePath);
             } else {
-                optionsBuilder.toDir(outputDir).destinationDir(outputDir);
+                optionsBuilder.toDir(outputDir);
             }
             final File outputFile = configuration.getOutputFile();
-            final String destinationDir = (String) optionsBuilder.asMap().get(Options.DESTINATION_DIR);
+            final String toDir = (String) optionsBuilder.build().map().get(Options.TO_DIR);
             if (outputFile != null) {
                 // allow overriding the output file name
                 optionsBuilder.toFile(outputFile);
-                return outputFile.isAbsolute() ? outputFile : new File(destinationDir, outputFile.getPath());
+                return outputFile.isAbsolute() ? outputFile : new File(toDir, outputFile.getPath());
             } else {
-                return new File(destinationDir, sourceFile.getName());
+                return new File(toDir, sourceFile.getName());
             }
         } catch (IOException e) {
             throw new MojoExecutionException("Unable to locate output directory", e);
@@ -305,7 +305,7 @@ public File setDestinationPaths(final File sourceFile, final OptionsBuilder opti
     }
 
     protected Asciidoctor getAsciidoctorInstance(String gemPath) throws MojoExecutionException {
-        Asciidoctor asciidoctor = null;
+        Asciidoctor asciidoctor;
         if (gemPath == null) {
             asciidoctor = AsciidoctorJRuby.Factory.create();
         } else {