Merge pull request #146 from ashitanojoe/master

Added support for Operation Type

Author: Mpdreamz

src/Nest.Tests.Integration/Core/IndexTests.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Nest.Tests.MockData;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+
+namespace Nest.Tests.Integration.Core
+{
+	[TestFixture]
+	public class IndexTests : CleanStateIntegrationTests
+	{
+        private readonly Random idGen = new Random();
+
+		[Test]
+		public void IndexUsingCreateFlag()
+		{
+            // Document to be indexed.
+            ElasticSearchProject doc = new ElasticSearchProject
+            {
+                Country = "Mozambique",
+                Followers = new List<Person>(),
+                Id = idGen.Next(),
+                Name = "Test Document for 'IndexDocument' Create Flag"
+            };
+
+            // Index the document
+            this._client.Index<ElasticSearchProject>(doc, new IndexParameters { OpType = OpType.Create });
+
+            // Grab the indexed document.
+            var foundDoc = this._client.Get<ElasticSearchProject>(doc.Id);
+
+            // Check that the document was successfully indexed.
+            Assert.NotNull(foundDoc);
+            Assert.AreEqual(doc.Country, foundDoc.Country);
+			Assert.AreEqual(doc.Followers.Count, foundDoc.Followers.Count);
+			Assert.AreEqual(doc.Id, foundDoc.Id);
+			Assert.AreEqual(doc.Name, foundDoc.Name);
+
+            // Now try to index the document again while using the Create Flag
+            var response = this._client.Index<ElasticSearchProject>(doc, new IndexParameters { OpType = OpType.Create });
+
+            // Make sure the index request failed with HTTP status 409 since document with same id already exists.
+            Assert.False(response.OK);
+            Assert.AreEqual(System.Net.HttpStatusCode.Conflict, response.ConnectionStatus.Error.HttpStatusCode);
+		}
+	}
+}

src/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -51,6 +51,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Core\IndexTests.cs" />
     <Compile Include="IntegrationTests.cs" />
     <Compile Include="Cluster\HealthTests.cs" />
     <Compile Include="Cluster\NodeTests.cs" />

src/Nest.Tests.Unit/Core/Versioning/VersioningTests.cs

@@ -1,28 +1,55 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Nest;
-using Newtonsoft.Json.Converters;
-using Nest.Resolvers.Converters;
-using Nest.Tests.MockData.Domain;
-
-namespace Nest.Tests.Unit.Core.Versioning
-{
-	[TestFixture]
-	public class VersioningTests : BaseJsonTests
-	{
-		[Test]
-		public void IndexSupportsVersioning()
-		{
-			var o = new ElasticSearchProject { Id = 1, Name = "Test" };
-			var result = this._client.Index(o, new IndexParameters { Version = "1" });
-			var status = result.ConnectionStatus;
-			StringAssert.Contains("version=1", status.RequestUrl);
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using Nest;
+using Newtonsoft.Json.Converters;
+using Nest.Resolvers.Converters;
+using Nest.Tests.MockData.Domain;
+
+namespace Nest.Tests.Unit.Core.Versioning
+{
+	[TestFixture]
+	public class VersioningTests : BaseJsonTests
+	{
+		[Test]
+		public void IndexSupportsVersioning()
+		{
+			var o = new ElasticSearchProject { Id = 1, Name = "Test" };
+			var result = this._client.Index(o, new IndexParameters { Version = "1" });
+			var status = result.ConnectionStatus;
+			StringAssert.Contains("version=1", status.RequestUrl);
+		}
+
+        [Test]
+        public void IndexOpTypeDefault()
+        {
+            var o = new ElasticSearchProject { Id = 1, Name = "Test" };
+            var result = this._client.Index(o, new IndexParameters());
+            var status = result.ConnectionStatus;
+            StringAssert.DoesNotContain("op_type=create", status.RequestUrl);
+        }
+
+        [Test]
+        public void IndexOpTypeNone()
+        {
+            var o = new ElasticSearchProject { Id = 1, Name = "Test" };
+            var result = this._client.Index(o, new IndexParameters { OpType = OpType.None });
+            var status = result.ConnectionStatus;
+            StringAssert.DoesNotContain("op_type=create", status.RequestUrl);
+        }
+
+        [Test]
+        public void IndexOpTypeCreate()
+        {
+            var o = new ElasticSearchProject { Id = 1, Name = "Test" };
+            var result = this._client.Index(o, new IndexParameters { OpType = OpType.Create });
+            var status = result.ConnectionStatus;
+            StringAssert.Contains("op_type=create", status.RequestUrl);
+        }
+	}
+}

src/Nest/Domain/Parameters/BaseParameters.cs

@@ -1,31 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Nest
-{
-	public interface ISimpleUrlParameters
-	{
-		Replication Replication { get; set; }
-		bool Refresh { get; set; }
-	}
-	public interface IUrlParameters 
-	{
-		string Version { get; set; }
-		string Routing { get; set; }
-		string Parent { get; set; }
-		Replication Replication { get; set; }
-		Consistency Consistency { get; set; }
-		bool Refresh { get; set; }
-	}
-	public class BaseParameters : IUrlParameters
-	{
-		public string Version { get; set; }
-		public string Routing { get; set; }
-		public string Parent { get; set; }
-		public Replication Replication { get; set; }
-		public Consistency Consistency { get; set; }
-		public bool Refresh { get; set; }
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public interface ISimpleUrlParameters
+	{
+		Replication Replication { get; set; }
+		bool Refresh { get; set; }
+	}
+	public interface IUrlParameters 
+	{
+		string Version { get; set; }
+		OpType OpType { get; set; }
+		string Routing { get; set; }
+		string Parent { get; set; }
+		Replication Replication { get; set; }
+		Consistency Consistency { get; set; }
+		bool Refresh { get; set; }
+	}
+	public class BaseParameters : IUrlParameters
+	{
+		public string Version { get; set; }
+		public OpType OpType { get; set; }
+		public string Routing { get; set; }
+		public string Parent { get; set; }
+		public Replication Replication { get; set; }
+		public Consistency Consistency { get; set; }
+		public bool Refresh { get; set; }
+	}
+}

src/Nest/Enums/OpType.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+    public enum OpType
+    {
+        None, // default in ES
+        Create
+    }
+}

src/Nest/Nest.csproj

@@ -207,6 +207,7 @@
     <Compile Include="Enums\GeoTree.cs" />
     <Compile Include="Enums\NumericIndexOption.cs" />
     <Compile Include="Enums\IndexOptions.cs" />
+    <Compile Include="Enums\OpType.cs" />
     <Compile Include="Enums\SearchType.cs" />
     <Compile Include="Enums\Lang.cs" />
     <Compile Include="Enums\DateHistogramComparatorType.cs" />

src/Nest/Resolvers/PathResolver.cs

@@ -185,6 +185,9 @@ public string AppendParametersToPath(string path, IUrlParameters urlParameters)
 			if (!urlParameters.Parent.IsNullOrEmpty())
 				parameters.Add("parent=" + urlParameters.Parent);
 
+			if (urlParameters.OpType != OpType.None) // default not set
+				parameters.Add("op_type=" + urlParameters.OpType.ToString().ToLower());
+
 			if (urlParameters.Replication != Replication.Sync) //sync == default
 				parameters.Add("replication=" + urlParameters.Replication.ToString().ToLower());