Merge with 1.0 and fixed conflicts

Author: RagnarW

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

@@ -0,0 +1,62 @@
+/**
+ * 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.AuthToken;
+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, AuthToken authToken, Config config )
+    {
+        this.url = url;
+        this.connections = new InternalConnectionPool( config, authToken );
+        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/InternalRecord.java

@@ -19,6 +19,7 @@
 package org.neo4j.driver.internal;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -37,14 +38,12 @@
 public class InternalRecord extends InternalRecordAccessor implements Record
 {
     private final List<String> keys;
-    private final Map<String, Integer> keyIndexLookup;
     private final Value[] values;
     private int hashcode = 0;
 
-    public InternalRecord( List<String> keys, Map<String, Integer> keyIndexLookup, Value[] values )
+    public InternalRecord( List<String> keys, Value[] values )
     {
         this.keys = keys;
-        this.keyIndexLookup = keyIndexLookup;
         this.values = values;
     }
 
@@ -57,8 +56,8 @@ public List<String> keys()
     @Override
     public int index( String key )
     {
-        Integer result = keyIndexLookup.get( key );
-        if ( result == null )
+        int result = keys.indexOf( key );
+        if ( result == -1 )
         {
             throw new NoSuchElementException( "Unknown key: " + key );
         }
@@ -71,15 +70,15 @@ public int index( String key )
     @Override
     public boolean containsKey( String key )
     {
-        return keyIndexLookup.containsKey( key );
+        return keys.contains( key );
     }
 
     @Override
     public Value get( String key )
     {
-        Integer fieldIndex = keyIndexLookup.get( key );
+        int fieldIndex = keys.indexOf( key );
 
-        if ( fieldIndex == null )
+        if ( fieldIndex == -1 )
         {
             return Values.NULL;
         }