Switch from baked-in functional/Either previously needed for Java 1.6…

… compat to our dependency that contains these now that we have Java 11 compat
exquery · Nov 20, 2023 · 51ceef9 · 51ceef9
1 parent 39b93ed
commit 51ceef9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 237 deletions.
diff --git a/pom.xml b/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.evolvedbinary.j8fu</groupId>
+            <artifactId>j8fu</artifactId>
+            <version>1.23.0</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/src/main/java/com/evolvedbinary/functional/Either.java b/src/main/java/com/evolvedbinary/functional/Either.java
diff --git a/src/main/java/com/evolvedbinary/functional/Function.java b/src/main/java/com/evolvedbinary/functional/Function.java
diff --git a/src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java b/src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java
@@ -19,7 +19,7 @@
  */
 package com.evolvedbinary.xpath.parser;
 
-import com.evolvedbinary.functional.Either;
+import com.evolvedbinary.j8fu.Either;
 import com.evolvedbinary.xpath.parser.ast.partial.*;
 import org.parboiled.BaseParser;
 import org.parboiled.Rule;

diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/DocumentTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/DocumentTest.java
@@ -19,7 +19,7 @@
  */
 package com.evolvedbinary.xpath.parser.ast;
 
-import com.evolvedbinary.functional.Either;
+import com.evolvedbinary.j8fu.Either;
 import javax.annotation.Nullable;
 
 /**

diff --git a/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDocumentTest.java b/src/main/java/com/evolvedbinary/xpath/parser/ast/partial/PartialDocumentTest.java
@@ -19,7 +19,7 @@
  */
 package com.evolvedbinary.xpath.parser.ast.partial;
 
-import com.evolvedbinary.functional.Either;
+import com.evolvedbinary.j8fu.Either;
 import com.evolvedbinary.xpath.parser.ast.ElementTest;
 import com.evolvedbinary.xpath.parser.ast.DocumentTest;
 import com.evolvedbinary.xpath.parser.ast.SchemaElementTest;

diff --git a/src/test/java/com/evolvedbinary/xpath/parser/XPathParserTest.java b/src/test/java/com/evolvedbinary/xpath/parser/XPathParserTest.java
@@ -19,7 +19,7 @@
  */
 package com.evolvedbinary.xpath.parser;
 
-import com.evolvedbinary.functional.Either;
+import com.evolvedbinary.j8fu.Either;
 import com.evolvedbinary.xpath.parser.ast.*;
 import org.junit.Test;
 import org.parboiled.Parboiled;