Allow overloading for methods annotated with org.seasar.doma.Sql (#724)

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/AbstractSqlFileRepository.java

@@ -1,6 +1,7 @@
 package org.seasar.doma.jdbc;
 
 import java.lang.reflect.Method;
+import java.util.Objects;
 import org.seasar.doma.DomaIllegalArgumentException;
 import org.seasar.doma.DomaNullPointerException;
 import org.seasar.doma.Sql;
@@ -117,4 +118,29 @@ protected String getSql(String path) {
       throw new JdbcException(Message.DOMA2010, cause, path, cause);
     }
   }
+
+  protected static final class CacheKey {
+    private final Method method;
+    private final String path;
+
+    public CacheKey(Method method, String path) {
+      Objects.requireNonNull(method);
+      Objects.requireNonNull(path);
+      this.method = method.isAnnotationPresent(Sql.class) ? method : null;
+      this.path = path;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      CacheKey cacheKey = (CacheKey) o;
+      return Objects.equals(method, cacheKey.method) && path.equals(cacheKey.path);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(method, path);
+    }
+  }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/GreedyCacheSqlFileRepository.java

@@ -8,16 +8,17 @@
 /** An SQL file repository that caches the results of SQL parsing without limit. */
 public class GreedyCacheSqlFileRepository extends AbstractSqlFileRepository {
 
-  protected final ConcurrentMap<String, SqlFile> sqlFileMap = new ConcurrentHashMap<>(200);
+  protected final ConcurrentMap<CacheKey, SqlFile> sqlFileMap = new ConcurrentHashMap<>(200);
 
   @Override
   protected SqlFile getSqlFileWithCacheControl(Method method, String path, Dialect dialect) {
-    SqlFile file = sqlFileMap.get(path);
+    CacheKey key = new CacheKey(method, path);
+    SqlFile file = sqlFileMap.get(key);
     if (file != null) {
       return file;
     }
     file = createSqlFile(method, path, dialect);
-    SqlFile current = sqlFileMap.putIfAbsent(path, file);
+    SqlFile current = sqlFileMap.putIfAbsent(key, file);
     return current != null ? current : file;
   }