feat(#1716): apply OyIndexed

objectionary · Feb 1, 2023 · 282f4ad · 282f4ad
1 parent 18a3685
commit 282f4ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java
@@ -44,6 +44,7 @@
 import org.eolang.maven.objectionary.Objectionary;
 import org.eolang.maven.objectionary.OyFallbackSwap;
 import org.eolang.maven.objectionary.OyHome;
+import org.eolang.maven.objectionary.OyIndexed;
 import org.eolang.maven.objectionary.OyRemote;
 import org.eolang.maven.util.Online;
 import org.eolang.maven.util.Rel;
@@ -128,7 +129,7 @@ public void exec() throws IOException {
                     new ChNarrow(hash),
                     this.outputPath
                 ),
-                new OyRemote(hash),
+                new OyIndexed(new OyRemote(hash)),
                 this.forceUpdate()
             );
         }

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java
@@ -42,6 +42,7 @@
 import org.eolang.maven.objectionary.OyEmpty;
 import org.eolang.maven.objectionary.OyFallbackSwap;
 import org.eolang.maven.objectionary.OyHome;
+import org.eolang.maven.objectionary.OyIndexed;
 import org.eolang.maven.objectionary.OyRemote;
 import org.eolang.maven.util.Home;
 import org.eolang.maven.util.Online;
@@ -172,7 +173,7 @@ private static Objectionary remote(final CommitHash hash) {
         Objectionary obj;
         try {
             InetAddress.getByName("home.objectionary.com").isReachable(1000);
-            obj = new OyRemote(hash);
+            obj = new OyIndexed(new OyRemote(hash));
         } catch (final IOException ex) {
             obj = new OyEmpty();
         }

diff --git a/...rg/eolang/maven/objectionary/OyIndex.java → .../eolang/maven/objectionary/OyIndexed.java b/...rg/eolang/maven/objectionary/OyIndex.java → .../eolang/maven/objectionary/OyIndexed.java
@@ -32,7 +32,7 @@
  *
  * @since 0.29
  */
-final class OyIndex implements Objectionary {
+public final class OyIndexed implements Objectionary {
 
     /**
      * Objectionary delegate.
@@ -48,7 +48,7 @@ final class OyIndex implements Objectionary {
      * Ctor.
      * @param objectionary Objectionary
      */
-    OyIndex(final Objectionary objectionary) {
+    public OyIndexed(final Objectionary objectionary) {
         this(objectionary, new ObjectsIndex());
     }
 
@@ -57,7 +57,7 @@ final class OyIndex implements Objectionary {
      * @param objectionary Objectionary
      * @param index Index
      */
-    OyIndex(final Objectionary objectionary, final ObjectsIndex index) {
+    OyIndexed(final Objectionary objectionary, final ObjectsIndex index) {
         this.delegate = objectionary;
         this.index = index;
     }

diff --git a/...olang/maven/objectionary/OyIndexTest.java → ...ang/maven/objectionary/OyIndexedTest.java b/...olang/maven/objectionary/OyIndexTest.java → ...ang/maven/objectionary/OyIndexedTest.java
@@ -34,11 +34,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
- * Test for {@link OyIndex}.
+ * Test for {@link OyIndexed}.
  *
  * @since 0.29
  */
-class OyIndexTest {
+class OyIndexedTest {
 
     /**
      * Object name for stdout.
@@ -48,7 +48,7 @@ class OyIndexTest {
     @Test
     void getsFromDelegate() throws Exception {
         MatcherAssert.assertThat(
-            new TextOf(new OyIndex(new OyFake()).get("foo")).asString(),
+            new TextOf(new OyIndexed(new OyFake()).get("foo")).asString(),
             Matchers.equalTo("[] > sprintf\n")
         );
     }
@@ -57,33 +57,33 @@ void getsFromDelegate() throws Exception {
     @ExtendWith(OnlineCondition.class)
     void containsInRealIndex() throws IOException {
         MatcherAssert.assertThat(
-            new OyIndex(new OyFake()).contains(OyIndexTest.STDOUT_OBJECT),
+            new OyIndexed(new OyFake()).contains(OyIndexedTest.STDOUT_OBJECT),
             Matchers.is(true)
         );
     }
 
     @Test
     void containsInFakeIndex() throws IOException {
         MatcherAssert.assertThat(
-            new OyIndex(
+            new OyIndexed(
                 new OyFake(),
-                new ObjectsIndex(() -> Collections.singleton(OyIndexTest.STDOUT_OBJECT))
-            ).contains(OyIndexTest.STDOUT_OBJECT),
+                new ObjectsIndex(() -> Collections.singleton(OyIndexedTest.STDOUT_OBJECT))
+            ).contains(OyIndexedTest.STDOUT_OBJECT),
             Matchers.is(true)
         );
     }
 
     @Test
     void checksContainsInDelegateIfExceptionHappensInIndex() throws IOException {
         MatcherAssert.assertThat(
-            new OyIndex(
+            new OyIndexed(
                 new OyFake(),
                 new ObjectsIndex(
                     () -> {
                         throw new IllegalStateException("Fake exception");
                     }
                 )
-            ).contains(OyIndexTest.STDOUT_OBJECT),
+            ).contains(OyIndexedTest.STDOUT_OBJECT),
             Matchers.is(true)
         );
     }