Merge pull request #563 from michael-simons/feature/remove-custom-supplier

Remove custom Supplier interface.

Author: zhenlineo

driver/pom.xml

@@ -86,8 +86,8 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
         <configuration>
-          <comparisonVersion>1.2.0</comparisonVersion>
-          <includes>org/neo4j/driver/v1/**</includes>
+          <comparisonVersion>2.0.0</comparisonVersion>
+          <excludes>org/neo4j/driver/**/internal/**</excludes>
           <ignoredDifferencesFile>clirr-ignored-differences.xml</ignoredDifferencesFile>
         </configuration>
       </plugin>

driver/src/main/java/org/neo4j/driver/internal/AsyncStatementResultCursor.java

@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.neo4j.driver.internal.handlers.PullAllResponseHandler;
 import org.neo4j.driver.internal.handlers.RunResponseHandler;
@@ -29,9 +31,6 @@
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.util.Consumer;
-import org.neo4j.driver.v1.util.Function;
-import org.neo4j.driver.v1.util.Functions;
 
 public class AsyncStatementResultCursor implements InternalStatementResultCursor
 {
@@ -109,7 +108,7 @@ public CompletionStage<ResultSummary> forEachAsync( Consumer<Record> action )
     @Override
     public CompletionStage<List<Record>> listAsync()
     {
-        return listAsync( Functions.identity() );
+        return listAsync( Function.identity() );
     }
 
     @Override

driver/src/main/java/org/neo4j/driver/internal/InternalEntity.java

@@ -26,7 +26,7 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 import org.neo4j.driver.v1.types.Entity;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 import static org.neo4j.driver.v1.Values.ofObject;
 

driver/src/main/java/org/neo4j/driver/internal/InternalRecord.java

@@ -28,7 +28,7 @@
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 import org.neo4j.driver.v1.util.Pair;
 
 import static java.lang.String.format;

driver/src/main/java/org/neo4j/driver/internal/InternalStatementResult.java

@@ -33,7 +33,7 @@
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public class InternalStatementResult implements StatementResult
 {

driver/src/main/java/org/neo4j/driver/internal/cluster/ClusterComposition.java

@@ -25,7 +25,7 @@
 import org.neo4j.driver.internal.BoltServerAddress;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public final class ClusterComposition
 {

driver/src/main/java/org/neo4j/driver/internal/handlers/AbstractPullAllResponseHandler.java

@@ -25,6 +25,7 @@
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.function.Function;
 
 import org.neo4j.driver.internal.InternalRecord;
 import org.neo4j.driver.internal.spi.Connection;
@@ -35,7 +36,6 @@
 import org.neo4j.driver.v1.Statement;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.util.Function;
 
 import static java.util.Collections.emptyMap;
 import static java.util.Objects.requireNonNull;

driver/src/main/java/org/neo4j/driver/internal/handlers/PullAllResponseHandler.java

@@ -24,7 +24,7 @@
 import org.neo4j.driver.internal.spi.ResponseHandler;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public interface PullAllResponseHandler extends ResponseHandler
 {

driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java

@@ -27,10 +27,10 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import org.neo4j.driver.internal.util.Clock;
 import org.neo4j.driver.internal.util.Futures;
-import org.neo4j.driver.internal.util.Supplier;
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;

driver/src/main/java/org/neo4j/driver/internal/retry/RetryLogic.java

@@ -19,8 +19,7 @@
 package org.neo4j.driver.internal.retry;
 
 import java.util.concurrent.CompletionStage;
-
-import org.neo4j.driver.internal.util.Supplier;
+import java.util.function.Supplier;
 
 public interface RetryLogic
 {

driver/src/main/java/org/neo4j/driver/internal/summary/InternalNotification.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.driver.internal.summary;
 
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 import org.neo4j.driver.v1.summary.InputPosition;
 import org.neo4j.driver.v1.summary.Notification;
 import org.neo4j.driver.v1.Value;

driver/src/main/java/org/neo4j/driver/internal/summary/InternalPlan.java

@@ -25,7 +25,7 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 import org.neo4j.driver.v1.summary.Plan;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 import static java.lang.String.format;
 import static org.neo4j.driver.v1.Values.ofString;

driver/src/main/java/org/neo4j/driver/internal/summary/InternalProfiledPlan.java

@@ -23,7 +23,7 @@
 
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.summary.ProfiledPlan;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public class InternalProfiledPlan extends InternalPlan<ProfiledPlan> implements ProfiledPlan
 {

driver/src/main/java/org/neo4j/driver/internal/types/InternalMapAccessorWithDefaultValue.java

@@ -29,7 +29,7 @@
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
 import org.neo4j.driver.v1.types.Relationship;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public abstract class InternalMapAccessorWithDefaultValue implements MapAccessorWithDefaultValue
 {

driver/src/main/java/org/neo4j/driver/internal/util/Extract.java

@@ -34,7 +34,7 @@
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
 import org.neo4j.driver.v1.types.Relationship;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 import org.neo4j.driver.v1.util.Pair;
 
 import static java.util.Collections.emptyList;

driver/src/main/java/org/neo4j/driver/internal/util/Iterables.java

@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Queue;
 
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public class Iterables
 {

driver/src/main/java/org/neo4j/driver/internal/util/Supplier.java

@@ -22,7 +22,7 @@
 
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.types.Entity;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 public abstract class EntityValueAdapter<V extends Entity> extends ObjectValueAdapter<V>
 {

driver/src/main/java/org/neo4j/driver/internal/value/EntityValueAdapter.java

@@ -27,7 +27,7 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 import org.neo4j.driver.v1.types.Type;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 import static org.neo4j.driver.v1.Values.ofObject;
 

driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java

@@ -25,7 +25,7 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 import org.neo4j.driver.v1.types.Type;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 import static org.neo4j.driver.internal.util.Format.formatPairs;
 import static org.neo4j.driver.v1.Values.ofObject;

driver/src/main/java/org/neo4j/driver/internal/value/MapValue.java

@@ -41,7 +41,7 @@
 import org.neo4j.driver.v1.types.Point;
 import org.neo4j.driver.v1.types.Relationship;
 import org.neo4j.driver.v1.types.Type;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 import static java.util.Collections.emptyList;
 import static org.neo4j.driver.v1.Values.ofObject;

driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java

@@ -25,9 +25,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
+import java.util.function.Supplier;
 
 import org.neo4j.driver.internal.util.Futures;
-import org.neo4j.driver.internal.util.Supplier;
 import org.neo4j.driver.reactive.RxResult;
 import org.neo4j.driver.reactive.internal.cursor.RxStatementResultCursor;
 import org.neo4j.driver.v1.Record;

driver/src/main/java/org/neo4j/driver/reactive/internal/InternalRxResult.java

@@ -22,9 +22,9 @@
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.CompletionStage;
+import java.util.function.Supplier;
 
 import org.neo4j.driver.internal.util.Futures;
-import org.neo4j.driver.internal.util.Supplier;
 
 public class RxUtils
 {

driver/src/main/java/org/neo4j/driver/reactive/internal/RxUtils.java

@@ -25,7 +25,7 @@
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 import org.neo4j.driver.v1.types.MapAccessorWithDefaultValue;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 import org.neo4j.driver.v1.util.Immutable;
 import org.neo4j.driver.v1.util.Pair;
 

driver/src/main/java/org/neo4j/driver/v1/Record.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.driver.v1;
 
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 /**
  * Static utility methods for retaining records

driver/src/main/java/org/neo4j/driver/v1/Records.java

@@ -24,7 +24,7 @@
 
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 import org.neo4j.driver.v1.util.Resource;
 
 

driver/src/main/java/org/neo4j/driver/v1/StatementResult.java

@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.util.Consumer;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 /**
  * The result of asynchronous execution of a Cypher statement, conceptually an asynchronous stream of

driver/src/main/java/org/neo4j/driver/v1/StatementResultCursor.java

@@ -42,7 +42,7 @@
 import org.neo4j.driver.v1.types.Type;
 import org.neo4j.driver.v1.types.TypeSystem;
 import org.neo4j.driver.v1.util.Experimental;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 import org.neo4j.driver.v1.util.Immutable;
 
 /**

driver/src/main/java/org/neo4j/driver/v1/Value.java

@@ -64,7 +64,7 @@
 import org.neo4j.driver.v1.types.Point;
 import org.neo4j.driver.v1.types.Relationship;
 import org.neo4j.driver.v1.types.TypeSystem;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 import static org.neo4j.driver.internal.util.Extract.assertParameter;
 import static org.neo4j.driver.internal.util.Iterables.newHashMapWithSize;

driver/src/main/java/org/neo4j/driver/v1/Values.java

@@ -24,7 +24,7 @@
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 import org.neo4j.driver.v1.exceptions.ClientException;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 /**
  * Access the keys, properties and values of an underlying unordered map by key

driver/src/main/java/org/neo4j/driver/v1/types/MapAccessor.java

@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.util.Function;
+import java.util.function.Function;
 
 /**
  * Provides methods to access the value of an underlying unordered map by key.