Merge branch 'master' of github.com:SepiaGroup/Neo4jRestNet

Conflicts: Neo4jRestNet/Core/Node.cs Neo4jRestNet/Core/Relationship.cs Neo4jRestNet/Core/StoreFactory.cs Neo4jRestNet/CypherPlugin/Cypher.cs Neo4jRestNet/GremlinPlugin/Gremlin.cs Neo4jRestNet/Neo4jRestNet.csproj Neo4jRestNet/Rest/Neo4jRestApi.cs
SepiaGroup · Jan 18, 2012 · 8352e5b · 8352e5b
2 parents 63bccc6 + 58b3a9a
commit 8352e5b
Show file tree

Hide file tree

Showing 13 changed files with 1,755 additions and 14 deletions.
diff --git a/Neo4jRestNet.Test/App.config b/Neo4jRestNet.Test/App.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<connectionStrings>
-		<add name="neo4j"  connectionString="http://localhost:7474/db/data/" />
-		<add name="neo4jGremlinExtension"  connectionString="/ext/GremlinPlugin/graphdb/execute_script/" />
-		<add name="neo4jCypherExtension"  connectionString="/ext/CypherPlugin/graphdb/execute_query/" />
+		<add name="neo4j"  connectionString="http://localhost:7474/db/data/"  providerName="Neo4j" />
+		<add name="neo4jGremlinExtension"  connectionString="/ext/GremlinPlugin/graphdb/execute_script/" providerName="Neo4j"/>
+		<add name="neo4jCypherExtension"  connectionString="/ext/CypherPlugin/graphdb/execute_query/" providerName="Neo4j"/>
 	</connectionStrings>
 
 	<appSettings>

diff --git a/Neo4jRestNet.Test/EncryptedIDTest.cs b/Neo4jRestNet.Test/EncryptedIDTest.cs
@@ -5,6 +5,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Neo4jRestNet.Core;
 using System.Security.Cryptography;
+using Neo4jRestNet.Core.Implementation;
 using Neo4jRestNet.GremlinPlugin;
 
 namespace Neo4jRestNet.Test
@@ -16,6 +17,14 @@ namespace Neo4jRestNet.Test
 	public class EncryptedIDTest
 	{
 
+		[TestMethod]
+		public void GetNode()
+		{
+			var node = Node.GetNode(0);
+
+			Assert.AreEqual(node.Id, 0);
+		}
+
 		[TestMethod]
 		public void NewGEIDFromLong()
 		{

diff --git a/Neo4jRestNet/Core/Implementation/Node.cs b/Neo4jRestNet/Core/Implementation/Node.cs
@@ -639,7 +639,7 @@ public IEnumerable<INode> ParseJson(string jsonNodes)
 		        case JTokenType.Object:
 					nodes.Add(InitializeFromNodeJson(jo["root"].ToString(Formatting.None)));
 		            break;
-
+ 
 		        case JTokenType.Array:
 					nodes.AddRange(from JObject jsonNode in jo["root"] select InitializeFromNodeJson(jsonNode));
 		            break;

diff --git a/Neo4jRestNet/Core/Interface/INode.cs b/Neo4jRestNet/Core/Interface/INode.cs
@@ -74,7 +74,7 @@ public interface INode : IGraphObject
 		HttpStatusCode RemoveNodeFromIndex(long nodeId, Enum indexName, string key, object value);
 		HttpStatusCode RemoveNodeFromIndex(long nodeId, string indexName, Enum key, object value);
 		HttpStatusCode RemoveNodeFromIndex(long nodeId, Enum indexName, Enum key, object value);
-
+		 
 		IEnumerable<INode> ParseJson(string jsonNodes);
 	}
 }