Merge pull request #188 from domaframework/type-parameter-for-dao

nakamura-to · web-flow · commit 149bcc69d6fd · 2017-01-14T20:04:54.000+09:00
Dao インタフェースがデフォルトメソッドのみが定義されたインタフェースを継承可能に変更
diff --git a/src/main/java/org/seasar/doma/internal/apt/meta/DaoMetaFactory.java b/src/main/java/org/seasar/doma/internal/apt/meta/DaoMetaFactory.java
@@ -15,6 +15,7 @@
  */
 package org.seasar.doma.internal.apt.meta;
 
+import static java.util.stream.Collectors.toList;
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.io.File;
@@ -209,35 +210,61 @@ protected void doAnnotateWith(DaoMeta daoMeta) {
     }
 
     protected void doParentDao(DaoMeta daoMeta) {
-        List<? extends TypeMirror> interfaces = daoMeta.getDaoElement()
-                .getInterfaces();
-        int size = interfaces.size();
-        if (size == 0) {
-            return;
-        }
-        if (size > 1) {
-            throw new AptException(Message.DOMA4187, env,
-                    daoMeta.getDaoElement(), new Object[] { daoMeta
-                            .getDaoElement().getQualifiedName() });
+        List<TypeElement> interfaces = daoMeta.getDaoElement()
+                .getInterfaces()
+                .stream().map(type -> TypeMirrorUtil.toTypeElement(type, env))
+                .peek(element -> {
+                    if (element == null) {
+                        throw new AptIllegalStateException(
+                                "failed to convert to TypeElement.");
+                    }
+                }).collect(toList());
+        for (TypeElement typeElement : interfaces) {
+            DaoMirror daoMirror = DaoMirror.newInstance(typeElement, env);
+            if (daoMirror == null) {
+                ExecutableElement nonDefaultMethod = findNonDefaultMethod(
+                        typeElement);
+                if (nonDefaultMethod == null) {
+                    continue;
+                }
+                throw new AptException(Message.DOMA4440, env,
+                        daoMeta.getDaoElement(),
+                        new Object[] { nonDefaultMethod.getSimpleName(),
+                                daoMeta.getDaoElement().getQualifiedName() });
+            }
+            if (daoMeta.getParentDaoMeta() != null) {
+                throw new AptException(Message.DOMA4188, env,
+                        daoMeta.getDaoElement(),
+                        new Object[] {
+                                daoMeta.getDaoElement().getQualifiedName() });
+            }
+            ParentDaoMeta parentDaoMeta = new ParentDaoMeta(daoMirror);
+            parentDaoMeta.setDaoType(typeElement.asType());
+            parentDaoMeta.setDaoElement(typeElement);
+            daoMeta.setParentDaoMeta(parentDaoMeta);
         }
-        TypeMirror parentMirror = interfaces.get(0);
-        TypeElement parentElement = TypeMirrorUtil.toTypeElement(parentMirror,
-                env);
-        if (parentElement == null) {
-            throw new AptIllegalStateException(
-                    "failed to convert to TypeElement.");
+    }
+
+    protected ExecutableElement findNonDefaultMethod(
+            TypeElement interfaceElement) {
+        Optional<ExecutableElement> method = ElementFilter
+                .methodsIn(interfaceElement.getEnclosedElements()).stream()
+                .filter(m -> !m.isDefault()).findAny();
+        if (method.isPresent()) {
+            return method.get();
         }
-        DaoMirror daoMirror = DaoMirror.newInstance(parentElement, env);
-        if (daoMirror == null) {
-            throw new AptException(Message.DOMA4188, env,
-                    daoMeta.getDaoElement(), new Object[] {
-                            parentElement.getQualifiedName(),
-                            daoMeta.getDaoElement().getQualifiedName() });
+        for (TypeMirror typeMirror : interfaceElement.getInterfaces()) {
+            TypeElement i = TypeMirrorUtil.toTypeElement(typeMirror, env);
+            if (i == null) {
+                throw new AptIllegalStateException(
+                        "failed to convert to TypeElement.");
+            }
+            ExecutableElement m = findNonDefaultMethod(i);
+            if (m != null) {
+                return m;
+            }
         }
-        ParentDaoMeta parentDaoMeta = new ParentDaoMeta(daoMirror);
-        parentDaoMeta.setDaoType(parentMirror);
-        parentDaoMeta.setDaoElement(parentElement);
-        daoMeta.setParentDaoMeta(parentDaoMeta);
+        return null;
     }
 
     protected void doMethodElements(TypeElement interfaceElement,
diff --git a/src/main/java/org/seasar/doma/message/Message.java b/src/main/java/org/seasar/doma/message/Message.java
@@ -338,8 +338,7 @@ public enum Message implements MessageResource {
     DOMA4184("列挙型に@Domainを注釈する場合、factoryMethod属性に\"new\"は指定できません（\"new\"はコンストラクタで生成することを示します）。staticで非privateなファクトリメソッドの名前を指定してください。 at {0}"),
     DOMA4185(" ... /** SQLが長すぎるため最初の{0}文字のみを表示しています。 */"),
     DOMA4186("java.util.Listに対する実型引数の型[{0}]はサポートされていません。サポートされている型は次のものです。基本型、ドメインクラス、エンティティクラス、java.util.Map<String, Object>。 at {1}.{2}"),
-    DOMA4187("@Daoが注釈されたインタフェースは2つ以上のインタフェースをextendsできません。 at {0}"),
-    DOMA4188("@Daoが注釈されたインタフェースは@Daoが注釈されてないインタフェース[{0}]をextendsできません。 at {1}"),
+    DOMA4188("継承先に指定できる「@Daoが注釈されたインタフェース」は1つのみです。@Daoが注釈されておらず全てのメソッドがデフォルトメソッドであるインタフェースは複数指定できます。 at {0}"),
     DOMA4189("式[{0}]（[{1}]番目の文字付近）の関数[{2}]の解決に失敗しました。注釈処理のオプションdoma.expr.functionsに指定されたクラス[{3}]が見つかりません。"),
     DOMA4190("式[{0}]（[{1}]番目の文字付近）の関数[{2}]の解決に失敗しました。注釈処理のオプションdoma.expr.functionsに指定されたクラス[{3}]はorg.seasar.doma.expr.ExpressionFunctionsのサブタイプでなければいけません。"),
     DOMA4191("@ExternalDomainはorg.seasar.doma.jdbc.domain.DomainConverterのサブタイプにのみ注釈できます。 at {0}"),
@@ -478,6 +477,7 @@ public enum Message implements MessageResource {
     DOMA4437("BiFunctionの1番目の実型引数の型は、org.seasar.doma.jdbc.Configでなければいけません。 at {0}.{1}"),
     DOMA4438("パラメータの型[{0}]を原型にしてはいけません。 at {1}.{2}"),
     DOMA4439("パラメータの型[{0}]にワイルカード型の型パラメータを含めてはいけません。 at {1}.{2}"),
+    DOMA4440("継承先のメソッド[{0}]がデフォルトメソッドではありません。@Daoが注釈されていないインタフェースをextendsする場合、そのインタフェースの継承先を含む全てのメソッドはデフォルトメソッドでなければいけません。 at {1}"),
 
     // other
     DOMA5001("JDBCドライバがロードされていない可能性があります。まず、JDBCドライバがクラスパスにあることを確認してください。次に、JDBCドライバが自動でロードされない場合は、Class.forNameで明示的にロードしてください。 ex) Class.forName(\"oracle.jdbc.driver.OracleDriver\")"),
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/DaoProcessorTest.java b/src/test/java/org/seasar/doma/internal/apt/dao/DaoProcessorTest.java
@@ -307,8 +307,8 @@ public void testNonDaoExtends() throws Exception {
         addProcessor(processor);
         addCompilationUnit(target);
         compile();
-        assertFalse(getCompiledResult());
-        assertMessage(Message.DOMA4188);
+        assertGeneratedSource(target);
+        assertTrue(getCompiledResult());
     }
 
     public void testIncludeAndExclude() throws Exception {
@@ -1078,4 +1078,34 @@ public void testSqlProcessorWildcardType() throws Exception {
         assertMessage(Message.DOMA4439);
     }
 
+    public void testOnlyDefaultMethodsExtends() throws Exception {
+        Class<?> target = OnlyDefaultMethodsExtendsDao.class;
+        DaoProcessor processor = new DaoProcessor();
+        addProcessor(processor);
+        addCompilationUnit(target);
+        compile();
+        assertGeneratedSource(target);
+        assertTrue(getCompiledResult());
+    }
+
+    public void testNotOnlyDefaultMethodsExtends() throws Exception {
+        Class<?> target = NotOnlyDefaultMethodsExtendsDao.class;
+        DaoProcessor processor = new DaoProcessor();
+        addProcessor(processor);
+        addCompilationUnit(target);
+        compile();
+        assertFalse(getCompiledResult());
+        assertMessage(Message.DOMA4440);
+    }
+
+    public void testMultiDaoExtends() throws Exception {
+        Class<?> target = MultiDaoExtendsDao.class;
+        DaoProcessor processor = new DaoProcessor();
+        addProcessor(processor);
+        addCompilationUnit(target);
+        compile();
+        assertFalse(getCompiledResult());
+        assertMessage(Message.DOMA4188);
+    }
+
 }
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/MultiDaoExtendsDao.java b/src/test/java/org/seasar/doma/internal/apt/dao/MultiDaoExtendsDao.java
@@ -0,0 +1,27 @@
+/*
+ * 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.apt.dao;
+
+import org.seasar.doma.Dao;
+
+/**
+ * @author nakamura
+ *
+ */
+@Dao(config = MyConfig.class)
+public interface MultiDaoExtendsDao extends MyDao, MyDao2 {
+
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/MyDao.java b/src/test/java/org/seasar/doma/internal/apt/dao/MyDao.java
@@ -0,0 +1,27 @@
+/*
+ * 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.apt.dao;
+
+import org.seasar.doma.Dao;
+
+/**
+ * @author nakamura
+ *
+ */
+@Dao(config = MyConfig.class)
+public interface MyDao {
+
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/MyDao2.java b/src/test/java/org/seasar/doma/internal/apt/dao/MyDao2.java
@@ -0,0 +1,27 @@
+/*
+ * 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.apt.dao;
+
+import org.seasar.doma.Dao;
+
+/**
+ * @author nakamura
+ *
+ */
+@Dao(config = MyConfig.class)
+public interface MyDao2 {
+
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/NotOnlyDefaultMethodsChild.java b/src/test/java/org/seasar/doma/internal/apt/dao/NotOnlyDefaultMethodsChild.java
@@ -0,0 +1,32 @@
+/*
+ * 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.apt.dao;
+
+/**
+ * @author nakamura
+ *
+ */
+public interface NotOnlyDefaultMethodsChild<T>
+        extends NotOnlyDefaultMethodsParent {
+
+    default void bbb() {
+    }
+
+    default T ccc(T value) {
+        return value;
+    }
+
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/NotOnlyDefaultMethodsExtendsDao.java b/src/test/java/org/seasar/doma/internal/apt/dao/NotOnlyDefaultMethodsExtendsDao.java
@@ -0,0 +1,28 @@
+/*
+ * 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.apt.dao;
+
+import org.seasar.doma.Dao;
+
+/**
+ * @author nakamura
+ *
+ */
+@Dao(config = MyConfig.class)
+public interface NotOnlyDefaultMethodsExtendsDao
+        extends NotOnlyDefaultMethodsChild<String> {
+
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/NotOnlyDefaultMethodsParent.java b/src/test/java/org/seasar/doma/internal/apt/dao/NotOnlyDefaultMethodsParent.java
@@ -0,0 +1,25 @@
+/*
+ * 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.apt.dao;
+
+/**
+ * @author nakamura
+ *
+ */
+public interface NotOnlyDefaultMethodsParent {
+
+    void aaa();
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/OnlyDefaultMethods.java b/src/test/java/org/seasar/doma/internal/apt/dao/OnlyDefaultMethods.java
@@ -0,0 +1,30 @@
+/*
+ * 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.apt.dao;
+
+/**
+ * @author nakamura
+ *
+ */
+public interface OnlyDefaultMethods<T> {
+
+    default void aaa() {
+    }
+
+    default T bbb(T value) {
+        return value;
+    }
+}
diff --git a/src/test/java/org/seasar/doma/internal/apt/dao/OnlyDefaultMethodsExtendsDao.java b/src/test/java/org/seasar/doma/internal/apt/dao/OnlyDefaultMethodsExtendsDao.java
@@ -0,0 +1,28 @@
+/*
+ * 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.apt.dao;
+
+import org.seasar.doma.Dao;
+
+/**
+ * @author nakamura
+ *
+ */
+@Dao(config = MyConfig.class)
+public interface OnlyDefaultMethodsExtendsDao
+        extends OnlyDefaultMethods<String> {
+
+}
diff --git a/src/test/resources/org/seasar/doma/internal/apt/dao/DaoProcessorTest_NonDaoExtends.txt b/src/test/resources/org/seasar/doma/internal/apt/dao/DaoProcessorTest_NonDaoExtends.txt
diff --git a/src/test/resources/org/seasar/doma/internal/apt/dao/DaoProcessorTest_OnlyDefaultMethodsExtends.txt b/src/test/resources/org/seasar/doma/internal/apt/dao/DaoProcessorTest_OnlyDefaultMethodsExtends.txt
