Sonar fixes

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/AbstractHavingStarter.java

@@ -34,29 +34,25 @@ public <T> F having(BindableColumn<T> column, VisitableCondition<T> condition,
 
     public <T> F having(BindableColumn<T> column, VisitableCondition<T> condition,
                         List<AndOrCriteriaGroup> subCriteria) {
-        SqlCriterion ic = ColumnAndConditionCriterion.withColumn(column)
+        SqlCriterion sqlCriterion = ColumnAndConditionCriterion.withColumn(column)
                 .withCondition(condition)
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = having();
-        finisher.initialize(ic);
-        return finisher;
+        return initialize(sqlCriterion);
     }
 
     public F having(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return having(initialCriterion, Arrays.asList(subCriteria));
     }
 
     public F having(SqlCriterion initialCriterion, List<AndOrCriteriaGroup> subCriteria) {
-        SqlCriterion ic = new CriteriaGroup.Builder()
+        SqlCriterion sqlCriterion = new CriteriaGroup.Builder()
                 .withInitialCriterion(initialCriterion)
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = having();
-        finisher.initialize(ic);
-        return finisher;
+        return initialize(sqlCriterion);
     }
 
     public F applyHaving(HavingApplier havingApplier) {
@@ -65,5 +61,11 @@ public F applyHaving(HavingApplier havingApplier) {
         return finisher;
     }
 
+    private F initialize(SqlCriterion sqlCriterion) {
+        F finisher = having();
+        finisher.initialize(sqlCriterion);
+        return finisher;
+    }
+
     protected abstract F having();
 }

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereStarter.java

@@ -44,54 +44,46 @@ public <T> F where(BindableColumn<T> column, VisitableCondition<T> condition, An
 
     public <T> F where(BindableColumn<T> column, VisitableCondition<T> condition,
                        List<AndOrCriteriaGroup> subCriteria) {
-        SqlCriterion ic = ColumnAndConditionCriterion.withColumn(column)
+        SqlCriterion sqlCriterion = ColumnAndConditionCriterion.withColumn(column)
                 .withCondition(condition)
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = where();
-        finisher.initialize(ic);
-        return finisher;
+        return initialize(sqlCriterion);
     }
 
     public F where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return where(existsPredicate, Arrays.asList(subCriteria));
     }
 
     public F where(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCriteria) {
-        ExistsCriterion ic = new ExistsCriterion.Builder()
+        ExistsCriterion sqlCriterion = new ExistsCriterion.Builder()
                 .withExistsPredicate(existsPredicate)
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = where();
-        finisher.initialize(ic);
-        return finisher;
+        return initialize(sqlCriterion);
     }
 
     public F where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return where(initialCriterion, Arrays.asList(subCriteria));
     }
 
     public F where(SqlCriterion initialCriterion, List<AndOrCriteriaGroup> subCriteria) {
-        SqlCriterion ic = new CriteriaGroup.Builder()
+        SqlCriterion sqlCriterion = new CriteriaGroup.Builder()
                 .withInitialCriterion(initialCriterion)
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = where();
-        finisher.initialize(ic);
-        return finisher;
+        return initialize(sqlCriterion);
     }
 
     public F where(List<AndOrCriteriaGroup> subCriteria) {
-        SqlCriterion ic = new CriteriaGroup.Builder()
+        SqlCriterion sqlCriterion = new CriteriaGroup.Builder()
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = where();
-        finisher.initialize(ic);
-        return finisher;
+        return initialize(sqlCriterion);
     }
 
     public F applyWhere(WhereApplier whereApplier) {
@@ -100,5 +92,11 @@ public F applyWhere(WhereApplier whereApplier) {
         return finisher;
     }
 
+    private F initialize(SqlCriterion sqlCriterion) {
+        F finisher = where();
+        finisher.initialize(sqlCriterion);
+        return finisher;
+    }
+
     public abstract F where();
 }