Polish

Author: making

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java

@@ -28,7 +28,6 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
@@ -80,9 +79,8 @@ public Naming naming() {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public EntityListenerProvider entityListenerProvider(
-			ApplicationContext context) {
-		return new TryLookupEntityListenerProvider(context);
+	public EntityListenerProvider entityListenerProvider() {
+		return new TryLookupEntityListenerProvider();
 	}
 
     @Bean

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/TryLookupEntityListenerProvider.java

@@ -16,12 +16,13 @@
 package org.seasar.doma.boot.autoconfigure;
 
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.Supplier;
 
 import org.seasar.doma.jdbc.EntityListenerProvider;
 import org.seasar.doma.jdbc.entity.EntityListener;
+import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 /**
  * {@link EntityListenerProvider} implementation that
@@ -30,18 +31,24 @@
  * @author backpaper0
  *
  */
-public class TryLookupEntityListenerProvider implements EntityListenerProvider {
-
-	private final ApplicationContext context;
-
-	public TryLookupEntityListenerProvider(ApplicationContext context) {
-		this.context = Objects.requireNonNull(context);
-	}
+class TryLookupEntityListenerProvider implements EntityListenerProvider, ApplicationContextAware {
 
+	private ApplicationContext context;
+	
 	@Override
 	public <ENTITY, LISTENER extends EntityListener<ENTITY>> LISTENER get(
 			Class<LISTENER> listenerClass, Supplier<LISTENER> listenerSupplier) {
 		Map<String, LISTENER> beans = context.getBeansOfType(listenerClass);
+		if (beans.size() > 1) {
+			throw new IllegalStateException(
+					"Bean type of " + listenerClass + " bean must be unique!");
+		}
 		return beans.values().stream().findAny().orElseGet(listenerSupplier);
 	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext)
+			throws BeansException {
+		this.context = applicationContext;
+	}
 }

doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/TryLookupEntityListenerProviderTest.java

@@ -23,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 public class TryLookupEntityListenerProviderTest {
@@ -32,20 +33,28 @@ public void testManaged() throws Exception {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.register(FooListener.class);
 		context.refresh();
-		TryLookupEntityListenerProvider provider = new TryLookupEntityListenerProvider(
-				context);
+		TryLookupEntityListenerProvider provider = new TryLookupEntityListenerProvider();
+		provider.setApplicationContext(context);
 		FooListener listener = provider
 				.get(FooListener.class, FooListener::new);
 		assertThat(listener.managed, is(true));
 	}
 
+	@Test(expected = IllegalStateException.class)
+	public void testManaged_notUnique() throws Exception {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				FooConfig.class);
+		TryLookupEntityListenerProvider provider = new TryLookupEntityListenerProvider();
+		provider.setApplicationContext(context);
+		provider.get(FooListener.class, FooListener::new);
+	}
+
 	@Test
 	public void testNotManaged() throws Exception {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		//context.register(FooListener.class);
 		context.refresh();
-		TryLookupEntityListenerProvider provider = new TryLookupEntityListenerProvider(
-				context);
+		TryLookupEntityListenerProvider provider = new TryLookupEntityListenerProvider();
+		provider.setApplicationContext(context);
 		FooListener listener = provider
 				.get(FooListener.class, FooListener::new);
 		assertThat(listener.managed, is(false));
@@ -67,4 +76,16 @@ public FooListener(ApplicationContext context) {
 			managed = true;
 		}
 	}
+
+	public static class FooConfig {
+		@Bean
+		FooListener foo1() {
+			return new FooListener();
+		}
+
+		@Bean
+		FooListener foo2() {
+			return new FooListener();
+		}
+	}
 }