Remove use of destinationDir

Closes asciidoctor#650
abelsromero · Jun 15, 2023 · ce8383f · ce8383f
1 parent db0d1d8
commit ce8383f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -286,26 +286,26 @@ 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);
         }
     }
 
     protected Asciidoctor getAsciidoctorInstance(String gemPath) throws MojoExecutionException {
-        Asciidoctor asciidoctor = null;
+        Asciidoctor asciidoctor;
         if (gemPath == null) {
             asciidoctor = AsciidoctorJRuby.Factory.create();
         } else {