Config.getEntityListenerの戻り値に対してnullチェックを追加しました

Author: backpaper0

src/main/java/org/seasar/doma/internal/RuntimeConfig.java

@@ -25,6 +25,7 @@
 import org.seasar.doma.jdbc.CommandImplementors;
 import org.seasar.doma.jdbc.Commenter;
 import org.seasar.doma.jdbc.Config;
+import org.seasar.doma.jdbc.ConfigException;
 import org.seasar.doma.jdbc.JdbcLogger;
 import org.seasar.doma.jdbc.MapKeyNaming;
 import org.seasar.doma.jdbc.QueryImplementors;
@@ -150,7 +151,13 @@ public int getBatchSize() {
     @Override
     public <ENTITY, LISTENER extends EntityListener<ENTITY>> LISTENER getEntityListener(
             Class<LISTENER> listenerClass, Supplier<LISTENER> listenerSupplier) {
-        return config.getEntityListener(listenerClass, listenerSupplier);
+        LISTENER listener = config.getEntityListener(listenerClass,
+                listenerSupplier);
+        if (listener == null) {
+            throw new ConfigException(config.getClass().getName(),
+                    "getEntityListener");
+        }
+        return listener;
     }
 
 }

src/test/java/org/seasar/doma/internal/RuntimeConfigTest.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2004-2010 the Seasar Foundation and the Others.
+ *
+ * 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.seasar.doma.internal;
+
+import java.util.function.Supplier;
+
+import javax.sql.DataSource;
+
+import junit.framework.TestCase;
+
+import org.seasar.doma.jdbc.Config;
+import org.seasar.doma.jdbc.ConfigException;
+import org.seasar.doma.jdbc.SimpleDataSource;
+import org.seasar.doma.jdbc.dialect.Dialect;
+import org.seasar.doma.jdbc.dialect.StandardDialect;
+import org.seasar.doma.jdbc.entity.EntityListener;
+
+/**
+ * @author backpaper0
+ *
+ */
+public class RuntimeConfigTest extends TestCase {
+
+    public void testGetEntityListener() throws Exception {
+        Config originalConfig = new MockConfig() {
+
+            @Override
+            public <ENTITY, LISTENER extends EntityListener<ENTITY>> LISTENER getEntityListener(
+                    Class<LISTENER> listenerClass,
+                    Supplier<LISTENER> listenerSupplier) {
+                return listenerSupplier.get();
+            }
+        };
+
+        RuntimeConfig runtimeConfig = new RuntimeConfig(originalConfig);
+
+        MockEntityListener entityListener = runtimeConfig.getEntityListener(
+                MockEntityListener.class, MockEntityListener::new);
+        assertNotNull(entityListener);
+    }
+
+    public void testGetEntityListenerNullCheck() throws Exception {
+        Config originalConfig = new MockConfig() {
+
+            @Override
+            public <ENTITY, LISTENER extends EntityListener<ENTITY>> LISTENER getEntityListener(
+                    Class<LISTENER> listenerClass,
+                    Supplier<LISTENER> listenerSupplier) {
+                return null;
+            }
+        };
+
+        RuntimeConfig runtimeConfig = new RuntimeConfig(originalConfig);
+
+        try {
+            runtimeConfig.getEntityListener(MockEntityListener.class,
+                    MockEntityListener::new);
+            fail();
+        } catch (ConfigException e) {
+            assertEquals(originalConfig.getClass().getName(), e.getClassName());
+            assertEquals("getEntityListener", e.getMethodName());
+        }
+    }
+
+    private interface MockConfig extends Config {
+
+        @Override
+        default Dialect getDialect() {
+            return new StandardDialect();
+        }
+
+        @Override
+        default DataSource getDataSource() {
+            return new SimpleDataSource();
+        }
+    }
+
+    private static class MockEntityListener implements EntityListener<Object> {
+    }
+}