refactor(#2227): Refactor ForeignTojos Attribute

eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojos.java

@@ -236,7 +236,7 @@ private Collection<ForeignTojo> select(final Predicate<? super Tojo> filter) {
     /**
      * Foreign tojo attributes.
      */
-    public enum Attribute {
+    enum Attribute {
 
         /**
          * Tojo id.
@@ -293,11 +293,6 @@ public enum Attribute {
          */
         SCOPE("scope"),
 
-        /**
-         * Transpiled.
-         */
-        TRANSPILED("transpiled"),
-
         /**
          * Hash.
          */
@@ -325,7 +320,7 @@ public enum Attribute {
          * Get the attribute name.
          * @return The attribute name.
          */
-        public String key() {
+        String key() {
             return this.key;
         }
     }

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

@@ -24,7 +24,6 @@
 package org.eolang.maven;
 
 import com.yegor256.tojos.TjSmart;
-import com.yegor256.tojos.Tojo;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -54,6 +53,7 @@
 import org.cactoos.Input;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
+import org.eolang.maven.hash.CommitHash;
 import org.eolang.maven.tojos.ForeignTojos;
 import org.eolang.maven.tojos.PlacedTojos;
 import org.eolang.maven.util.Home;
@@ -82,11 +82,6 @@ public final class FakeMaven {
      */
     private final Map<String, Object> params;
 
-    /**
-     * Attributes for eo.foreign.* and eo.external.*.
-     */
-    private final Map<ForeignTojos.Attribute, Object> attributes;
-
     /**
      * Current program number.
      * We can save several programs in workspace and each program has it's own number
@@ -102,7 +97,6 @@ public final class FakeMaven {
     public FakeMaven(final Path workspace) {
         this.workspace = new Home(workspace);
         this.params = new HashMap<>();
-        this.attributes = new HashMap<>();
         this.current = new AtomicInteger(0);
     }
 
@@ -156,8 +150,6 @@ public TjSmart foreign() {
      * @throws java.io.IOException If some problem with filesystem have happened.
      */
     public <T extends AbstractMojo> FakeMaven execute(final Class<T> mojo) throws IOException {
-        this.fillUp(this.foreign().select(all -> true));
-        this.fillUp(this.external().select(all -> true));
         this.params.putIfAbsent("targetDir", this.targetPath().toFile());
         this.params.putIfAbsent("foreign", this.foreignPath().toFile());
         this.params.putIfAbsent("external", this.externalPath().toFile());
@@ -301,14 +293,12 @@ FakeMaven withProgram(final Path path) throws IOException {
     }
 
     /**
-     * Sets tojo attribute.
-     *
-     * @param attribute Tojo attribute.
-     * @param value Attribute value.
+     * Specify hash for all foreign tojos.
+     * @param hash Commit hash
      * @return The same maven instance.
      */
-    FakeMaven withTojoAttribute(final ForeignTojos.Attribute attribute, final Object value) {
-        this.attributes.put(attribute, value);
+    FakeMaven allTojosWithHash(final CommitHash hash) {
+        this.foreignTojos().all().forEach(tojo -> tojo.withHash(hash));
         return this;
     }
 
@@ -467,25 +457,6 @@ private Path externalPath() {
         return this.workspace.absolute(Paths.get("eo-external.csv"));
     }
 
-    /**
-     * Fill up given tojos by the attributes.
-     * @param tojos Tojos to fill up.
-     * @todo #1602:30min Move the method to ForeignTojos if possible.
-     *  Let's treat ForeignTojos as an object (not as a collection of data)
-     *  and give it a chance to fulfill itself. It knows better how to do so.
-     *  ForeignTojo in current implementation does not have method set() so
-     *  we either need to implement it or just stay with the method here in
-     *  FakeMaven class.
-     */
-    private void fillUp(final List<Tojo> tojos) {
-        for (final Tojo tojo : tojos) {
-            for (final Map.Entry<ForeignTojos.Attribute, Object> entry
-                : this.attributes.entrySet()) {
-                tojo.set(entry.getKey().key(), entry.getValue());
-            }
-        }
-    }
-
     /**
      * Parse full pipeline.
      *

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

@@ -43,7 +43,6 @@
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.TextOf;
 import org.eolang.jucs.ClasspathSource;
-import org.eolang.maven.tojos.ForeignTojos;
 import org.eolang.maven.util.Home;
 import org.eolang.parser.CheckPack;
 import org.hamcrest.MatcherAssert;
@@ -138,7 +137,7 @@ void getsAlreadyOptimizedResultsFromCache(@TempDir final Path temp) throws Excep
         new FakeMaven(temp)
             .withHelloWorld()
             .with("cache", cache)
-            .withTojoAttribute(ForeignTojos.Attribute.HASH, hash)
+            .allTojosWithHash(() -> hash)
             .execute(new FakeMaven.Optimize());
         MatcherAssert.assertThat(
             new XMLDocument(
@@ -163,7 +162,7 @@ void savesOptimizedResultsToCache(@TempDir final Path temp) throws IOException {
         new FakeMaven(temp)
             .withHelloWorld()
             .with("cache", cache)
-            .withTojoAttribute(ForeignTojos.Attribute.HASH, hash)
+            .allTojosWithHash(() -> hash)
             .execute(new FakeMaven.Optimize());
         MatcherAssert.assertThat(
             cache.resolve(OptimizeMojo.OPTIMIZED)

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

@@ -37,7 +37,7 @@
 import org.eolang.maven.footprint.FtDefault;
 import org.eolang.maven.hash.ChNarrow;
 import org.eolang.maven.hash.ChRemote;
-import org.eolang.maven.tojos.ForeignTojos;
+import org.eolang.maven.hash.CommitHash;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
@@ -84,22 +84,22 @@ void failsOnTimeout(@TempDir final Path temp) {
     @Test
     @ExtendWith(OnlineCondition.class)
     void parsesWithCache(@TempDir final Path temp) throws Exception {
-        final FakeMaven maven = new FakeMaven(temp);
         final Path cache = temp.resolve("cache");
+        final FakeMaven maven = new FakeMaven(temp)
+            .withProgram("invalid content")
+            .with("cache", cache);
         final String expected = new UncheckedText(
             new TextOf(new ResourceOf("org/eolang/maven/main.xmir"))
         ).asString();
-        final String hash = new ChNarrow(new ChRemote("0.25.0")).value();
+        final CommitHash hash = new ChNarrow(new ChRemote("0.25.0"));
         new FtCached(
-            new CacheVersion(FakeMaven.pluginVersion(), hash),
+            new CacheVersion(FakeMaven.pluginVersion(), hash.value()),
             cache.resolve(ParseMojo.PARSED),
             new FtDefault(maven.targetPath())
         ).save("foo.x.main", "xmir", () -> expected);
         MatcherAssert.assertThat(
             new TextOf(
-                maven.withProgram("invalid content")
-                    .withTojoAttribute(ForeignTojos.Attribute.HASH, hash)
-                    .with("cache", cache)
+                maven.allTojosWithHash(hash)
                     .execute(new FakeMaven.Parse())
                     .result()
                     .get(String.format("target/%s/foo/x/main.%s", ParseMojo.DIR, TranspileMojo.EXT))