#163 removed reference to deprecated ExecutionEngine

jQAssistant · Apr 21, 2015 · 1b6d6f6 · 1b6d6f6
1 parent 22f8985
commit 1b6d6f6
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/neo4j/src/main/java/com/buschmais/xo/neo4j/impl/datastore/EmbeddedNeo4jDatastoreSession.java b/neo4j/src/main/java/com/buschmais/xo/neo4j/impl/datastore/EmbeddedNeo4jDatastoreSession.java
@@ -1,20 +1,15 @@
 package com.buschmais.xo.neo4j.impl.datastore;
 
+import java.lang.annotation.Annotation;
+import java.util.*;
+
+import org.neo4j.graphdb.*;
+
 import com.buschmais.xo.api.ResultIterator;
 import com.buschmais.xo.api.XOException;
 import com.buschmais.xo.neo4j.api.annotation.Cypher;
 import com.buschmais.xo.spi.datastore.DatastoreQuery;
 import com.buschmais.xo.spi.datastore.DatastoreTransaction;
-import org.neo4j.cypher.javacompat.ExecutionEngine;
-import org.neo4j.cypher.javacompat.ExecutionResult;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.graphdb.Transaction;
-
-import java.lang.annotation.Annotation;
-import java.util.*;
 
 public class EmbeddedNeo4jDatastoreSession extends AbstractNeo4jDatastoreSession<GraphDatabaseService> {
 
@@ -62,12 +57,10 @@ private void closeTransaction() {
     }
 
     private final DatastoreTransaction datastoreTransaction;
-    private final ExecutionEngine executionEngine;
 
     public EmbeddedNeo4jDatastoreSession(GraphDatabaseService graphDatabaseService) {
         super(graphDatabaseService);
         datastoreTransaction = new EmbeddedNeo4jDatastoreTransaction();
-        executionEngine = new ExecutionEngine(graphDatabaseService);
     }
 
     @Override
@@ -92,19 +85,18 @@ public ResultIterator<Map<String, Object>> execute(Cypher expression, Map<String
 
         @Override
         public ResultIterator<Map<String, Object>> execute(String expression, Map<String, Object> parameters) {
-            ExecutionResult executionResult = executionEngine.execute(expression, translateParameters(parameters));
-            final ResourceIterator<Map<String, Object>> resourceIterator = executionResult.iterator();
+            Result executionResult = getGraphDatabaseService().execute(expression, translateParameters(parameters));
             final List<String> columns = executionResult.columns();
             return new ResultIterator<Map<String, Object>>() {
 
                 @Override
                 public boolean hasNext() {
-                    return resourceIterator.hasNext();
+                    return executionResult.hasNext();
                 }
 
                 @Override
                 public Map<String, Object> next() {
-                    Map<String, Object> next = resourceIterator.next();
+                    Map<String, Object> next = executionResult.next();
                     Map<String, Object> result = new LinkedHashMap<>(next.size(), 1);
                     for (String column : columns) {
                         result.put(column, next.get(column));
@@ -119,7 +111,7 @@ public void remove() {
 
                 @Override
                 public void close() {
-                    resourceIterator.close();
+                    executionResult.close();
                 }
             };
         }