Merge pull request #575 from zhenlineo/2.0-api

Driver New 2.0 API

Author: zhenlineo

driver/clirr-ignored-differences.xml

@@ -1,38 +1,3 @@
 <differences>
-
-    <difference>
-        <!-- Method Added to Interface -->
-        <differenceType>7012</differenceType>
-        <className>org/neo4j/driver/v1/**</className>
-        <method>*</method>
-        <justification>
-            Allow addition of methods to interfaces.
-            Most interfaces are not expected to be implemented by users and expose driver APIs.
-        </justification>
-    </difference>
-
-    <difference>
-        <!-- Method Argument Type changed -->
-        <differenceType>7005</differenceType>
-        <className>org/neo4j/driver/v1/Config$ConfigBuilder</className>
-        <method>org.neo4j.driver.v1.Config$ConfigBuilder withLogging(org.neo4j.driver.internal.spi.Logging)</method>
-        <to>org.neo4j.driver.v1.Config$ConfigBuilder withLogging(org.neo4j.driver.v1.Logging)</to>
-        <justification>
-            Logging interface initially lived in a private package but was exposed as part of public API.
-            It was later moved to the correct public package.
-        </justification>
-    </difference>
-
-    <difference>
-        <!-- Method Return Type changed -->
-        <differenceType>7006</differenceType>
-        <className>org/neo4j/driver/v1/Config</className>
-        <method>org.neo4j.driver.internal.spi.Logging logging()</method>
-        <to>org.neo4j.driver.v1.Logging</to>
-        <justification>
-            Logging interface initially lived in a private package but was exposed as part of public API.
-            It was later moved to the correct public package.
-        </justification>
-    </difference>
-
+<!--2.0 drivers is not API compatible with 1.0 drivers, as a result we reset API differences from 2.0.0-->
 </differences>

driver/src/main/java/org/neo4j/driver/v1/AccessMode.java renamed to driver/src/main/java/org/neo4j/driver/AccessMode.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 /**
  * Used by Routing Driver to decide if a transaction should be routed to a write server or a read server in a cluster.

driver/src/main/java/org/neo4j/driver/v1/AuthToken.java renamed to driver/src/main/java/org/neo4j/driver/AuthToken.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 /**
  * Token for holding authentication details, such as <em>user name</em> and <em>password</em>.

driver/src/main/java/org/neo4j/driver/v1/AuthTokens.java renamed to driver/src/main/java/org/neo4j/driver/AuthTokens.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.Map;
 import java.util.Objects;
@@ -30,7 +30,7 @@
 import static org.neo4j.driver.internal.security.InternalAuthToken.REALM_KEY;
 import static org.neo4j.driver.internal.security.InternalAuthToken.SCHEME_KEY;
 import static org.neo4j.driver.internal.util.Iterables.newHashMapWithSize;
-import static org.neo4j.driver.v1.Values.value;
+import static org.neo4j.driver.Values.value;
 
 /**
  * This is a listing of the various methods of authentication supported by this

driver/src/main/java/org/neo4j/driver/v1/Config.java renamed to driver/src/main/java/org/neo4j/driver/Config.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.io.File;
 import java.net.InetAddress;
@@ -27,16 +27,16 @@
 import org.neo4j.driver.internal.async.pool.PoolSettings;
 import org.neo4j.driver.internal.cluster.RoutingSettings;
 import org.neo4j.driver.internal.retry.RetrySettings;
-import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
-import org.neo4j.driver.v1.exceptions.SessionExpiredException;
-import org.neo4j.driver.v1.exceptions.TransientException;
-import org.neo4j.driver.v1.net.ServerAddressResolver;
-import org.neo4j.driver.v1.util.Experimental;
-import org.neo4j.driver.v1.util.Immutable;
-import org.neo4j.driver.v1.util.Resource;
+import org.neo4j.driver.exceptions.ServiceUnavailableException;
+import org.neo4j.driver.exceptions.SessionExpiredException;
+import org.neo4j.driver.exceptions.TransientException;
+import org.neo4j.driver.net.ServerAddressResolver;
+import org.neo4j.driver.util.Experimental;
+import org.neo4j.driver.util.Immutable;
+import org.neo4j.driver.util.Resource;
 
-import static org.neo4j.driver.v1.Config.TrustStrategy.trustAllCertificates;
-import static org.neo4j.driver.v1.Logging.javaUtilLogging;
+import static org.neo4j.driver.Config.TrustStrategy.trustAllCertificates;
+import static org.neo4j.driver.Logging.javaUtilLogging;
 
 /**
  * A configuration class to config driver properties.
@@ -498,7 +498,7 @@ public ConfigBuilder withMaxConnectionLifetime( long value, TimeUnit unit )
          * Configure maximum amount of connections in the connection pool towards a single database. This setting
          * limits total amount of connections in the pool when used in direct driver, created for URI with 'bolt'
          * scheme. It will limit amount of connections per cluster member when used with routing driver, created for
-         * URI with 'bolt+routing' scheme.
+         * URI with 'neo4j' scheme.
          * <p>
          * Acquisition will be attempted for at most configured timeout
          * {@link #withConnectionAcquisitionTimeout(long, TimeUnit)} when limit is reached.

driver/src/main/java/org/neo4j/driver/v1/ConnectionPoolMetrics.java renamed to driver/src/main/java/org/neo4j/driver/ConnectionPoolMetrics.java

@@ -16,114 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.concurrent.TimeUnit;
 
 public interface ConnectionPoolMetrics
 {
-    /**
-     * An empty connection pool metrics.
-     */
-    ConnectionPoolMetrics EMPTY = new ConnectionPoolMetrics()
-    {
-        @Override
-        public String id()
-        {
-            return "EMPTY";
-        }
-
-        @Override
-        public PoolStatus poolStatus()
-        {
-            return PoolStatus.CLOSED;
-        }
-
-        @Override
-        public int inUse()
-        {
-            return 0;
-        }
-
-        @Override
-        public int idle()
-        {
-            return 0;
-        }
-
-        @Override
-        public int creating()
-        {
-            return 0;
-        }
-
-        @Override
-        public long created()
-        {
-            return 0;
-        }
-
-        @Override
-        public long failedToCreate()
-        {
-            return 0;
-        }
-
-        @Override
-        public long closed()
-        {
-            return 0;
-        }
-
-        @Override
-        public int acquiring()
-        {
-            return 0;
-        }
-
-        @Override
-        public long acquired()
-        {
-            return 0;
-        }
-
-        @Override
-        public long timedOutToAcquire()
-        {
-            return 0;
-        }
-
-        @Override
-        public long totalAcquisitionTime()
-        {
-            return 0;
-        }
-
-        @Override
-        public long totalConnectionTime()
-        {
-            return 0;
-        }
-
-        @Override
-        public long totalInUseTime()
-        {
-            return 0;
-        }
-
-        @Override
-        public long totalInUseCount()
-        {
-            return 0;
-        }
-
-        @Override
-        public ConnectionPoolMetrics snapshot()
-        {
-            return this;
-        }
-    };
-
     enum PoolStatus
     {
         OPEN, CLOSED

driver/src/main/java/org/neo4j/driver/v1/Driver.java renamed to driver/src/main/java/org/neo4j/driver/Driver.java

@@ -16,10 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.concurrent.CompletionStage;
-import org.neo4j.driver.v1.exceptions.ClientException;
+
+import org.neo4j.driver.async.AsyncSession;
+import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.reactive.RxSession;
 
 /**
@@ -50,13 +52,13 @@
  *             <td>Direct driver: connects directly to the host and port specified in the URI.</td>
  *         </tr>
  *         <tr>
- *             <td><code>bolt+routing</code></td>
+ *             <td><code>neo4j</code></td>
  *             <td>Routing driver: can automatically discover members of a Causal Cluster and route {@link Session sessions} based on {@link AccessMode}.</td>
  *         </tr>
  *     </tbody>
  * </table>
  *
- * @since 1.0 (<em>bolt+routing</em> URIs since 1.1)
+ * @since 1.0 (<em>neo4j</em> URIs since 1.1)
  */
 public interface Driver extends AutoCloseable
 {
@@ -167,8 +169,13 @@ public interface Driver extends AutoCloseable
      */
     Metrics metrics();
 
-    // TODO more method overloads with parameters. Leaving this to refactoring PR for different sessions.
+    // TODO more method overloads with parameters. Leaving this to multi-database db name PR.
     RxSession rxSession();
-
     RxSession rxSession( String bookmark );
+
+    // TODO add more method overloads, leaving this to multi-database db name PR
+    AsyncSession asyncSession();
+    AsyncSession asyncSession( AccessMode mode );
+    AsyncSession asyncSession( String bookmark );
+    AsyncSession asyncSession( AccessMode mode, String bookmark );
 }

driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java renamed to driver/src/main/java/org/neo4j/driver/GraphDatabase.java

@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.net.URI;
 
 import org.neo4j.driver.internal.DriverFactory;
 import org.neo4j.driver.internal.cluster.RoutingSettings;
 import org.neo4j.driver.internal.retry.RetrySettings;
-import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
+import org.neo4j.driver.exceptions.ServiceUnavailableException;
 
 import static org.neo4j.driver.internal.DriverFactory.BOLT_ROUTING_URI_SCHEME;
 
@@ -137,12 +137,12 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
     }
 
     /**
-     * Try to create a bolt+routing driver from the <b>first</b> available address.
+     * Try to create a neo4j driver from the <b>first</b> available address.
      * This is wrapper for the {@link #driver} method that finds the <b>first</b>
      * server to respond positively.
      *
      * @param routingUris an {@link Iterable} of server {@link URI}s for Neo4j instances. All given URIs should
-     * have 'bolt+routing' scheme.
+     * have 'neo4j' scheme.
      * @param authToken authentication to use, see {@link AuthTokens}
      * @param config user defined configuration
      * @return a new driver instance

driver/src/main/java/org/neo4j/driver/v1/Logger.java renamed to driver/src/main/java/org/neo4j/driver/Logger.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 /**
  * Logs messages for driver activity.

driver/src/main/java/org/neo4j/driver/v1/Logging.java renamed to driver/src/main/java/org/neo4j/driver/Logging.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;

driver/src/main/java/org/neo4j/driver/v1/Metrics.java renamed to driver/src/main/java/org/neo4j/driver/Metrics.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.Map;
 

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

@@ -16,18 +16,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.List;
 import java.util.Map;
 
 import org.neo4j.driver.internal.value.NullValue;
-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.exceptions.ClientException;
+import org.neo4j.driver.exceptions.NoSuchRecordException;
+import org.neo4j.driver.types.MapAccessorWithDefaultValue;
 import java.util.function.Function;
-import org.neo4j.driver.v1.util.Immutable;
-import org.neo4j.driver.v1.util.Pair;
+import org.neo4j.driver.util.Immutable;
+import org.neo4j.driver.util.Pair;
 
 /**
  * Container for Cypher result values.

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.driver.v1;
+package org.neo4j.driver;
 
 import java.util.function.Function;