Merge pull request #489 from hazendaz/master

Added missing overrides and removed unused imports

Author: hazendaz

src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java

@@ -18,8 +18,6 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.Properties;
-import java.util.Set;
-
 import javax.sql.DataSource;
 
 import org.apache.ibatis.builder.BaseBuilder;

src/main/java/org/apache/ibatis/executor/BaseExecutor.java

@@ -26,7 +26,6 @@
 import org.apache.ibatis.cache.CacheKey;
 import org.apache.ibatis.cache.impl.PerpetualCache;
 import org.apache.ibatis.cursor.Cursor;
-import org.apache.ibatis.jdbc.SQL;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.logging.jdbc.ConnectionLogger;

src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java

@@ -16,7 +16,6 @@
 package org.apache.ibatis.executor.statement;
 
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;

src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java

@@ -22,14 +22,17 @@
 
 public class ExampleObjectFactory extends DefaultObjectFactory {
 
+  @Override
   public <T> T create(Class<T> type) {
     return super.<T>create(type);
   }
 
+  @Override
   public <T> T create(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     return super.<T>create(type, constructorArgTypes, constructorArgs);
   }
 
+  @Override
   public void setProperties(Properties properties) {
     super.setProperties(properties);
   }

src/test/java/org/apache/ibatis/builder/ExamplePlugin.java

@@ -25,14 +25,17 @@
 @Intercepts({})
 public class ExamplePlugin implements Interceptor {
 
+  @Override
   public Object intercept(Invocation invocation) throws Throwable {
     return invocation.proceed();
   }
 
+  @Override
   public Object plugin(Object target) {
     return Plugin.wrap(target, this);
   }
 
+  @Override
   public void setProperties(Properties properties) {
 
   }

src/test/java/org/apache/ibatis/builder/ExampleTypeHandler.java

@@ -25,18 +25,22 @@
 
 public class ExampleTypeHandler implements TypeHandler<String> {
 
+  @Override
   public void setParameter(PreparedStatement ps, int i, String parameter, JdbcType jdbcType) throws SQLException {
     ps.setString(i, parameter);
   }
 
+  @Override
   public String getResult(ResultSet rs, String columnName) throws SQLException {
     return rs.getString(columnName);
   }
 
+  @Override
   public String getResult(ResultSet rs, int columnIndex) throws SQLException {
     return rs.getString(columnIndex);
   }
 
+  @Override
   public String getResult(CallableStatement cs, int columnIndex) throws SQLException {
     return cs.getString(columnIndex);
   }

src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java

@@ -75,6 +75,7 @@ private void createJndiDataSource() throws Exception {
   }
 
   public static class MockContextFactory implements InitialContextFactory {
+    @Override
     public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
       return new MockContext(false);
     }
@@ -87,10 +88,12 @@ public MockContext(boolean lazy) throws NamingException {
       super(lazy);
     }
 
+    @Override
     public Object lookup(String name) throws NamingException {
       return bindings.get(name);
     }
 
+    @Override
     public void bind(String name, Object obj) throws NamingException {
       bindings.put(name, obj);
     }

src/test/java/org/apache/ibatis/domain/blog/Author.java

@@ -91,6 +91,7 @@ public Section getFavouriteSection() {
     return favouriteSection;
   }
 
+  @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof Author)) return false;
@@ -108,6 +109,7 @@ public boolean equals(Object o) {
     return true;
   }
 
+  @Override
   public int hashCode() {
     int result;
     result = id;
@@ -119,6 +121,7 @@ public int hashCode() {
     return result;
   }
 
+  @Override
   public String toString() {
     return "Author : " + id + " : " + username + " : " + email;
   }

src/test/java/org/apache/ibatis/domain/blog/Blog.java

@@ -67,6 +67,7 @@ public void setPosts(List<Post> posts) {
     this.posts = posts;
   }
 
+  @Override
   public String toString() {
     return "Blog: " + id + " : " + title + " (" + author + ")";
   }

src/test/java/org/apache/ibatis/domain/blog/Comment.java

@@ -54,6 +54,7 @@ public void setComment(String comment) {
     this.comment = comment;
   }
 
+  @Override
   public String toString() {
     return "Comment: " + id + " : " + name + " : " + comment;
   }