Merge pull request #309 from jeffgbutler/master

Code Optimization

Author: jeffgbutler

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

@@ -35,9 +35,8 @@
 import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
 
 public abstract class AbstractQueryExpressionDSL<W extends AbstractWhereDSL<?>,
-            T extends AbstractQueryExpressionDSL<W, T, R>, R>
-        extends AbstractWhereSupport<W>
-        implements Buildable<R> {
+            T extends AbstractQueryExpressionDSL<W, T>>
+        extends AbstractWhereSupport<W> {
 
     private final List<JoinSpecification.Builder> joinSpecificationBuilders = new ArrayList<>();
     protected final Map<SqlTable, String> tableAliases = new HashMap<>();

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

@@ -35,7 +35,7 @@
  *
  * @author Jeff Butler
  */
-public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>.CountWhereBuilder, CountDSL<R>, R>
+public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>.CountWhereBuilder, CountDSL<R>>
         implements Buildable<R> {
 
     private final Function<SelectModel, R> adapterFunction;

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

@@ -36,7 +36,7 @@
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class QueryExpressionDSL<R>
-        extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>, R>
+        extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>>
         implements Buildable<R> {
 
     private final String connector;

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt

@@ -119,7 +119,7 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
 }
 
 @Suppress("TooManyFunctions")
-abstract class KotlinBaseJoiningBuilder<D : AbstractQueryExpressionDSL<*, *, *>, B : KotlinBaseJoiningBuilder<D, B>> :
+abstract class KotlinBaseJoiningBuilder<D : AbstractQueryExpressionDSL<*, *>, B : KotlinBaseJoiningBuilder<D, B>> :
     KotlinBaseBuilder<D, B>() {
 
     fun join(table: SqlTable, joinCriteria: JoinReceiver) =

src/test/java/examples/custom_render/PgContainer.java

@@ -19,11 +19,12 @@
 
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 public class PgContainer extends PostgreSQLContainer<PgContainer> {
 
     public PgContainer(String initScriptPath) {
-        super();
+        super(DockerImageName.parse(IMAGE).withTag(DEFAULT_TAG));
         withInitScript(initScriptPath);
     }