Merge branch '__rultor'

objectionary · Jan 19, 2024 · c7c1e19 · c7c1e19
2 parents 0905683 + 0b5e7c5
commit c7c1e19
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/src/it/benchmark-example/verify.groovy b/src/it/benchmark-example/verify.groovy
@@ -24,7 +24,7 @@
 
 import groovy.xml.XmlSlurper
 
-file = new File(basedir, 'target/generated-sources/xmir/com/exam/BA.xmir')
+file = new File(basedir, 'target/generated-sources/fused-xmir/com/exam/BA.xmir')
 assert file.exists()
 
 true
diff --git a/src/it/toy-example/verify.groovy b/src/it/toy-example/verify.groovy
@@ -24,7 +24,7 @@
 
 import groovy.xml.XmlSlurper
 
-file = new File(basedir, 'target/generated-sources/xmir/com/exam/BA.xmir')
+file = new File(basedir, 'target/generated-sources/fused-xmir/com/exam/BA.xmir')
 assert file.exists()
 
 true
diff --git a/src/main/java/org/eolang/ineo/FuseMojo.java b/src/main/java/org/eolang/ineo/FuseMojo.java
@@ -73,29 +73,52 @@ public final class FuseMojo extends AbstractMojo {
      * @checkstyle MemberNameCheck (10 lines)
      */
     @Parameter(
-        property = "sourcesDir",
+        property = "ineo.sourcesDir",
         required = true,
         defaultValue = "${project.build.directory}/generated-sources/xmir"
     )
     private File sourcesDir;
 
+    /**
+     * Output directory.
+     * @checkstyle MemberNameCheck (10 lines)
+     */
+    @Parameter(
+        property = "ineo.outputDir",
+        required = true,
+        defaultValue = "${project.build.directory}/generated-sources/fused-xmir"
+    )
+    private File outputDir;
+
     @Override
     public void execute() {
         Logger.info(this, "Processing files in %s", this.sourcesDir);
         for (final Path file : new FilesOf(this.sourcesDir)) {
             Logger.info(this, "Processing %s", file);
             final XML before = new XMLDocumentOf(file);
             final XML after = FuseMojo.TRANSFORMATION.transform(before);
-            if (!before.equals(after)) {
+            final Path path = this.outputDir.toPath().resolve(
+                this.sourcesDir.toPath().relativize(file)
+            );
+            if (before.equals(after)) {
+                try {
+                    new Saved(before, path).value();
+                } catch (final IOException ex) {
+                    throw new IllegalStateException(
+                        String.format("Couldn't rewrite XMIR to output directory: %s", path),
+                        ex
+                    );
+                }
+            } else {
                 Logger.info(this, "Found fuse optimization in %s", file.getFileName());
                 try {
                     final String pckg = this.sourcesDir.toPath().relativize(file).toString()
                         .replace(String.format("%s%s", File.separator, file.getFileName()), "");
-                    final Path generated = this.sourcesDir.toPath().resolve(
+                    final Path generated = this.outputDir.toPath().resolve(
                         String.join(File.separator, pckg, "BA.xmir")
                     );
                     new Home(
-                        new Saved(after, file),
+                        new Saved(after, path),
                         new Saved(
                             new XMLDocument(
                                 new Xembler(
@@ -112,7 +135,7 @@ public void execute() {
                     ).save();
                     Logger.info(this, "New XMIR was generated: %s", generated);
                 } catch (final IOException ex) {
-                    throw new IllegalStateException("Couldn't save file after transformation", ex);
+                    throw new IllegalStateException("Couldn't save XMIR after transformation", ex);
                 } catch (final ImpossibleModificationException ex) {
                     throw new IllegalStateException("Couldn't transform fused XMIR", ex);
                 }

diff --git a/src/main/java/org/eolang/ineo/Saved.java b/src/main/java/org/eolang/ineo/Saved.java
@@ -23,6 +23,7 @@
  */
 package org.eolang.ineo;
 
+import com.jcabi.log.Logger;
 import com.jcabi.xml.XML;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -114,9 +115,12 @@ private Saved(final Func<Path, Long> func, final Scalar<Path> pth) {
     public Long value() throws IOException {
         try {
             return new IoChecked<>(
-                () -> this.origin.apply(
-                    this.path.value()
-                )
+                () -> {
+                    final Path file = this.path.value();
+                    final long size = this.origin.apply(file);
+                    Logger.info(this, "Written file: %s", file);
+                    return size;
+                }
             ).value();
         } catch (final IOException ex) {
             throw new IOException(