bug(objectionary#3199): build

Author: maxonfjvipon

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

@@ -4,7 +4,6 @@
  */
 package org.eolang.maven;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import org.cactoos.BiFunc;
 import org.cactoos.func.UncheckedBiFunc;
@@ -14,22 +13,7 @@
  * condition.
  * @since 0.41
  */
-final class FpFork implements Footprint {
-    /**
-     * Lazy condition.
-     */
-    private final UncheckedBiFunc<Path, Path, Boolean> condition;
-
-    /**
-     * First wrapped footprint.
-     */
-    private final Footprint first;
-
-    /**
-     * Second wrapped footprint.
-     */
-    private final Footprint second;
-
+final class FpFork extends FpEnvelope {
     /**
      * Ctor.
      * @param condition Condition as boolean
@@ -49,19 +33,16 @@ final class FpFork implements Footprint {
     FpFork(
         final BiFunc<Path, Path, Boolean> condition, final Footprint first, final Footprint second
     ) {
-        this.condition = new UncheckedBiFunc<>(condition);
-        this.first = first;
-        this.second = second;
-    }
-
-    @Override
-    public Path apply(final Path source, final Path target) throws IOException {
-        final Footprint footprint;
-        if (this.condition.apply(source, target)) {
-            footprint = this.first;
-        } else {
-            footprint = this.second;
-        }
-        return footprint.apply(source, target);
+        super(
+            (src, tgt) -> {
+                final Footprint footprint;
+                if (new UncheckedBiFunc<>(condition).apply(src, tgt)) {
+                    footprint = first;
+                } else {
+                    footprint = second;
+                }
+                return footprint.apply(src, tgt);
+            }
+        );
     }
 }

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

@@ -169,10 +169,10 @@ private static String version(
         final List<Node> parsed
     ) throws FileNotFoundException {
         final Node node;
-        if (!parsed.isEmpty()) {
-            node = parsed.get(0);
-        } else {
+        if (parsed.isEmpty()) {
             node = new XMLDocument(target).inner();
+        } else {
+            node = parsed.get(0);
         }
         return new Xnav(node)
             .element("program")

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

@@ -7,6 +7,7 @@
 import com.jcabi.log.Logger;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -15,6 +16,7 @@
 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.scalar.Unchecked;
 
 /**
@@ -138,70 +140,6 @@ private long place() {
                 .count();
         }
 
-        /**
-         * Check if the file is not a source file.
-         * @param file The file to check.
-         * @return True if the file is not a source file.
-         */
-        private boolean isNotEoSource(final Path file) {
-            final boolean res;
-            final Path path = this.dir.relativize(file);
-            if (path.startsWith(CopyMojo.DIR)) {
-                Logger.debug(
-                    this,
-                    "File %[file]s (%[size]s) is not a binary, but a source, won't place it",
-                    path, path.toFile().length()
-                );
-                res = false;
-            } else {
-                res = true;
-            }
-            return res;
-        }
-
-        /**
-         * Check whether the binary file has corresponding EO sources in the jar.
-         *
-         * <p>The method checks ONLY EO binaries and classes. All other java files or classes in jar
-         * will be included anyway.
-         * Let's consider the next filesystem structure:</p>
-         *
-         * <pre>
-         * Source file:
-         * - "EO-SOURCE/org/eolang/txt/x.eo" -
-         *
-         * Correct:
-         * - "EOorg/EOeolang/EOtxt/x.class" - is correct since has corresponding EO source folder
-         * - "EOorg/EOeolang/EOtxt/y&z.class" - is correct since has corresponding EO source folder
-         * - "com/sun/jna/Callback.class" - is correct since binary file is not in EOorg folder
-         *
-         * Is incorrect (since has no corresponding EO source folder):
-         * - "EOorg/EOeolang/EObool.class"
-         * - "EOorg/x.class"
-         * </pre>
-         *
-         * <p>The filter is disabled by default, works only if the parameter
-         * "placeBinariesThatHaveSources" is set to true.</p>
-         *
-         * @param file The file to check.
-         * @return True if the file has corresponding EO sources.
-         */
-        private boolean hasEoSource(final Path file) {
-            final boolean result;
-            if (PlaceMojo.this.placeBinariesThatHaveSources && file.toString().contains("EOorg")) {
-                final Path sources = this.dir.resolve(CopyMojo.DIR)
-                    .resolve(this.dir.relativize(file.getParent()).toString().replace("EO", ""));
-                result = Files.exists(sources)
-                    && Files.isDirectory(sources)
-                    && Arrays.stream(sources.toFile().listFiles())
-                    .filter(Objects::nonNull)
-                    .anyMatch(File::isFile);
-            } else {
-                result = true;
-            }
-            return result;
-        }
-
         /**
          * Check if the file is not already placed.
          * @param file The file to check.
@@ -266,7 +204,9 @@ 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(Files::readString);
+                final Footprint generated = new FpGenerated(
+                    src -> new String(new BytesOf(src).asBytes(), StandardCharsets.UTF_8)
+                );
                 final Path target = new FpIfTargetExists(
                     new FpFork(this.rewrite, generated, new FpIgnore()),
                     generated
@@ -278,10 +218,11 @@ private void placeBinary(final Path file) {
                 );
             } catch (final IOException ex) {
                 throw new IllegalStateException(
-                    String.format(
-                        "Failed to place %s to home %s with path %s",
+                    Logger.format(
+                        "Failed to place %[file]s to home %[file]s with path %s",
                         file, PlaceMojo.this.outputDir, path
-                    ), ex
+                    ),
+                    ex
                 );
             }
         }

eo-maven-plugin/src/test/java/org/eolang/maven/AssembleMojoIT.java

@@ -41,20 +41,6 @@ void assemblesTogether(@Mktmp final Path temp) throws IOException {
                     .write(AssembleMojoIT.helloWorld().getBytes(StandardCharsets.UTF_8));
                 AssembleMojoIT.appendItself(f);
                 f.exec("package");
-                MatcherAssert.assertThat(
-                    String.join(
-                        " ",
-                        "AssembleMojo should have placed runtime",
-                        "library, but didn't"
-                    ),
-                    temp.resolve(
-                        String.format(
-                            "target/eo/%s/org.eolang/eo-runtime",
-                            ResolveMojo.DIR
-                        )
-                    ).toAbsolutePath(),
-                    new ContainsFiles("**/org/eolang/Phi.class")
-                );
                 MatcherAssert.assertThat(
                     String.format(
                         "AssembleMojo should have parsed stdout object %s, but didn't",

eo-maven-plugin/src/test/java/org/eolang/maven/ResolveMojoTest.java

@@ -123,7 +123,8 @@ void resolvesIfRuntimeDependencyComesFromTojos(@Mktmp final Path temp) throws IO
                 "+rt jvm org.eolang:eo-runtime:0.22.1",
                 "+version 0.25.0\n",
                 "# No comments.",
-                "[] > main")
+                "[] > main"
+            )
             .execute(new FakeMaven.Resolve());
         MatcherAssert.assertThat(
             ResolveMojoTest.JAR_MUST_EXIST,

eo-runtime/pom.xml

@@ -236,8 +236,7 @@
             <phase>generate-test-sources</phase>
             <goals>
               <goal>register</goal>
-              <goal>assemble</goal>
-              <goal>lint</goal>
+              <goal>compile</goal>
               <goal>xmir-to-phi</goal>
               <goal>phi-to-xmir</goal>
               <goal>transpile</goal>

eo-runtime/src/test/java/integration/SnippetIT.java

@@ -66,7 +66,15 @@ void runsAllSnippets(final String yml, final @Mktmp Path temp) throws IOExceptio
                             xtory.map().get("eo")
                         ).getBytes(StandardCharsets.UTF_8)
                     );
-                f.dependencies().appendItself();
+                f.dependencies()
+                    .append(
+                        "org.eolang",
+                        "eo-runtime",
+                        System.getProperty(
+                            "eo.version",
+                            Manifests.read("EO-Version")
+                        )
+                    );
                 f.build()
                     .plugins()
                     .append(
@@ -81,7 +89,8 @@ void runsAllSnippets(final String yml, final @Mktmp Path temp) throws IOExceptio
                     .phase("generate-sources")
                     .goals("register", "compile", "transpile")
                     .configuration()
-                    .set("failOnWarning", Boolean.FALSE.toString());
+                    .set("failOnWarning", Boolean.FALSE.toString())
+                    .set("skipLinting", Boolean.TRUE.toString());
                 f.build()
                     .plugins()
                     .append("org.codehaus.mojo", "exec-maven-plugin", "3.1.1")

eo-runtime/src/test/resources/jul.properties

@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 handlers = org.slf4j.bridge.SLF4JBridgeHandler
-.level=INFO
+.level=DEBUG