DATAES-55 - polish test cases and remove unwanted files

Author: mohsinh

src/main/java/org/springframework/data/elasticsearch/core/query/IndexQueryBuilder.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+/**
+ * IndexQuery Builder
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class IndexQueryBuilder {
+
+	private String id;
+	private Object object;
+	private Long version;
+	private String indexName;
+	private String type;
+	private String source;
+	private String parentId;
+
+	public IndexQueryBuilder withId(String id) {
+		this.id = id;
+		return this;
+	}
+
+	public IndexQueryBuilder withObject(Object object) {
+		this.object = object;
+		return this;
+	}
+
+	public IndexQueryBuilder withVersion(Long version) {
+		this.version = version;
+		return this;
+	}
+
+	public IndexQueryBuilder withIndexName(String indexName) {
+		this.indexName = indexName;
+		return this;
+	}
+
+	public IndexQueryBuilder withType(String type) {
+		this.type = type;
+		return this;
+	}
+
+	public IndexQueryBuilder withSource(String source) {
+		this.source = source;
+		return this;
+	}
+
+	public IndexQueryBuilder withParentId(String parentId) {
+		this.parentId = parentId;
+		return this;
+	}
+
+	public IndexQuery build() {
+		IndexQuery indexQuery = new IndexQuery();
+		indexQuery.setId(id);
+		indexQuery.setIndexName(indexName);
+		indexQuery.setType(type);
+		indexQuery.setObject(object);
+		indexQuery.setParentId(parentId);
+		indexQuery.setSource(source);
+		indexQuery.setVersion(version);
+		return indexQuery;
+	}
+}

src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java

@@ -25,6 +25,8 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.entities.Author;
+import org.springframework.data.elasticsearch.entities.Book;
 import org.springframework.data.elasticsearch.repositories.book.SampleElasticSearchBookRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java

@@ -35,6 +35,7 @@
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.SearchQuery;
+import org.springframework.data.elasticsearch.entities.*;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -254,7 +255,7 @@ public void shouldSearchBooksForPersonInitialLevelNestedType() {
 		javaAuthor.setName("javaAuthor");
 		java.setAuthor(javaAuthor);
 
-		Book spring= new Book();
+		Book spring = new Book();
 		spring.setId("2");
 		spring.setName("spring");
 		Author springAuthor = new Author();
@@ -299,6 +300,5 @@ public void shouldSearchBooksForPersonInitialLevelNestedType() {
 		List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
 
 		assertThat(persons.size(), is(1));
-
 	}
 }

src/test/java/org/springframework/data/elasticsearch/CarBuilder.java renamed to src/test/java/org/springframework/data/elasticsearch/builder/CarBuilder.java

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch;
+package org.springframework.data.elasticsearch.builder;
+
+import org.springframework.data.elasticsearch.entities.Car;
 
 /**
  * @author Artur Konczak

src/test/java/org/springframework/data/elasticsearch/SampleEntityBuilder.java renamed to src/test/java/org/springframework/data/elasticsearch/builder/SampleEntityBuilder.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch;
+package org.springframework.data.elasticsearch.builder;
 
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.entities.SampleEntity;
 
 /**
  * @author Rizwan Idrees

src/test/java/org/springframework/data/elasticsearch/StockPriceBuilder.java renamed to src/test/java/org/springframework/data/elasticsearch/builder/StockPriceBuilder.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch;
+package org.springframework.data.elasticsearch.builder;
 
 import java.math.BigDecimal;
 
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.entities.StockPrice;
 
 /**
  * @author Artur Konczak

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

@@ -22,8 +22,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.data.elasticsearch.Car;
-import org.springframework.data.elasticsearch.CarBuilder;
+import org.springframework.data.elasticsearch.builder.CarBuilder;
+import org.springframework.data.elasticsearch.entities.Car;
 
 /**
  * @author Artur Konczak

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

@@ -34,7 +34,7 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.data.elasticsearch.Car;
+import org.springframework.data.elasticsearch.entities.Car;
 
 /**
  * @author Artur Konczak

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

@@ -28,10 +28,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.elasticsearch.ParentEntity;
-import org.springframework.data.elasticsearch.ParentEntity.ChildEntity;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.entities.ParentEntity;
+import org.springframework.data.elasticsearch.entities.ParentEntity.ChildEntity;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;