#25 far moved to a new repo

pom.xml

@@ -60,19 +60,10 @@ SOFTWARE.
       <artifactId>cactoos</artifactId>
       <version>0.46</version>
     </dependency>
-    <dependency>
-      <groupId>com.jcabi.incubator</groupId>
-      <artifactId>xembly</artifactId>
-      <version>0.25.0</version>
-    </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-log</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.jcabi</groupId>
-      <artifactId>jcabi-matchers</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-xml</artifactId>
@@ -84,6 +75,11 @@ SOFTWARE.
       <version>3.0.1</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.polystat</groupId>
+      <artifactId>far</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.polystat.odin</groupId>
       <artifactId>interop_2.13</artifactId>

src/main/java/org/polystat/odin/package-info.java → src/main/java/org/polystat/AnFaR.java

@@ -21,11 +21,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+package org.polystat;
+
+import com.jcabi.xml.XML;
+import org.cactoos.Func;
+import org.polystat.far.FaR;
 
 /**
- * Package related to odin.
+ * Bridge to FaR analysis module.
  *
- * @since 0.3
- * @see <a href="https://github.com/polystat/odin">GitHub Org</a>
+ * @see <a href="https://github.com/polystat/far">GitHub</a>
+ * @since 0.4
  */
-package org.polystat.odin;
+public final class AnFaR implements Analysis {
+
+    @Override
+    public Iterable<String> errors(final Func<String, XML> xmir,
+        final String locator) throws Exception {
+        return new FaR().errors(xmir, locator);
+    }
+
+}

src/main/java/org/polystat/odin/OdinAnalysis.java → src/main/java/org/polystat/AnOdin.java

@@ -21,14 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.polystat.odin;
+package org.polystat;
 
 import com.jcabi.xml.XML;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.cactoos.Func;
 import org.cactoos.list.ListOf;
-import org.polystat.Analysis;
 import org.polystat.odin.analysis.mutualrec.naive.exceptions.UnsupportedDecoration;
 import org.polystat.odin.interop.java.EOOdinAnalyzer;
 import org.polystat.odin.interop.java.OdinAnalysisErrorInterop;
@@ -39,19 +38,7 @@
  * @see <a href="https://github.com/polystat/odin">Github</a>
  * @since 0.3
  */
-public final class OdinAnalysis implements Analysis {
-
-    /**
-     * Odin analyzer that performs analysis.
-     */
-    private final EOOdinAnalyzer<String> analyzer;
-
-    /**
-     * Ctor.
-     */
-    public OdinAnalysis() {
-        this.analyzer = new EOOdinAnalyzer.EOOdinXmirAnalyzer();
-    }
+public final class AnOdin implements Analysis {
 
     @Override
     public Iterable<String> errors(final Func<String, XML> xmir,
@@ -60,7 +47,8 @@ public Iterable<String> errors(final Func<String, XML> xmir,
         final String str = getObjectsHierarchy(xmir, xml);
         Iterable<String> result;
         try {
-            result = this.analyzer.analyze(str).stream()
+            result = new EOOdinAnalyzer.EOOdinXmirAnalyzer()
+                .analyze(str).stream()
                 .map(OdinAnalysisErrorInterop::message)
                 .collect(Collectors.toList());
         } catch (final UnsupportedDecoration ex) {

src/main/java/org/polystat/Polystat.java

@@ -30,8 +30,6 @@
 import java.util.List;
 import org.cactoos.Func;
 import org.cactoos.list.ListOf;
-import org.polystat.far.Reverses;
-import org.polystat.odin.OdinAnalysis;
 
 /**
  * Main entrance.
@@ -47,8 +45,8 @@ public final class Polystat {
      * Analyzers.
      */
     private static final Analysis[] ALL = {
-        new Reverses(),
-        new OdinAnalysis(),
+        new AnFaR(),
+        new AnOdin(),
     };
 
     /**
@@ -93,15 +91,21 @@ public void exec(final String... args) throws Exception {
             );
             for (final Analysis analysis : Polystat.ALL) {
                 final List<String> errors = new ListOf<>(
-                    analysis.errors(xmir, "\\Phi.foo")
+                    analysis.errors(xmir, "\\Phi.test")
                 );
                 Logger.info(
                     this, "%d errors found by %s",
                     errors.size(), analysis.getClass()
                 );
                 for (final String error : errors) {
-                    Logger.info(this, "Error: %s", error);
-                    this.stdout.printf("Error: %s%n", error);
+                    Logger.info(
+                        this, "%s: %s",
+                        analysis.getClass().getSimpleName(), error
+                    );
+                    this.stdout.printf(
+                        "%s: %s%n",
+                        analysis.getClass().getSimpleName(), error
+                    );
                 }
                 if (errors.isEmpty()) {
                     Logger.info(this, "No errors found");