Removed unused classes and methods

Author: lutovich

driver/src/main/java/org/neo4j/driver/ResultResourcesHandler.java

@@ -20,7 +20,6 @@
 
 import java.util.Objects;
 
-import org.neo4j.driver.v1.util.Function;
 import org.neo4j.driver.v1.util.Pair;
 
 public class InternalPair<K, V> implements Pair<K, V>
@@ -57,11 +56,6 @@ public String toString()
         return String.format( "%s: %s", Objects.toString( key ), Objects.toString( value ) );
     }
 
-    public String toString( Function<V, String> printValue )
-    {
-        return String.format( "%s: %s", key, printValue.apply( value ) );
-    }
-
     @Override
     public boolean equals( Object o )
     {

driver/src/main/java/org/neo4j/driver/StatementKeys.java

@@ -23,7 +23,6 @@
 
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.util.Clock;
-import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Statement;
 import org.neo4j.driver.v1.exceptions.ProtocolException;
@@ -37,18 +36,16 @@ public class RoutingProcedureClusterCompositionProvider implements ClusterCompos
     private static final String PROTOCOL_ERROR_MESSAGE = "Failed to parse '%s' result received from server due to ";
 
     private final Clock clock;
-    private final Logger log;
     private final RoutingProcedureRunner routingProcedureRunner;
 
-    public RoutingProcedureClusterCompositionProvider( Clock clock, Logger log, RoutingSettings settings )
+    public RoutingProcedureClusterCompositionProvider( Clock clock, RoutingSettings settings )
     {
-        this( clock, log, new RoutingProcedureRunner( settings.routingContext() ) );
+        this( clock, new RoutingProcedureRunner( settings.routingContext() ) );
     }
 
-    RoutingProcedureClusterCompositionProvider( Clock clock, Logger log, RoutingProcedureRunner routingProcedureRunner )
+    RoutingProcedureClusterCompositionProvider( Clock clock, RoutingProcedureRunner routingProcedureRunner )
     {
         this.clock = clock;
-        this.log = log;
         this.routingProcedureRunner = routingProcedureRunner;
     }
 

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

@@ -268,7 +268,7 @@ private static Rediscovery createRediscovery( BoltServerAddress initialRouter, R
     {
         Logger log = loadBalancerLogger( logging );
         ClusterCompositionProvider clusterCompositionProvider =
-                new RoutingProcedureClusterCompositionProvider( clock, log, settings );
+                new RoutingProcedureClusterCompositionProvider( clock, settings );
         return new Rediscovery( initialRouter, settings, clusterCompositionProvider, eventExecutorGroup,
                 new DnsResolver( log ), log );
     }

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

@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.neo4j.driver.v1.util.Function;
 
@@ -108,14 +107,4 @@ public void remove()
             }
         };
     }
-
-    public static <K, A, B> Map<K,B> mapValues( Map<K,A> map, Function<A,B> f )
-    {
-        HashMap<K,B> transformed = new HashMap<>( map.size() );
-        for ( Entry<K,A> entry : map.entrySet() )
-        {
-            transformed.put( entry.getKey(), f.apply( entry.getValue() ) );
-        }
-        return transformed;
-    }
 }

driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancer.java

@@ -47,7 +47,6 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.neo4j.driver.internal.logging.DevNullLogger.DEV_NULL_LOGGER;
 import static org.neo4j.driver.internal.util.Futures.failedFuture;
 import static org.neo4j.driver.v1.Values.value;
 import static org.neo4j.driver.v1.util.TestUtil.await;
@@ -59,8 +58,8 @@ public void shouldProtocolErrorWhenNoRecord()
     {
         // Given
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mock( Clock.class ),
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         RoutingProcedureResponse noRecordsResponse = newRoutingResponse();
@@ -88,8 +87,8 @@ public void shouldProtocolErrorWhenMoreThanOneRecord()
     {
         // Given
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mock( Clock.class ),
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         Record aRecord = new InternalRecord( asList( "key1", "key2" ), new Value[]{ new StringValue( "a value" ) } );
@@ -118,8 +117,8 @@ public void shouldProtocolErrorWhenUnparsableRecord()
     {
         // Given
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mock( Clock.class ),
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         Record aRecord = new InternalRecord( asList( "key1", "key2" ), new Value[]{ new StringValue( "a value" ) } );
@@ -149,8 +148,8 @@ public void shouldProtocolErrorWhenNoRouters()
         // Given
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
         Clock mockedClock = mock( Clock.class );
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mockedClock,
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mockedClock, mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         Record record = new InternalRecord( asList( "ttl", "servers" ), new Value[]{
@@ -185,8 +184,8 @@ public void shouldProtocolErrorWhenNoReaders()
         // Given
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
         Clock mockedClock = mock( Clock.class );
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mockedClock,
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mockedClock, mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         Record record = new InternalRecord( asList( "ttl", "servers" ), new Value[]{
@@ -221,8 +220,8 @@ public void shouldPropagateConnectionFailureExceptions()
     {
         // Given
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mock( Clock.class ),
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         when( mockedRunner.run( connectionStage ) ).thenReturn( failedFuture(
@@ -247,8 +246,8 @@ public void shouldReturnSuccessResultWhenNoError()
         // Given
         Clock mockedClock = mock( Clock.class );
         RoutingProcedureRunner mockedRunner = newProcedureRunnerMock();
-        ClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider( mockedClock,
-                DEV_NULL_LOGGER, mockedRunner );
+        ClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mockedClock, mockedRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         Record record = new InternalRecord( asList( "ttl", "servers" ), new Value[]{
@@ -282,8 +281,8 @@ public void shouldReturnFailureWhenProcedureRunnerFails()
         when( procedureRunner.run( any( CompletionStage.class ) ) )
                 .thenReturn( completedFuture( newRoutingResponse( error ) ) );
 
-        RoutingProcedureClusterCompositionProvider provider = new RoutingProcedureClusterCompositionProvider(
-                mock( Clock.class ), DEV_NULL_LOGGER, procedureRunner );
+        RoutingProcedureClusterCompositionProvider provider =
+                new RoutingProcedureClusterCompositionProvider( mock( Clock.class ), procedureRunner );
 
         CompletionStage<Connection> connectionStage = completedFuture( mock( Connection.class ) );
         ClusterCompositionResponse response = await( provider.getClusterComposition( connectionStage ) );