Remove unnecessary adapters, simply mappers

Author: jeffgbutler

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

@@ -21,20 +21,16 @@
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.util.Buildable;
-import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3SelectListHelper;
-import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3SelectOneHelper;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3SelectHelper;
 
 /**
  * This interface describes operations allowed for a select statement after the from and join clauses. This is
- * primarily to support the {@link MyBatis3SelectListHelper} and {@link MyBatis3SelectOneHelper} classes.
+ * primarily to support the {@link MyBatis3SelectHelper} class.
  * 
  * @author Jeff Butler
  *
  * @param <R> the model type created by these operations
  * 
- * @see MyBatis3SelectListHelper
- * @see MyBatis3SelectOneHelper
- * 
  */
 public interface CompletableQuery<R> extends Buildable<R> {
     QueryExpressionDSL<R>.QueryExpressionWhereBuilder where();

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3DeleteHelper.java

@@ -18,6 +18,7 @@
 import java.util.function.Function;
 
 import org.mybatis.dynamic.sql.delete.DeleteDSL;
+import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.util.Buildable;
 
 /**
@@ -61,7 +62,7 @@
  */
 @FunctionalInterface
 public interface MyBatis3DeleteHelper extends
-        Function<DeleteDSL<MyBatis3DeleteModelToIntAdapter>, Buildable<MyBatis3DeleteModelToIntAdapter>> {
+        Function<DeleteDSL<DeleteModel>, Buildable<DeleteModel>> {
 
     /**
      * Returns a helper that can be used to delete every row in a table.

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3DeleteModelToIntAdapter.java

@@ -17,8 +17,9 @@
 
 import java.util.function.Function;
 
-import org.mybatis.dynamic.sql.select.MyBatis3SelectModelAdapter;
-import org.mybatis.dynamic.sql.select.QueryExpressionDSL;
+import org.mybatis.dynamic.sql.SortSpecification;
+import org.mybatis.dynamic.sql.select.CompletableQuery;
+import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.util.Buildable;
 
 /**
@@ -62,15 +63,19 @@
  * @author Jeff Butler
  */
 @FunctionalInterface
-public interface MyBatis3CountHelper extends
-        Function<QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>>, Buildable<MyBatis3SelectModelAdapter<Long>>> {
+public interface MyBatis3SelectHelper extends
+        Function<CompletableQuery<SelectModel>, Buildable<SelectModel>> {
 
     /**
      * Returns a helper that can be used to count every row in a table.
      * 
      * @return the helper that will count every row in a table
      */
-    static MyBatis3CountHelper allRows() {
+    static MyBatis3SelectHelper allRows() {
         return h -> h;
     }
+
+    static MyBatis3SelectHelper allRowsOrderedBy(SortSpecification...columns) {
+        return h -> h.orderBy(columns);
+    }
 }

…l/util/mybatis3/MyBatis3CountHelper.java …/util/mybatis3/MyBatis3SelectHelper.javasrc/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3CountHelper.java renamed to src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3SelectHelper.java src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3CountHelper.java renamed to src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3SelectHelper.java

@@ -18,6 +18,7 @@
 import java.util.function.Function;
 
 import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.UpdateModel;
 import org.mybatis.dynamic.sql.util.Buildable;
 
 /**
@@ -85,5 +86,5 @@
  */
 @FunctionalInterface
 public interface MyBatis3UpdateHelper extends
-        Function<UpdateDSL<MyBatis3UpdateModelToIntAdapter>, Buildable<MyBatis3UpdateModelToIntAdapter>> {
+        Function<UpdateDSL<UpdateModel>, Buildable<UpdateModel>> {
 }