Merge pull request #102 from jeffgbutler/master

Upgrade Jacoco to fix gh-pages problem

core/mybatis-generator-core/src/main/java/org/mybatis/generator/ant/GeneratorAntTask.java

@@ -167,7 +167,6 @@ public void execute() throws BuildException {
             throw new BuildException(e.getMessage());
         } catch (InterruptedException e) {
             // ignore (will never happen with the DefaultShellCallback)
-            ;
         } catch (Exception e) {
             e.printStackTrace();
             throw new BuildException(e.getMessage());

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/CommentGenerator.java

@@ -59,7 +59,7 @@ public interface CommentGenerator {
      * @param introspectedColumn
      *            the introspected column
      */
-    public void addFieldComment(Field field,
+    void addFieldComment(Field field,
             IntrospectedTable introspectedTable,
             IntrospectedColumn introspectedColumn);
 
@@ -71,7 +71,7 @@ public void addFieldComment(Field field,
      * @param introspectedTable
      *            the introspected table
      */
-    public void addFieldComment(Field field, IntrospectedTable introspectedTable);
+    void addFieldComment(Field field, IntrospectedTable introspectedTable);
 
     /**
      * Adds a comment for a model class.  The Java code merger should
@@ -88,7 +88,7 @@ public void addFieldComment(Field field,
      * @param introspectedTable
      *            the introspected table
      */
-    public void addModelClassComment(TopLevelClass topLevelClass,
+    void addModelClassComment(TopLevelClass topLevelClass,
             IntrospectedTable introspectedTable);
 
     /**
@@ -99,7 +99,7 @@ public void addModelClassComment(TopLevelClass topLevelClass,
      * @param introspectedTable
      *            the introspected table
      */
-    public void addClassComment(InnerClass innerClass,
+    void addClassComment(InnerClass innerClass,
             IntrospectedTable introspectedTable);
 
     /**
@@ -112,7 +112,7 @@ public void addClassComment(InnerClass innerClass,
      * @param markAsDoNotDelete
      *            the mark as do not delete
      */
-    public void addClassComment(InnerClass innerClass,
+    void addClassComment(InnerClass innerClass,
             IntrospectedTable introspectedTable, boolean markAsDoNotDelete);
 
     /**
@@ -123,7 +123,7 @@ public void addClassComment(InnerClass innerClass,
      * @param introspectedTable
      *            the introspected table
      */
-    public void addEnumComment(InnerEnum innerEnum,
+    void addEnumComment(InnerEnum innerEnum,
             IntrospectedTable introspectedTable);
 
     /**
@@ -136,7 +136,7 @@ public void addEnumComment(InnerEnum innerEnum,
      * @param introspectedColumn
      *            the introspected column
      */
-    public void addGetterComment(Method method,
+    void addGetterComment(Method method,
             IntrospectedTable introspectedTable,
             IntrospectedColumn introspectedColumn);
 
@@ -150,7 +150,7 @@ public void addGetterComment(Method method,
      * @param introspectedColumn
      *            the introspected column
      */
-    public void addSetterComment(Method method,
+    void addSetterComment(Method method,
             IntrospectedTable introspectedTable,
             IntrospectedColumn introspectedColumn);
 
@@ -162,7 +162,7 @@ public void addSetterComment(Method method,
      * @param introspectedTable
      *            the introspected table
      */
-    public void addGeneralMethodComment(Method method,
+    void addGeneralMethodComment(Method method,
             IntrospectedTable introspectedTable);
 
     /**
@@ -177,7 +177,7 @@ public void addGeneralMethodComment(Method method,
      * @param compilationUnit
      *            the compilation unit
      */
-    public void addJavaFileComment(CompilationUnit compilationUnit);
+    void addJavaFileComment(CompilationUnit compilationUnit);
 
     /**
      * This method should add a suitable comment as a child element of the specified xmlElement to warn users that the
@@ -186,7 +186,7 @@ public void addGeneralMethodComment(Method method,
      * @param xmlElement
      *            the xml element
      */
-    public void addComment(XmlElement xmlElement);
+    void addComment(XmlElement xmlElement);
 
     /**
      * This method is called to add a comment as the first child of the root element. This method could be used to add a
@@ -199,5 +199,5 @@ public void addGeneralMethodComment(Method method,
      * @param rootElement
      *            the root element
      */
-    public void addRootComment(XmlElement rootElement);
+    void addRootComment(XmlElement rootElement);
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ShellRunner.java

@@ -138,7 +138,6 @@ public static void main(String[] args) {
             return;
         } catch (InterruptedException e) {
             // ignore (will never happen with the DefaultShellCallback)
-            ;
         }
 
         for (String warning : warnings) {

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java

@@ -94,7 +94,7 @@ private Method getMethodShell(Set<FullyQualifiedJavaType> importedTypes) {
 
         FullyQualifiedJavaType returnType = FullyQualifiedJavaType
                 .getNewListInstance();
-        ;
+
         if (generateForJava5) {
             FullyQualifiedJavaType fqjt;
             if (introspectedTable.getRules().generateBaseRecordClass()) {

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java

@@ -80,6 +80,5 @@ public void addImplementationElements(TopLevelClass topLevelClass) {
     @Override
     public void addInterfaceElements(Interface interfaze) {
         // nothing to add to the interface
-        ;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/ibatis2/model/ExampleGenerator.java

@@ -227,7 +227,7 @@ public List<CompilationUnit> getCompilationUnits() {
         topLevelClass
                 .addInnerClass(getGeneratedCriteriaInnerClass(topLevelClass));
 
-        topLevelClass.addInnerClass(getCriteriaInnerClass(topLevelClass));
+        topLevelClass.addInnerClass(getCriteriaInnerClass());
 
         List<CompilationUnit> answer = new ArrayList<CompilationUnit>();
         if (context.getPlugins().modelExampleClassGenerated(
@@ -237,7 +237,7 @@ public List<CompilationUnit> getCompilationUnits() {
         return answer;
     }
 
-    private InnerClass getCriteriaInnerClass(TopLevelClass topLevelClass) {
+    private InnerClass getCriteriaInnerClass() {
         Method method;
 
         InnerClass answer = new InnerClass(FullyQualifiedJavaType

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/ibatis2/sqlmap/elements/BaseColumnListElementGenerator.java

@@ -61,7 +61,7 @@ public void addElements(XmlElement parentElement) {
         }
 
         if (sb.length() > 0) {
-            answer.addElement((new TextElement(sb.toString())));
+            answer.addElement(new TextElement(sb.toString()));
         }
 
         if (context.getPlugins().sqlMapBaseColumnListElementGenerated(

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/ibatis2/sqlmap/elements/BlobColumnListElementGenerator.java

@@ -62,7 +62,7 @@ public void addElements(XmlElement parentElement) {
         }
 
         if (sb.length() > 0) {
-            answer.addElement((new TextElement(sb.toString())));
+            answer.addElement(new TextElement(sb.toString()));
         }
 
         if (context.getPlugins().sqlMapBlobColumnListElementGenerated(

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java

@@ -70,7 +70,7 @@ public void addElements(XmlElement parentElement) {
         sb.append("from "); //$NON-NLS-1$
         sb.append(introspectedTable
                 .getAliasedFullyQualifiedTableNameAtRuntime());
-        answer.addElement((new TextElement(sb.toString())));
+        answer.addElement(new TextElement(sb.toString()));
 
         XmlElement isParameterPresenteElement = new XmlElement(
                 "isParameterPresent"); //$NON-NLS-1$

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/SqlProviderGenerator.java

@@ -81,11 +81,9 @@ public List<CompilationUnit> getCompilationUnits() {
 
         List<CompilationUnit> answer = new ArrayList<CompilationUnit>();
 
-        if (topLevelClass.getMethods().size() > 0) {
-            if (context.getPlugins().providerGenerated(topLevelClass,
-                introspectedTable)) {
-                answer.add(topLevelClass);
-            }
+        if (topLevelClass.getMethods().size() > 0 &&
+                context.getPlugins().providerGenerated(topLevelClass, introspectedTable)) {
+            answer.add(topLevelClass);
         }
 
         return answer;

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/CountByExampleMethodGenerator.java

@@ -62,6 +62,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/DeleteByExampleMethodGenerator.java

@@ -62,6 +62,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/DeleteByPrimaryKeyMethodGenerator.java

@@ -97,6 +97,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/InsertMethodGenerator.java

@@ -72,6 +72,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/InsertSelectiveMethodGenerator.java

@@ -64,6 +64,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectAllMethodGenerator.java

@@ -67,6 +67,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectByExampleWithBLOBsMethodGenerator.java

@@ -80,6 +80,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectByExampleWithoutBLOBsMethodGenerator.java

@@ -83,6 +83,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/SelectByPrimaryKeyMethodGenerator.java

@@ -102,6 +102,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/UpdateByExampleSelectiveMethodGenerator.java

@@ -70,6 +70,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/UpdateByExampleWithBLOBsMethodGenerator.java

@@ -80,6 +80,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/UpdateByExampleWithoutBLOBsMethodGenerator.java

@@ -79,6 +79,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/UpdateByPrimaryKeySelectiveMethodGenerator.java

@@ -72,6 +72,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/UpdateByPrimaryKeyWithBLOBsMethodGenerator.java

@@ -73,6 +73,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/javamapper/elements/UpdateByPrimaryKeyWithoutBLOBsMethodGenerator.java

@@ -63,6 +63,5 @@ public void addInterfaceElements(Interface interfaze) {
     }
 
     public void addMapperAnnotations(Interface interfaze, Method method) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/model/ExampleGenerator.java

@@ -195,9 +195,9 @@ public List<CompilationUnit> getCompilationUnits() {
         topLevelClass
                 .addInnerClass(getGeneratedCriteriaInnerClass(topLevelClass));
 
-        topLevelClass.addInnerClass(getCriteriaInnerClass(topLevelClass));
+        topLevelClass.addInnerClass(getCriteriaInnerClass());
 
-        topLevelClass.addInnerClass(getCriterionInnerClass(topLevelClass));
+        topLevelClass.addInnerClass(getCriterionInnerClass());
 
         List<CompilationUnit> answer = new ArrayList<CompilationUnit>();
         if (context.getPlugins().modelExampleClassGenerated(
@@ -207,7 +207,7 @@ public List<CompilationUnit> getCompilationUnits() {
         return answer;
     }
 
-    private InnerClass getCriterionInnerClass(TopLevelClass topLevelClass) {
+    private InnerClass getCriterionInnerClass() {
         Field field;
         Method method;
 
@@ -354,7 +354,7 @@ private InnerClass getCriterionInnerClass(TopLevelClass topLevelClass) {
         return answer;
     }
 
-    private InnerClass getCriteriaInnerClass(TopLevelClass topLevelClass) {
+    private InnerClass getCriteriaInnerClass() {
         Method method;
 
         InnerClass answer = new InnerClass(FullyQualifiedJavaType

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/MixedMapperGenerator.java

@@ -26,28 +26,23 @@ public class MixedMapperGenerator extends XMLMapperGenerator {
 
     @Override
     protected void addSelectByPrimaryKeyElement(XmlElement parentElement) {
-        return;
     }
 
     @Override
     protected void addDeleteByPrimaryKeyElement(XmlElement parentElement) {
-        return;
     }
 
     @Override
     protected void addInsertElement(XmlElement parentElement) {
-        return;
     }
 
     @Override
     protected void addUpdateByPrimaryKeyWithBLOBsElement(
             XmlElement parentElement) {
-        return;
     }
 
     @Override
     protected void addUpdateByPrimaryKeyWithoutBLOBsElement(
             XmlElement parentElement) {
-        return;
     }
 }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/BaseColumnListElementGenerator.java

@@ -61,7 +61,7 @@ public void addElements(XmlElement parentElement) {
         }
 
         if (sb.length() > 0) {
-            answer.addElement((new TextElement(sb.toString())));
+            answer.addElement(new TextElement(sb.toString()));
         }
 
         if (context.getPlugins().sqlMapBaseColumnListElementGenerated(

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/BlobColumnListElementGenerator.java

@@ -62,7 +62,7 @@ public void addElements(XmlElement parentElement) {
         }
 
         if (sb.length() > 0) {
-            answer.addElement((new TextElement(sb.toString())));
+            answer.addElement(new TextElement(sb.toString()));
         }
 
         if (context.getPlugins().sqlMapBlobColumnListElementGenerated(

core/mybatis-generator-core/src/main/java/org/mybatis/generator/codegen/mybatis3/xmlmapper/elements/InsertElementGenerator.java

@@ -105,11 +105,10 @@ public void addElements(XmlElement parentElement) {
                     .getEscapedColumnName(introspectedColumn));
             valuesClause.append(MyBatis3FormattingUtilities
                     .getParameterClause(introspectedColumn));
-            if (i + 1 < columns.size()) {
-                if (!columns.get(i + 1).isIdentity()) {
-                    insertClause.append(", "); //$NON-NLS-1$
-                    valuesClause.append(", "); //$NON-NLS-1$
-                }
+            if (i + 1 < columns.size() &&
+                    !columns.get(i + 1).isIdentity()) {
+                insertClause.append(", "); //$NON-NLS-1$
+                valuesClause.append(", "); //$NON-NLS-1$
             }
 
             if (valuesClause.length() > 80) {