Merge pull request #9 from stuartstevenson/master

MappingBuilder circular reference issue

src/test/java/org/springframework/data/elasticsearch/core/CircularObject.java

@@ -0,0 +1,18 @@
+package org.springframework.data.elasticsearch.core;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+/**
+ * @author Stuart Stevenson
+ */
+@Document(indexName = "circular-objects", type = "circular-object" , indexStoreType = "memory", shards = 1, replicas = 0, refreshInterval = "-1")
+public class CircularObject {
+
+    @Id
+    private String id;
+    @Field(type = FieldType.Object, ignoreFields = {"circularObject"})
+    private CircularObject circularObject;
+}

src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java

@@ -0,0 +1,25 @@
+package org.springframework.data.elasticsearch.core;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Stuart Stevenson
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:elasticsearch-template-test.xml")
+public class MappingBuilderTests {
+
+    @Autowired
+    private ElasticsearchTemplate elasticsearchTemplate;
+
+    @Test
+    public void shouldNotFailOnCircularReference() {
+        elasticsearchTemplate.createIndex(CircularObject.class);
+        elasticsearchTemplate.putMapping(CircularObject.class);
+    }
+
+}