DATAES-113 Add support for custom implementations in CDI repositories

Author: mp911de

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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.
@@ -31,24 +31,35 @@
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
 
 	private final Bean<ElasticsearchOperations> elasticsearchOperationsBean;
 
+	/**
+	 * Creates a new {@link ElasticsearchRepositoryBean}.
+	 *
+	 * @param operations must not be {@literal null}.
+	 * @param qualifiers must not be {@literal null}.
+	 * @param repositoryType must not be {@literal null}.
+	 * @param beanManager must not be {@literal null}.
+	 * @param customImplementationBean the bean for the custom implementation of the
+	 *          {@link org.springframework.data.repository.Repository}, can be {@literal null}.
+	 */
 	public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
-									   Class<T> repositoryType, BeanManager beanManager) {
-		super(qualifiers, repositoryType, beanManager);
+									   Class<T> repositoryType, BeanManager beanManager, Bean<?> customImplementationBean) {
+		super(qualifiers, repositoryType, beanManager, customImplementationBean);
 
 		Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations.");
 		this.elasticsearchOperationsBean = operations;
 	}
 
 	@Override
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
+	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType, Object customImplementation) {
 		ElasticsearchOperations elasticsearchOperations = getDependencyInstance(elasticsearchOperationsBean,
 				ElasticsearchOperations.class);
-		return new ElasticsearchRepositoryFactory(elasticsearchOperations).getRepository(repositoryType);
+		return new ElasticsearchRepositoryFactory(elasticsearchOperations).getRepository(repositoryType, customImplementation);
 	}
 
 	@Override

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java

@@ -38,6 +38,7 @@
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
 
@@ -74,7 +75,8 @@ private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, S
 			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
 					ElasticsearchOperations.class.getName(), qualifiers));
 		}
+		Bean<?> customImplementationBean = getCustomImplementationBean(repositoryType, beanManager, qualifiers);
 
-		return new ElasticsearchRepositoryBean<T>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager);
+		return new ElasticsearchRepositoryBean<T>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager, customImplementationBean);
 	}
 }

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/CdiRepositoryClient.java

@@ -24,6 +24,8 @@
 class CdiRepositoryClient {
 
 	private CdiProductRepository repository;
+	private  SamplePersonRepository samplePersonRepository;
+
 
 	public CdiProductRepository getRepository() {
 		return repository;
@@ -33,4 +35,13 @@ public CdiProductRepository getRepository() {
 	public void setRepository(CdiProductRepository repository) {
 		this.repository = repository;
 	}
+
+	public SamplePersonRepository getSamplePersonRepository() {
+		return samplePersonRepository;
+	}
+
+	@Inject
+	public void setSamplePersonRepository(SamplePersonRepository samplePersonRepository) {
+		this.samplePersonRepository = samplePersonRepository;
+	}
 }

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/CdiRepositoryTests.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.repositories.cdi;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
 import org.apache.webbeans.cditest.CdiTestContainer;
@@ -33,6 +34,7 @@ public class CdiRepositoryTests {
 
 	private static CdiTestContainer cdiContainer;
 	private CdiProductRepository repository;
+	private SamplePersonRepository personRepository;
 
 	@BeforeClass
 	public static void init() throws Exception {
@@ -51,6 +53,7 @@ public static void shutdown() throws Exception {
 	public void setUp() {
 		CdiRepositoryClient client = cdiContainer.getInstance(CdiRepositoryClient.class);
 		repository = client.getRepository();
+		personRepository = client.getSamplePersonRepository();
 	}
 
 	@Test
@@ -80,4 +83,13 @@ public void testCdiRepository() {
 		retrieved = repository.findOne(bean.getId());
 		assertNull(retrieved);
 	}
+
+	/**
+	 * @see DATAES-113
+	 */
+	@Test
+	public void returnOneFromCustomImpl() {
+
+		assertThat(personRepository.returnOne(), is(1));
+	}
 }

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepository.java

@@ -0,0 +1,27 @@
+/*
+ * 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.repositories.cdi;
+
+import org.springframework.data.elasticsearch.entities.Person;
+import org.springframework.data.repository.Repository;
+
+/**
+ * @author Mark Paluch
+ * @see DATAES-113
+ */
+public interface SamplePersonRepository extends Repository<Person, Long>, SamplePersonRepositoryCustom {
+
+}

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepositoryCustom.java

@@ -0,0 +1,26 @@
+/*
+ * 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.repositories.cdi;
+
+/**
+ * @see DATAES-113
+ * @author Mark Paluch
+ */
+interface SamplePersonRepositoryCustom {
+
+	int returnOne();
+}

src/test/java/org/springframework/data/elasticsearch/repositories/cdi/SamplePersonRepositoryImpl.java

@@ -0,0 +1,29 @@
+/*
+ * 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.repositories.cdi;
+
+/**
+ * @see DATAES-113
+ * @author Mark Paluch
+ */
+class SamplePersonRepositoryImpl implements SamplePersonRepositoryCustom {
+
+	@Override
+	public int returnOne() {
+		return 1;
+	}
+}