Merge pull request #1248 from kazuki43zoo/support-default-method

kazuki43zoo · web-flow · commit 673fc6c80673 · 2019-07-03T09:32:03.000+09:00
Support default method
diff --git a/src/main/java/org/apache/ibatis/cache/Cache.java b/src/main/java/org/apache/ibatis/cache/Cache.java
@@ -93,6 +93,8 @@ public interface Cache {
    *
    * @return A ReadWriteLock
    */
-  ReadWriteLock getReadWriteLock();
+  default ReadWriteLock getReadWriteLock() {
+    return null;
+  }
 
 }
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/BlockingCache.java b/src/main/java/org/apache/ibatis/cache/decorators/BlockingCache.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.ibatis.cache.Cache;
@@ -86,11 +85,6 @@ public void clear() {
     delegate.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   private ReentrantLock getLockForKey(Object key) {
     return locks.computeIfAbsent(key, k -> new ReentrantLock());
   }
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java b/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java
@@ -17,7 +17,6 @@
 
 import java.util.Deque;
 import java.util.LinkedList;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 
@@ -74,11 +73,6 @@ public void clear() {
     keyList.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   private void cycleKeyList(Object key) {
     keyList.addLast(key);
     if (keyList.size() > size) {
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java b/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.apache.ibatis.cache.decorators;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
@@ -74,11 +72,6 @@ public void clear() {
     delegate.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   @Override
   public int hashCode() {
     return delegate.hashCode();
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
@@ -17,7 +17,6 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 
@@ -85,11 +84,6 @@ public void clear() {
     keyMap.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   private void cycleKeyList(Object key) {
     keyMap.put(key, key);
     if (eldestKey != null) {
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/ScheduledCache.java b/src/main/java/org/apache/ibatis/cache/decorators/ScheduledCache.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.apache.ibatis.cache.decorators;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import org.apache.ibatis.cache.Cache;
 
 /**
@@ -72,11 +70,6 @@ public void clear() {
     delegate.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   @Override
   public int hashCode() {
     return delegate.hashCode();
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java b/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java
@@ -23,7 +23,6 @@
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
 import java.io.Serializable;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.cache.CacheException;
@@ -75,11 +74,6 @@ public void clear() {
     delegate.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   @Override
   public int hashCode() {
     return delegate.hashCode();
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java b/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java
@@ -19,7 +19,6 @@
 import java.lang.ref.SoftReference;
 import java.util.Deque;
 import java.util.LinkedList;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 
@@ -101,11 +100,6 @@ public void clear() {
     delegate.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   private void removeGarbageCollectedItems() {
     SoftEntry sv;
     while ((sv = (SoftEntry) queueOfGarbageCollectedEntries.poll()) != null) {
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java b/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java
@@ -15,8 +15,6 @@
  */
 package org.apache.ibatis.cache.decorators;
 
-import java.util.concurrent.locks.ReadWriteLock;
-
 import org.apache.ibatis.cache.Cache;
 
 /**
@@ -70,9 +68,4 @@ public boolean equals(Object obj) {
     return delegate.equals(obj);
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
 }
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java b/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java
@@ -19,7 +19,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.logging.Log;
@@ -77,11 +76,6 @@ public Object getObject(Object key) {
     }
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   @Override
   public void putObject(Object key, Object object) {
     entriesToAddOnCommit.put(key, object);
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java b/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java
@@ -19,7 +19,6 @@
 import java.lang.ref.WeakReference;
 import java.util.Deque;
 import java.util.LinkedList;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 
@@ -95,11 +94,6 @@ public void clear() {
     delegate.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   private void removeGarbageCollectedItems() {
     WeakEntry sv;
     while ((sv = (WeakEntry) queueOfGarbageCollectedEntries.poll()) != null) {
diff --git a/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java b/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.locks.ReadWriteLock;
 
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.cache.CacheException;
@@ -65,11 +64,6 @@ public void clear() {
     cache.clear();
   }
 
-  @Override
-  public ReadWriteLock getReadWriteLock() {
-    return null;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (getId() == null) {
diff --git a/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
@@ -26,7 +26,9 @@
  */
 public interface ProxyFactory {
 
-  void setProperties(Properties properties);
+  default void setProperties(Properties properties) {
+    // NOP
+  }
 
   Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs);
 
diff --git a/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 
 import net.sf.cglib.proxy.Callback;
@@ -65,11 +64,6 @@ public Object createDeserializationProxy(Object target, Map<String, ResultLoader
     return EnhancedDeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
   }
 
-  @Override
-  public void setProperties(Properties properties) {
-      // Not Implemented
-  }
-
   static Object crateProxy(Class<?> type, Callback callback, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     Enhancer enhancer = new Enhancer();
     enhancer.setCallback(callback);
diff --git a/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 
 import javassist.util.proxy.MethodHandler;
@@ -64,11 +63,6 @@ public Object createDeserializationProxy(Object target, Map<String, ResultLoader
     return EnhancedDeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
   }
 
-  @Override
-  public void setProperties(Properties properties) {
-      // Not Implemented
-  }
-
   static Object crateProxy(Class<?> type, MethodHandler callback, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
 
     ProxyFactory enhancer = new ProxyFactory();
diff --git a/src/main/java/org/apache/ibatis/mapping/DatabaseIdProvider.java b/src/main/java/org/apache/ibatis/mapping/DatabaseIdProvider.java
@@ -29,7 +29,9 @@
  */
 public interface DatabaseIdProvider {
 
-  void setProperties(Properties p);
+  default void setProperties(Properties p) {
+    // NOP
+  }
 
   String getDatabaseId(DataSource dataSource) throws SQLException;
 }
diff --git a/src/main/java/org/apache/ibatis/plugin/Interceptor.java b/src/main/java/org/apache/ibatis/plugin/Interceptor.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -24,8 +24,12 @@ public interface Interceptor {
 
   Object intercept(Invocation invocation) throws Throwable;
 
-  Object plugin(Object target);
+  default Object plugin(Object target) {
+    return Plugin.wrap(target, this);
+  }
 
-  void setProperties(Properties properties);
+  default void setProperties(Properties properties) {
+    // NOP
+  }
 
 }
diff --git a/src/main/java/org/apache/ibatis/reflection/factory/DefaultObjectFactory.java b/src/main/java/org/apache/ibatis/reflection/factory/DefaultObjectFactory.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -54,11 +53,6 @@ public <T> T create(Class<T> type, List<Class<?>> constructorArgTypes, List<Obje
     return (T) instantiateClass(classToCreate, constructorArgTypes, constructorArgs);
   }
 
-  @Override
-  public void setProperties(Properties properties) {
-    // no props for default
-  }
-
   private  <T> T instantiateClass(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     try {
       Constructor<T> constructor;
diff --git a/src/main/java/org/apache/ibatis/reflection/factory/ObjectFactory.java b/src/main/java/org/apache/ibatis/reflection/factory/ObjectFactory.java
@@ -29,7 +29,9 @@ public interface ObjectFactory {
    * Sets configuration properties.
    * @param properties configuration properties
    */
-  void setProperties(Properties properties);
+  default void setProperties(Properties properties) {
+    // NOP
+  }
 
   /**
    * Creates a new object with default constructor.
diff --git a/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java b/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java
@@ -33,7 +33,9 @@ public interface TransactionFactory {
    * Sets transaction factory custom properties.
    * @param props
    */
-  void setProperties(Properties props);
+  default void setProperties(Properties props) {
+    // NOP
+  }
 
   /**
    * Creates a {@link Transaction} out of an existing connection.
diff --git a/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java b/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java
diff --git a/src/site/es/xdoc/configuration.xml b/src/site/es/xdoc/configuration.xml
diff --git a/src/site/ja/xdoc/configuration.xml b/src/site/ja/xdoc/configuration.xml
diff --git a/src/site/ko/xdoc/configuration.xml b/src/site/ko/xdoc/configuration.xml
diff --git a/src/site/xdoc/configuration.xml b/src/site/xdoc/configuration.xml
diff --git a/src/site/zh/xdoc/configuration.xml b/src/site/zh/xdoc/configuration.xml
diff --git a/src/test/java/org/apache/ibatis/plugin/PluginTest.java b/src/test/java/org/apache/ibatis/plugin/PluginTest.java
diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,8 @@ public interface Cache {`
`93`	`93`	`*`
`94`	`94`	`* @return A ReadWriteLock`
`95`	`95`	`*/`
`96`		`- ReadWriteLock getReadWriteLock();`
	`96`	`+ default ReadWriteLock getReadWriteLock() {`
	`97`	`+ return null;`
	`98`	`+ }`
`97`	`99`
`98`	`100`	`}`