Cut back auth API to minimum needed to pass basic usage test

- This keeps the same model - principal, credential, token - as
  originally proposed, but only exposes the concrete parts of the
  model as required to satisfy a minimal use case. This should be
  suitable to build upon as need arises for end users.

Author: jakewins

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

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.neo4j.driver.internal;
+
+import java.net.URI;
+
+import org.neo4j.driver.internal.pool.InternalConnectionPool;
+import org.neo4j.driver.internal.spi.ConnectionPool;
+import org.neo4j.driver.v1.Config;
+import org.neo4j.driver.v1.Driver;
+import org.neo4j.driver.v1.Session;
+
+public class InternalDriver implements Driver
+{
+    private final ConnectionPool connections;
+    private final URI url;
+    private final Config config;
+
+    public InternalDriver( URI url, Config config )
+    {
+        this.url = url;
+        this.connections = new InternalConnectionPool( config );
+        this.config = config;
+    }
+
+    /**
+     * Establish a session
+     * @return a session that could be used to run {@link Session#run(String) a statement} or
+     * {@link Session#beginTransaction() a transaction }.
+     */
+    @Override
+    public Session session()
+    {
+        return new InternalSession( connections.acquire( url ), config.logging().getLog( "session" ) );
+    }
+
+    /**
+     * Close all the resources assigned to this driver
+     * @throws Exception any error that might happen when releasing all resources
+     */
+    public void close() throws Exception
+    {
+        connections.close();
+    }
+}

driver/src/main/java/org/neo4j/driver/internal/auth/InternalAuthToken.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.neo4j.driver.internal.auth;
+
+import java.util.Map;
+
+import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.auth.AuthToken;
+
+/**
+ * A simple common token for authentication schemes that easily convert to
+ * an auth token map
+ */
+public class InternalAuthToken implements AuthToken
+{
+    private final Map<String,Value> content;
+
+    public InternalAuthToken( Map<String,Value> content )
+    {
+        this.content = content;
+    }
+
+    public Map<String, Value> toMap()
+    {
+        return content;
+    }
+}

driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java

@@ -40,9 +40,9 @@ public LoggingResponseHandler( Logger logger )
     }
 
     @Override
-    public void handleInitMessage( String clientNameAndVersion )
+    public void handleInitMessage( String clientNameAndVersion, Map<String,Value> authToken )
     {
-        super.handleInitMessage( clientNameAndVersion );
+        super.handleInitMessage( clientNameAndVersion, authToken );
         logger.debug( "S: [INIT \"%s\"]", clientNameAndVersion );
     }
 

driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java

@@ -66,9 +66,9 @@ public SocketConnection( String host, int port, Config config )
     }
 
     @Override
-    public void init( String clientName )
+    public void init( String clientName, Map<String,Value> authToken )
     {
-        queueMessage( new InitMessage( clientName ), StreamCollector.NO_OP );
+        queueMessage( new InitMessage( clientName, authToken ), StreamCollector.NO_OP );
     }
 
     @Override

driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java

@@ -21,11 +21,16 @@
 import java.net.URI;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 
 import org.neo4j.driver.internal.Version;
+import org.neo4j.driver.internal.auth.InternalAuthToken;
 import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.Connector;
 import org.neo4j.driver.v1.Config;
+import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.auth.AuthToken;
+import org.neo4j.driver.v1.auth.AuthTokens;
 import org.neo4j.driver.v1.exceptions.ClientException;
 
 public class SocketConnector implements Connector
@@ -44,7 +49,7 @@ public Connection connect( URI sessionURI, Config config ) throws ClientExceptio
     {
         int port = sessionURI.getPort() == -1 ? DEFAULT_PORT : sessionURI.getPort();
         SocketConnection conn = new SocketConnection( sessionURI.getHost(), port, config );
-        conn.init( "bolt-java-driver/" + Version.driverVersion() );
+        conn.init( "bolt-java-driver/" + Version.driverVersion(), tokenAsMap( config.authToken() ) );
         return conn;
     }
 
@@ -53,4 +58,17 @@ public Collection<String> supportedSchemes()
     {
         return Collections.singletonList( SCHEME );
     }
