DATACMNS-299 - Default scope of CDI repository beans to application scope.

Polished JavaDoc along the way.

Author: odrotbohm

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 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.
@@ -22,6 +22,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.Alternative;
 import javax.enterprise.inject.Stereotype;
@@ -52,6 +53,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T> {
 	 * 
 	 * @param qualifiers must not be {@literal null}.
 	 * @param repositoryType has to be an interface must not be {@literal null}.
+	 * @param beanManager the CDI {@link BeanManager}, must not be {@literal null}.
 	 */
 	public CdiRepositoryBean(Set<Annotation> qualifiers, Class<T> repositoryType, BeanManager beanManager) {
 
@@ -85,11 +87,11 @@ public Set<Type> getTypes() {
 	}
 
 	/**
-	 * Returns an instance of an {@link EntityManager}.
+	 * Returns an instance of an the given {@link Bean}.
 	 * 
-	 * @param beanManager The BeanManager.
-	 * @param bean The bean representing an EntityManager.
-	 * @return The EntityManager instance.
+	 * @param bean the {@link Bean} about to create an instance for.
+	 * @param type the expected type of the componentn instance created for that {@link Bean}.
+	 * @return the actual component instance.
 	 */
 	@SuppressWarnings("unchecked")
 	protected <S> S getDependencyInstance(Bean<S> bean, Class<S> type) {
@@ -106,6 +108,7 @@ public final T create(CreationalContext<T> creationalContext) {
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("Creating bean instance for repository type '%s'.", repositoryType.getName()));
 		}
+
 		return create(creationalContext, repositoryType);
 	}
 
@@ -189,9 +192,19 @@ public Set<InjectionPoint> getInjectionPoints() {
 		return Collections.emptySet();
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see javax.enterprise.inject.spi.Bean#getScope()
+	 */
+	public Class<? extends Annotation> getScope() {
+		return ApplicationScoped.class;
+	}
+
 	/**
-	 * @param creationalContext
-	 * @param repositoryType
+	 * Creates the actual component instance.
+	 * 
+	 * @param creationalContext will never be {@literal null}.
+	 * @param repositoryType will never be {@literal null}.
 	 * @return
 	 */
 	protected abstract T create(CreationalContext<T> creationalContext, Class<T> repositoryType);

src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2013 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.
@@ -25,7 +25,9 @@
 import java.util.Collections;
 import java.util.Set;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
 import org.junit.Test;
@@ -96,16 +98,24 @@ public void detectsStereotypes() {
 		assertThat(stereotypes, hasItem(StereotypeAnnotation.class));
 	}
 
+	/**
+	 * @see DATACMNS-299
+	 */
+	@Test
+	@SuppressWarnings("rawtypes")
+	public void scopeDefaultsToApplicationScoped() {
+
+		Bean<SampleRepository> bean = new DummyCdiRepositoryBean<SampleRepository>(NO_ANNOTATIONS, SampleRepository.class,
+				beanManager);
+		assertThat(bean.getScope(), equalTo((Class) ApplicationScoped.class));
+	}
+
 	static class DummyCdiRepositoryBean<T> extends CdiRepositoryBean<T> {
 
 		public DummyCdiRepositoryBean(Set<Annotation> qualifiers, Class<T> repositoryType, BeanManager beanManager) {
 			super(qualifiers, repositoryType, beanManager);
 		}
 
-		public Class<? extends Annotation> getScope() {
-			return null;
-		}
-
 		@Override
 		protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
 			return null;