DATAES-55 - polish test cases and remove unwanted files

Test cases were scanning entire package for repositories, created dedicated package for individual repository.

Author: mohsinh

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

@@ -25,7 +25,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.SampleElasticSearchBookRepository;
+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/NonDocumentEntityTests.java

@@ -18,7 +18,7 @@
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.data.elasticsearch.repositories.NonDocumentEntityRepository;
+import org.springframework.data.elasticsearch.repositories.nondocument.NonDocumentEntityRepository;
 
 /**
  * @author Rizwan Idrees

src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java

@@ -25,7 +25,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
 import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
-import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java

@@ -26,7 +26,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -40,7 +40,7 @@
 public class EnableElasticsearchRepositoriesTests {
 
 	@Configuration
-	@EnableElasticsearchRepositories(basePackages = "org.springframework.data.elasticsearch.repositories")
+	@EnableElasticsearchRepositories(basePackages = "org.springframework.data.elasticsearch.repositories.sample")
 	static class Config {
 
 		@Bean

src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java

@@ -31,6 +31,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.repositories.custom.SampleCustomMethodRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticSearchBookRepository.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/book/SampleElasticSearchBookRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.book;
 
 import org.springframework.data.elasticsearch.Book;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;

src/test/java/org/springframework/data/elasticsearch/repositories/SampleCustomMethodRepository.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/custom/SampleCustomMethodRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.custom;
 
 import java.util.List;
 

src/test/java/org/springframework/data/elasticsearch/repositories/DoubleIDRepository.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.doubleid;
 
 import org.springframework.data.elasticsearch.DoubleIDEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;

src/test/java/org/springframework/data/elasticsearch/repositories/IntegerIDRepository.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/integer/IntegerIDRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.integer;
 
 import org.springframework.data.elasticsearch.IntegerIDEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;

src/test/java/org/springframework/data/elasticsearch/repositories/NonDocumentEntityRepository.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/nondocument/NonDocumentEntityRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.nondocument;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.elasticsearch.NonDocumentEntity;

src/test/java/org/springframework/data/elasticsearch/repositories/SampleElasticsearchRepository.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/sample/SampleElasticsearchRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.repositories;
+package org.springframework.data.elasticsearch.repositories.sample;
 
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;

src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java

@@ -27,7 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.DoubleIDEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.DoubleIDRepository;
+import org.springframework.data.elasticsearch.repositories.doubleid.DoubleIDRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -37,7 +37,7 @@
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/simple-repository-test.xml")
+@ContextConfiguration("classpath:/double-id-repository-test.xml")
 public class DoubleIDRepositoryTests {
 
 	@Autowired

src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java

@@ -27,7 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.elasticsearch.IntegerIDEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.repositories.IntegerIDRepository;
+import org.springframework.data.elasticsearch.repositories.integer.IntegerIDRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -37,7 +37,7 @@
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/simple-repository-test.xml")
+@ContextConfiguration("classpath:/integer-id-repository-test.xml")
 public class IntegerIDRepositoryTests {
 
 	@Autowired

src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java

@@ -36,7 +36,7 @@
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.data.elasticsearch.repositories.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/resources/custom-method-repository-test.xml

@@ -14,7 +14,6 @@
 
 
     <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories"/>
-
+            base-package="org.springframework.data.elasticsearch.repositories.custom"/>
 
 </beans>

src/test/resources/double-id-repository-test.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+    <import resource="infrastructure.xml"/>
+
+    <bean name="elasticsearchTemplate"
+          class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+
+    <elasticsearch:repositories
+            base-package="org.springframework.data.elasticsearch.repositories.doubleid"/>
+
+</beans>

src/test/resources/integer-id-repository-test.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+    <import resource="infrastructure.xml"/>
+
+    <bean name="elasticsearchTemplate"
+          class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+
+    <elasticsearch:repositories
+            base-package="org.springframework.data.elasticsearch.repositories.integer"/>
+
+</beans>

src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml

@@ -16,7 +16,6 @@
     <elasticsearch:transport-client id="transportClient"/>
 
     <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories"/>
-
+            base-package="org.springframework.data.elasticsearch.repositories.sample"/>
 
 </beans>

src/test/resources/repository-non-document-entity.xml

@@ -12,6 +12,6 @@
         <constructor-arg name="client" ref="client"/>
     </bean>
 
-    <elasticsearch:repositories base-package="org.springframework.data.elasticsearch"/>
+    <elasticsearch:repositories base-package="org.springframework.data.elasticsearch.repositories.nondocument"/>
 
 </beans>

src/test/resources/simple-repository-test.xml

@@ -14,7 +14,6 @@
 
 
     <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories"/>
-
+            base-package="org.springframework.data.elasticsearch.repositories.sample"/>
 
 </beans>