+
+    private Map<String,Value> tokenAsMap( AuthToken token )
+    {
+        if( token instanceof InternalAuthToken )
+        {
+            return ((InternalAuthToken) token).toMap();
+        }
+        else
+        {
+            throw new ClientException( "Unknown authentication token, `" + token + "`. Please use one of the supported " +
+                                       "tokens from `" + AuthTokens.class.getSimpleName() + "`." );
+        }
+    }
 }

driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java

@@ -198,7 +198,7 @@ public void handlePullAllMessage()
     }
 
     @Override
-    public void handleInitMessage( String clientNameAndVersion )
+    public void handleInitMessage( String clientNameAndVersion, Map<String,Value> authToken )
     {
 
     }

driver/src/main/java/org/neo4j/driver/internal/messaging/InitMessage.java

@@ -19,6 +19,9 @@
 package org.neo4j.driver.internal.messaging;
 
 import java.io.IOException;
+import java.util.Map;
+
+import org.neo4j.driver.v1.Value;
 
 import static java.lang.String.format;
 
@@ -30,16 +33,18 @@
 public class InitMessage implements Message
 {
     private final String clientNameAndVersion;
+    private Map<String,Value> authToken;
 
-    public InitMessage( String clientNameAndVersion )
+    public InitMessage( String clientNameAndVersion, Map<String,Value> authToken )
     {
         this.clientNameAndVersion = clientNameAndVersion;
+        this.authToken = authToken;
     }
 
     @Override
     public void dispatch( MessageHandler handler ) throws IOException
     {
-        handler.handleInitMessage( clientNameAndVersion );
+        handler.handleInitMessage( clientNameAndVersion, authToken );
     }
 
     @Override

driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java

@@ -26,7 +26,7 @@
 public interface MessageHandler
 {
     // Requests
-    void handleInitMessage( String clientNameAndVersion ) throws IOException;
+    void handleInitMessage( String clientNameAndVersion, Map<String,Value> authToken ) throws IOException;
 
     void handleRunMessage( String statement, Map<String,Value> parameters ) throws IOException;
 

driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java

@@ -34,7 +34,6 @@
 import org.neo4j.driver.internal.InternalRelationship;
 import org.neo4j.driver.internal.connector.socket.ChunkedInput;
 import org.neo4j.driver.internal.connector.socket.ChunkedOutput;
-import org.neo4j.driver.internal.packstream.BufferedChannelOutput;
 import org.neo4j.driver.internal.packstream.PackInput;
 import org.neo4j.driver.internal.packstream.PackOutput;
 import org.neo4j.driver.internal.packstream.PackStream;
@@ -105,11 +104,6 @@ public static class Writer implements MessageFormat.Writer, MessageHandler
         private final PackStream.Packer packer;
         private final Runnable onMessageComplete;
 
-        public Writer()
-        {
-            this( new BufferedChannelOutput( 8192 ), new NoOpRunnable() );
-        }
-
         /**
          * @param output interface to write messages to
          * @param onMessageComplete invoked for each message, after it's done writing to the output
@@ -121,10 +115,11 @@ public Writer( PackOutput output, Runnable onMessageComplete )
         }
 
         @Override
-        public void handleInitMessage( String clientNameAndVersion ) throws IOException
+        public void handleInitMessage( String clientNameAndVersion, Map<String,Value> authToken ) throws IOException
         {
             packer.packStructHeader( 1, MSG_INIT );
             packer.pack( clientNameAndVersion );
+            packRawMap( authToken );
             onMessageComplete.run();
         }
 
@@ -445,7 +440,7 @@ private void unpackResetMessage( MessageHandler handler ) throws IOException
 
         private void unpackInitMessage( MessageHandler handler ) throws IOException
         {
-            handler.handleInitMessage( unpacker.unpackString() );
+            handler.handleInitMessage( unpacker.unpackString(), unpackMap() );
             onMessageComplete.run();
         }
 

driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnection.java

@@ -41,11 +41,11 @@ public PooledConnection( Connection delegate, Consumer<PooledConnection> release
     }
 
     @Override
-    public void init( String clientName )
+    public void init( String clientName, Map<String,Value> authToken )
     {
         try
         {
-            delegate.init( clientName );
+            delegate.init( clientName, authToken );
         }
         catch( RuntimeException e )
         {