Getting rid of some deprecated method calls, and cleaning up the constructors of Neo4j2Graph.

Author: joeyfreund

blueprints-neo4j2-graph/src/main/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2Graph.java

@@ -1,21 +1,16 @@
 package com.tinkerpop.blueprints.impls.neo4j2;
 
-import com.tinkerpop.blueprints.Edge;
-import com.tinkerpop.blueprints.Element;
-import com.tinkerpop.blueprints.Features;
-import com.tinkerpop.blueprints.GraphQuery;
-import com.tinkerpop.blueprints.Index;
-import com.tinkerpop.blueprints.IndexableGraph;
-import com.tinkerpop.blueprints.KeyIndexableGraph;
-import com.tinkerpop.blueprints.MetaGraph;
-import com.tinkerpop.blueprints.Parameter;
-import com.tinkerpop.blueprints.TransactionalGraph;
-import com.tinkerpop.blueprints.Vertex;
-import com.tinkerpop.blueprints.util.DefaultGraphQuery;
-import com.tinkerpop.blueprints.util.ExceptionFactory;
-import com.tinkerpop.blueprints.util.KeyIndexableGraphHelper;
-import com.tinkerpop.blueprints.util.PropertyFilteredIterable;
-import com.tinkerpop.blueprints.util.StringFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationConverter;
 import org.neo4j.graphdb.DynamicRelationshipType;
@@ -30,22 +25,49 @@
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.graphdb.index.AutoIndexer;
 import org.neo4j.graphdb.index.RelationshipIndex;
+import org.neo4j.helpers.Settings;
 import org.neo4j.kernel.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.core.NodeManager;
 import org.neo4j.tooling.GlobalGraphOperations;
 
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import com.tinkerpop.blueprints.Edge;
+import com.tinkerpop.blueprints.Element;
+import com.tinkerpop.blueprints.Features;
+import com.tinkerpop.blueprints.GraphQuery;
+import com.tinkerpop.blueprints.Index;
+import com.tinkerpop.blueprints.IndexableGraph;
+import com.tinkerpop.blueprints.KeyIndexableGraph;
+import com.tinkerpop.blueprints.MetaGraph;
+import com.tinkerpop.blueprints.Parameter;
+import com.tinkerpop.blueprints.TransactionalGraph;
+import com.tinkerpop.blueprints.Vertex;
+import com.tinkerpop.blueprints.util.DefaultGraphQuery;
+import com.tinkerpop.blueprints.util.ExceptionFactory;
+import com.tinkerpop.blueprints.util.KeyIndexableGraphHelper;
+import com.tinkerpop.blueprints.util.PropertyFilteredIterable;
+import com.tinkerpop.blueprints.util.StringFactory;
 
 /**
  * A Blueprints implementation of the graph database Neo4j (http://neo4j.org)
  *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
 public class Neo4j2Graph implements TransactionalGraph, IndexableGraph, KeyIndexableGraph, MetaGraph<GraphDatabaseService> {
+	
     private static final Logger logger = Logger.getLogger(Neo4j2Graph.class.getName());
+    
+    
+    public static GraphDatabaseBuilder createGraphDatabaseBuilder(String directory, Map<String, String> configuration){
+        GraphDatabaseBuilder builder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(directory);
+        if (null != configuration){
+                for(String key: configuration.keySet()){
+                        builder.setConfig(Settings.setting(key, Settings.STRING, (String) null), configuration.get(key));
+                }
+        }
+        return builder;
+    }
 
+    
     private GraphDatabaseService rawGraph;
     private static final String INDEXED_KEYS_POSTFIX = ":indexed_keys";
 
@@ -131,42 +153,36 @@ public void setCheckElementsInTransaction(final boolean checkElementsInTransacti
         this.checkElementsInTransaction.set(checkElementsInTransaction);
     }
 
+    
     public Neo4j2Graph(final String directory) {
         this(directory, null);
     }
-
-    public Neo4j2Graph(final GraphDatabaseService rawGraph) {
-        this.rawGraph = rawGraph;
-
-        init();
+    
+    public Neo4j2Graph(final Configuration configuration) {
+        this(configuration.getString("blueprints.neo4j.directory", null),
+                ConfigurationConverter.getMap(configuration.subset("blueprints.neo4j.conf")));
     }
-
+    
     public Neo4j2Graph(final String directory, final Map<String, String> configuration) {
-        try {
-            GraphDatabaseBuilder builder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(directory);
-            if (null != configuration)
-                this.rawGraph = builder.setConfig(configuration).newGraphDatabase();
-            else
-                this.rawGraph = builder.newGraphDatabase();
+    	this(createGraphDatabaseBuilder(directory, configuration).newGraphDatabase());
+    }
 
+    public Neo4j2Graph(final GraphDatabaseService rawGraph) {
+    	try{
+    		this.rawGraph = rawGraph;
             init();
-
-        } catch (Exception e) {
-            if (this.rawGraph != null)
-                this.rawGraph.shutdown();
-            throw new RuntimeException(e.getMessage(), e);
-        }
+    	} catch (Exception e) {
+          if (this.rawGraph != null)
+              this.rawGraph.shutdown();
+          throw new RuntimeException(e.getMessage(), e);
+      } 
     }
 
+
     protected void init() {
         this.loadKeyIndices();
     }
 
-    public Neo4j2Graph(final Configuration configuration) {
-        this(configuration.getString("blueprints.neo4j.directory", null),
-                ConfigurationConverter.getMap(configuration.subset("blueprints.neo4j.conf")));
-    }
-
     private void loadKeyIndices() {
         this.autoStartTransaction(true);
         for (final String key : this.getInternalIndexKeys(Vertex.class)) {