bug(#3199): fix saving

Author: maxonfjvipon

eo-maven-plugin/src/main/java/org/eolang/maven/FpDefault.java

@@ -4,9 +4,12 @@
  */
 package org.eolang.maven;
 
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.function.Supplier;
 import org.cactoos.Func;
+import org.cactoos.Input;
+import org.cactoos.io.InputOf;
 
 /**
  * Default footprint that covers all the scenarios of updating target
@@ -63,7 +66,15 @@ final class FpDefault extends FpEnvelope {
         final Supplier<String> hash,
         final Path tail
     ) {
-        this(new FpGenerated(content), base, semver, hash, tail);
+        this(
+            new FpGenerated(
+                src -> new InputOf(content.apply(src))
+            ),
+            base,
+            semver,
+            hash,
+            tail
+        );
     }
 
     /**

eo-maven-plugin/src/main/java/org/eolang/maven/FpGenerated.java

@@ -7,7 +7,8 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import org.cactoos.Func;
-import org.cactoos.scalar.ScalarOf;
+import org.cactoos.Input;
+import org.cactoos.func.UncheckedFunc;
 
 /**
  * Footprint that saves content generated from lambda to the target file.
@@ -17,18 +18,18 @@ final class FpGenerated implements Footprint {
     /**
      * Content function.
      */
-    private final Func<Path, String> content;
+    private final UncheckedFunc<Path, Input> content;
 
     /**
      * Ctor.
-     * @param content Content function
+     * @param content Content as bytes
      */
-    FpGenerated(final Func<Path, String> content) {
-        this.content = content;
+    FpGenerated(final Func<Path, Input> content) {
+        this.content = new UncheckedFunc<>(content);
     }
 
     @Override
     public Path apply(final Path source, final Path target) throws IOException {
-        return new Saved(new ScalarOf<>(this.content, source), target).value();
+        return new Saved(this.content.apply(source), target).value();
     }
 }

eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java

@@ -6,14 +6,13 @@
 
 import com.jcabi.log.Logger;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.cactoos.bytes.BytesOf;
+import org.cactoos.io.InputOf;
 import org.cactoos.scalar.Unchecked;
 
 /**
@@ -201,9 +200,7 @@ private void printLogInfoAboutBinary(final Path file) {
         private void placeBinary(final Path file) {
             final Path path = this.dir.relativize(file);
             try {
-                final Footprint generated = new FpGenerated(
-                    src -> new String(new BytesOf(src).asBytes(), StandardCharsets.UTF_8)
-                );
+                final Footprint generated = new FpGenerated(InputOf::new);
                 final Path target = new FpIfTargetExists(
                     new FpFork(this.rewrite, generated, new FpIgnore()),
                     generated

eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java

@@ -13,7 +13,6 @@
 import java.util.function.Supplier;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.cactoos.text.TextOf;
 
 /**
  * Pull EO files from Objectionary.
@@ -136,7 +135,7 @@ private Path pulled(final String object, final Path base, final String hsh) thro
                     "Pulling %s object from remote objectionary with hash %s",
                     object, hsh
                 );
-                return new TextOf(this.objectionary.get(object)).asString();
+                return this.objectionary.get(object);
             }
         );
         final Footprint both = new FpUpdateBoth(generated, che);

eo-maven-plugin/src/main/java/org/eolang/maven/Saved.java

@@ -6,6 +6,7 @@
 
 import com.jcabi.log.Logger;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import org.cactoos.Input;
 import org.cactoos.Scalar;
@@ -15,7 +16,6 @@
 import org.cactoos.io.TeeInput;
 import org.cactoos.scalar.IoChecked;
 import org.cactoos.scalar.LengthOf;
-import org.cactoos.text.TextOf;
 
 /**
  * Content saved to the file.
@@ -39,16 +39,16 @@ final class Saved implements Scalar<Path> {
      * @param target Path to save content to
      */
     Saved(final String content, final Path target) {
-        this(new InputOf(content), target);
+        this(content.getBytes(StandardCharsets.UTF_8), target);
     }
 
     /**
      * Ctor.
-     * @param content Content as scalar
+     * @param content Content as bytes
      * @param target Path to save content to
      */
-    Saved(final Scalar<String> content, final Path target) {
-        this(new TextOf(content), target);
+    Saved(final byte[] content, final Path target) {
+        this(new InputOf(content), target);
     }
 
     /**

eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java

@@ -33,6 +33,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.cactoos.func.StickyFunc;
+import org.cactoos.io.InputOf;
 import org.cactoos.text.Joined;
 import org.eolang.parser.TrFull;
 
@@ -259,7 +260,14 @@ private int javaGenerated(
                             this, "Generated %[file]s (%[size]s) file from %[file]s (%[size]s)",
                             tgt, tgt.toFile().length(), target, target.toFile().length()
                         );
-                        return new Joined("", clazz.element("java").text().get()).asString();
+                        return new InputOf(
+                            new Joined(
+                                "",
+                                clazz.elements(Filter.withName("java")).map(
+                                    java -> java.text().orElse("")
+                                ).collect(Collectors.toList())
+                            )
+                        );
                     }
                 );
                 final Footprint both = new FpUpdateBoth(generated, che);

eo-runtime/src/test/groovy/check-folders-numbering.groovy

@@ -12,8 +12,8 @@ List<String> allowed = [
     '1-parse',
     '2-shake',
     '4-pull',
-    '5-resolve',
-    '6-lint',
+    '5-lint',
+    '6-resolve',
     '7-pre',
     '8-transpile',
     'phi',

eo-runtime/src/test/groovy/check-target-files.groovy

@@ -8,13 +8,13 @@ List<String> expected = [
   'eo/1-parse/org/eolang/fs/dir.xmir',
   'eo/2-shake/org/eolang/error.xmir',
   'eo/2-shake/org/eolang/sys/os.xmir',
-  'eo/6-lint/org/eolang/go.xmir',
+  'eo/5-lint/org/eolang/go.xmir',
   'eo/8-transpile/org/eolang/malloc.xmir',
   'eo/phi/org/eolang/number.phi',
   'eo/unphi/org/eolang/number.xmir',
   'eo-test/1-parse/org/eolang/bool-tests.xmir',
   'eo-test/2-shake/org/eolang/go-tests.xmir',
-  'eo-test/6-lint/org/eolang/dataized-tests.xmir',
+  'eo-test/5-lint/org/eolang/dataized-tests.xmir',
   'eo-test/8-transpile/org/eolang/runtime-tests.xmir',
   'eo-test/phi/org/eolang/number-tests.phi',
   'eo-test/unphi/org/eolang/number-tests.xmir',