Polish

domaframework · Jul 26, 2017 · dbdd045 · dbdd045
1 parent a913903
commit dbdd045
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 35 deletions.
diff --git a/...autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java b/...autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java
@@ -15,8 +15,6 @@
  */
 package org.seasar.doma.boot.autoconfigure;
 
-import java.util.function.Supplier;
-
 import javax.sql.DataSource;
 
 import org.seasar.doma.boot.event.AnnotatedDomaEventHandlerInvoker;
@@ -26,8 +24,6 @@
 import org.seasar.doma.jdbc.Naming;
 import org.seasar.doma.jdbc.SqlFileRepository;
 import org.seasar.doma.jdbc.dialect.Dialect;
-import org.seasar.doma.jdbc.entity.EntityListener;
-import org.seasar.doma.jdbc.entity.NullEntityListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -37,7 +33,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 
@@ -92,29 +87,9 @@ public DomaEventEntityListener domaEventEntityListener() {
 	}
 
 	@Bean
-	public TryLookupEntityListenerProvider tryLookupEntityListenerProvider() {
-		return new TryLookupEntityListenerProvider();
-	}
-
-	@Bean
-	@Primary
 	@ConditionalOnMissingBean
-	public <ENTITY> EntityListenerProvider entityListenerProvider(
-			DomaEventEntityListener<ENTITY> domaEventEntityListener,
-			TryLookupEntityListenerProvider tryLookupEntityListenerProvider) {
-		return new EntityListenerProvider() {
-
-			@SuppressWarnings("unchecked")
-			@Override
-			public <ENTITY, LISTENER extends EntityListener<ENTITY>> LISTENER get(
-					Class<LISTENER> listenerClass, Supplier<LISTENER> listenerSupplier) {
-				if (NullEntityListener.class.equals(listenerClass)) {
-					return tryLookupEntityListenerProvider.get(listenerClass,
-							listenerSupplier);
-				}
-				return (LISTENER) domaEventEntityListener;
-			}
-		};
+	public EntityListenerProvider tryLookupEntityListenerProvider() {
+		return new TryLookupEntityListenerProvider();
 	}
 
 	@Bean

diff --git a/...-boot-autoconfigure/src/main/java/org/seasar/doma/boot/event/DomaEventEntityListener.java b/...-boot-autoconfigure/src/main/java/org/seasar/doma/boot/event/DomaEventEntityListener.java
@@ -4,8 +4,19 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 
-public class DomaEventEntityListener<T> extends /* ugly hack */NullEntityListener<T>
-		implements ApplicationEventPublisherAware {
+/**
+ * {@link EntityListener} implementation that publishes {@link DomaEvent} and delegates
+ * actual processing on the event lister class which is annoteted with
+ * {@link org.seasar.doma.boot.event.annotation.DomaEventHandler}. <br>
+ * <br>
+ * This class extends {@link NullEntityListener} so that {@link org.seasar.doma.Entity} is
+ * available with default parameters.
+ *
+ * @param <T> Entity class
+ * @author Toshiaki Maki
+ */
+public class DomaEventEntityListener<T> extends NullEntityListener<T> implements
+		ApplicationEventPublisherAware {
 
 	private ApplicationEventPublisher eventPublisher;
 

diff --git a/...pring-boot-sample-entity-listener/src/main/java/org/seasar/doma/boot/MessageListener.java b/...pring-boot-sample-entity-listener/src/main/java/org/seasar/doma/boot/MessageListener.java
@@ -1,11 +1,11 @@
 package org.seasar.doma.boot;
 
+import java.time.LocalDate;
+
 import org.seasar.doma.jdbc.entity.EntityListener;
 import org.seasar.doma.jdbc.entity.PreInsertContext;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDate;
-
 @Component
 public class MessageListener implements EntityListener<Message> {
 	@Override

diff --git a/...les/doma-spring-boot-sample-event-handler/src/main/java/org/seasar/doma/boot/Message.java b/...les/doma-spring-boot-sample-event-handler/src/main/java/org/seasar/doma/boot/Message.java
@@ -15,10 +15,10 @@
  */
 package org.seasar.doma.boot;
 
-import org.seasar.doma.*;
-
 import java.time.LocalDate;
 
+import org.seasar.doma.*;
+
 @Entity
 @Table(name = "messages")
 public class Message {

diff --git a/...a-spring-boot-sample-event-handler/src/main/java/org/seasar/doma/boot/MessageHandler.java b/...a-spring-boot-sample-event-handler/src/main/java/org/seasar/doma/boot/MessageHandler.java
@@ -1,10 +1,10 @@
 package org.seasar.doma.boot;
 
+import java.time.LocalDate;
+
 import org.seasar.doma.boot.event.annotation.DomaEventHandler;
 import org.seasar.doma.boot.event.annotation.HandlePreInsert;
 
-import java.time.LocalDate;
-
 @DomaEventHandler
 public class MessageHandler {
 	@HandlePreInsert