From b5c4ce5b191a4921ca688de9b64be2073e8a5860 Mon Sep 17 00:00:00 2001
From: Axel Morgner <axel@morgner.de>
Date: Thu, 14 Nov 2013 17:30:12 +0100
Subject: [PATCH] Upgrade to use with neo4j 1.9.5

---
 pom.xml                                              |  4 ++--
 .../org/neo4j/rest/graphdb/RestGraphDatabase.java    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd7cac4..2789ec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,13 @@
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-rest-graphdb</artifactId>
     <packaging>jar</packaging>
-    <version>1.9.3-SNAPSHOT</version>
+    <version>1.9.5</version>
     <name>Neo4j - Rest GraphDatabaseService Wrapper</name>
     <description>Neo4j REST binding implementing the GraphDatabaseService interface.</description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.6.1</slf4j.version>
-        <neo4j.version>1.9.2</neo4j.version>
+        <neo4j.version>1.9.5</neo4j.version>
         <jersey.version>1.4</jersey.version>
         <blueprints.version>1.2</blueprints.version>
         <gremlin.version>1.5</gremlin.version>
diff --git a/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java b/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java
index 49f869a..375c7bd 100644
--- a/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java
+++ b/src/main/java/org/neo4j/rest/graphdb/RestGraphDatabase.java
@@ -23,7 +23,6 @@
 import org.neo4j.graphdb.*;
 import org.neo4j.rest.graphdb.index.RestIndexManager;
 import org.neo4j.rest.graphdb.query.RestCypherQueryEngine;
-import org.neo4j.rest.graphdb.transaction.NullTransactionManager;
 import org.neo4j.rest.graphdb.util.ResultConverter;
 
 import javax.transaction.TransactionManager;
@@ -52,18 +51,22 @@ public RestAPI getRestAPI(){
     	return this.restAPI;
     }
 
+    @Override
     public RestIndexManager index() {
        return this.restAPI.index();
     }
 
+    @Override
     public Node createNode() {
     	return this.restAPI.createNode(null);
     }
   
+    @Override
     public Node getNodeById( long id ) {
     	return this.restAPI.getNodeById(id);
     }
 
+    @Override
     public Node getReferenceNode() {
         return this.restAPI.getReferenceNode();
     }
@@ -83,6 +86,7 @@ public RelationshipType convert(Map<String, Object> row, Class<RelationshipType>
         });
     }
 
+    @Override
     public Relationship getRelationshipById( long id ) {
     	return this.restAPI.getRelationshipById(id);
     }    
@@ -105,5 +109,11 @@ public Transaction beginTx() {
     public void shutdown() {
         restAPI.close();
     }
+
+    @Override
+    public boolean isAvailable(long l) {
+        // not really sure what to use here
+        return restAPI != null && cypherQueryEngine != null;
+    }
 }