Merge pull request #1579 from slievrly/master

All override methods must be added @OverRide

Author: kazuki43zoo

src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java

@@ -585,19 +585,23 @@ public static Connection unwrapConnection(Connection conn) {
     return conn;
   }
 
+  @Override
   protected void finalize() throws Throwable {
     forceCloseAll();
     super.finalize();
   }
 
+  @Override
   public <T> T unwrap(Class<T> iface) throws SQLException {
     throw new SQLException(getClass().getName() + " is not a wrapper.");
   }
 
+  @Override
   public boolean isWrapperFor(Class<?> iface) {
     return false;
   }
 
+  @Override
   public Logger getParentLogger() {
     return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
   }

src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java

@@ -292,7 +292,7 @@ public boolean jdbcCompliant() {
       return this.driver.jdbcCompliant();
     }
 
-    // @Override only valid jdk7+
+    @Override
     public Logger getParentLogger() {
       return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
     }
@@ -308,7 +308,7 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
     return false;
   }
 
-  // @Override only valid jdk7+
+  @Override
   public Logger getParentLogger() {
     // requires JDK version 1.6
     return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -923,6 +923,7 @@ public StrictMap<V> conflictMessageProducer(BiFunction<V, V, String> conflictMes
       return this;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public V put(String key, V value) {
       if (containsKey(key)) {
@@ -940,6 +941,7 @@ public V put(String key, V value) {
       return super.put(key, value);
     }
 
+    @Override
     public V get(Object key) {
       V value = super.get(key);
       if (value == null) {

src/test/java/org/apache/ibatis/autoconstructor/ExtensiveSubject.java

@@ -64,4 +64,4 @@ public ExtensiveSubject(final byte aByte,
     public enum TestEnum {
         AVALUE, BVALUE, CVALUE;
     }
-}
+}