Relax generic constraints on built-in functions

jeffgbutler · jeffgbutler · commit 3b3611c493f5 · 2021-04-15T20:47:07.000-04:00
The constraints aren't very useful and make these functions difficult to use
with columns that have type handlers.
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
@@ -354,22 +354,22 @@ static StringConstant stringConstant(String constant) {
     }
 
     // functions
-    static <T extends Number> Add<T> add(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    static <T> Add<T> add(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Add.of(firstColumn, secondColumn, subsequentColumns);
     }
 
-    static <T extends Number> Divide<T> divide(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    static <T> Divide<T> divide(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Divide.of(firstColumn, secondColumn, subsequentColumns);
     }
 
-    static <T extends Number> Multiply<T> multiply(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    static <T> Multiply<T> multiply(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Multiply.of(firstColumn, secondColumn, subsequentColumns);
     }
 
-    static <T extends Number> Subtract<T> subtract(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    static <T> Subtract<T> subtract(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Subtract.of(firstColumn, secondColumn, subsequentColumns);
     }
@@ -384,15 +384,15 @@ static <T> OperatorFunction<T> applyOperator(String operator, BindableColumn<T>
         return OperatorFunction.of(operator, firstColumn, secondColumn, subsequentColumns);
     }
 
-    static Lower lower(BindableColumn<String> column) {
+    static <T> Lower<T> lower(BindableColumn<T> column) {
         return Lower.of(column);
     }
 
-    static Substring substring(BindableColumn<String> column, int offset, int length) {
+    static <T> Substring<T> substring(BindableColumn<T> column, int offset, int length) {
         return Substring.of(column, offset, length);
     }
 
-    static Upper upper(BindableColumn<String> column) {
+    static <T> Upper<T> upper(BindableColumn<T> column) {
         return Upper.of(column);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Add.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Add.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 
-public class Add<T extends Number> extends OperatorFunction<T> {
+public class Add<T> extends OperatorFunction<T> {
 
     private Add(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
@@ -33,12 +33,12 @@ protected Add<T> copy() {
         return new Add<>(column, secondColumn, subsequentColumns);
     }
 
-    public static <T extends Number> Add<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
-                                               BasicColumn... subsequentColumns) {
+    public static <T> Add<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+                                BasicColumn... subsequentColumns) {
         return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    public static <T extends Number> Add<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    public static <T> Add<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
         return new Add<>(firstColumn, secondColumn, subsequentColumns);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Divide.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Divide.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 
-public class Divide<T extends Number> extends OperatorFunction<T> {
+public class Divide<T> extends OperatorFunction<T> {
 
     private Divide(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
@@ -33,12 +33,12 @@ protected Divide<T> copy() {
         return new Divide<>(column, secondColumn, subsequentColumns);
     }
 
-    public static <T extends Number> Divide<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
-                                                  BasicColumn... subsequentColumns) {
+    public static <T> Divide<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+                                   BasicColumn... subsequentColumns) {
         return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    public static <T extends Number> Divide<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    public static <T> Divide<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
         return new Divide<>(firstColumn, secondColumn, subsequentColumns);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Lower.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Lower.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 
-public class Lower extends AbstractUniTypeFunction<String, Lower> {
+public class Lower<T> extends AbstractUniTypeFunction<T, Lower<T>> {
 
-    private Lower(BindableColumn<String> column) {
+    private Lower(BindableColumn<T> column) {
         super(column);
     }
 
@@ -32,11 +32,11 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
     }
 
     @Override
-    protected Lower copy() {
-        return new Lower(column);
+    protected Lower<T> copy() {
+        return new Lower<>(column);
     }
 
-    public static Lower of(BindableColumn<String> column) {
-        return new Lower(column);
+    public static <T> Lower<T> of(BindableColumn<T> column) {
+        return new Lower<>(column);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Multiply.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Multiply.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 
-public class Multiply<T extends Number> extends OperatorFunction<T> {
+public class Multiply<T> extends OperatorFunction<T> {
 
     private Multiply(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
@@ -33,12 +33,12 @@ protected Multiply<T> copy() {
         return new Multiply<>(column, secondColumn, subsequentColumns);
     }
 
-    public static <T extends Number> Multiply<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
-                                                    BasicColumn... subsequentColumns) {
+    public static <T> Multiply<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+                                     BasicColumn... subsequentColumns) {
         return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    public static <T extends Number> Multiply<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    public static <T> Multiply<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
         return new Multiply<>(firstColumn, secondColumn, subsequentColumns);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Substring.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Substring.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 
-public class Substring extends AbstractUniTypeFunction<String, Substring> {
+public class Substring<T> extends AbstractUniTypeFunction<T, Substring<T>> {
 
     private final int offset;
     private final int length;
 
-    private Substring(BindableColumn<String> column, int offset, int length) {
+    private Substring(BindableColumn<T> column, int offset, int length) {
         super(column);
         this.offset = offset;
         this.length = length;
@@ -41,11 +41,11 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
     }
 
     @Override
-    protected Substring copy() {
-        return new Substring(column, offset, length);
+    protected Substring<T> copy() {
+        return new Substring<>(column, offset, length);
     }
 
-    public static Substring of(BindableColumn<String> column, int offset, int length) {
-        return new Substring(column, offset, length);
+    public static <T> Substring<T> of(BindableColumn<T> column, int offset, int length) {
+        return new Substring<>(column, offset, length);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Subtract.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Subtract.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
 
-public class Subtract<T extends Number> extends OperatorFunction<T> {
+public class Subtract<T> extends OperatorFunction<T> {
 
     private Subtract(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             List<BasicColumn> subsequentColumns) {
@@ -33,13 +33,13 @@ protected Subtract<T> copy() {
         return new Subtract<>(column, secondColumn, subsequentColumns);
     }
 
-    public static <T extends Number> Subtract<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+    public static <T> Subtract<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    public static <T extends Number> Subtract<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
-                                                    List<BasicColumn> subsequentColumns) {
+    public static <T> Subtract<T> of(BindableColumn<T> firstColumn, BasicColumn secondColumn,
+                                     List<BasicColumn> subsequentColumns) {
         return new Subtract<>(firstColumn, secondColumn, subsequentColumns);
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Upper.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Upper.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2020 the original author or authors.
+ *    Copyright 2016-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 
-public class Upper extends AbstractUniTypeFunction<String, Upper> {
+public class Upper<T> extends AbstractUniTypeFunction<T, Upper<T>> {
 
-    private Upper(BindableColumn<String> column) {
+    private Upper(BindableColumn<T> column) {
         super(column);
     }
 
@@ -32,11 +32,11 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
     }
 
     @Override
-    protected Upper copy() {
-        return new Upper(column);
+    protected Upper<T> copy() {
+        return new Upper<>(column);
     }
 
-    public static Upper of(BindableColumn<String> column) {
-        return new Upper(column);
+    public static <T> Upper<T> of(BindableColumn<T> column) {
+        return new Upper<>(column);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -354,22 +354,22 @@ static StringConstant stringConstant(String constant) {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`// functions`
`357`		`- static <T extends Number> Add<T> add(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
	`357`	`+ static <T> Add<T> add(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
`358`	`358`	`BasicColumn... subsequentColumns) {`
`359`	`359`	`return Add.of(firstColumn, secondColumn, subsequentColumns);`
`360`	`360`	`}`
`361`	`361`
`362`		`- static <T extends Number> Divide<T> divide(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
	`362`	`+ static <T> Divide<T> divide(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
`363`	`363`	`BasicColumn... subsequentColumns) {`
`364`	`364`	`return Divide.of(firstColumn, secondColumn, subsequentColumns);`
`365`	`365`	`}`
`366`	`366`
`367`		`- static <T extends Number> Multiply<T> multiply(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
	`367`	`+ static <T> Multiply<T> multiply(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
`368`	`368`	`BasicColumn... subsequentColumns) {`
`369`	`369`	`return Multiply.of(firstColumn, secondColumn, subsequentColumns);`
`370`	`370`	`}`
`371`	`371`
`372`		`- static <T extends Number> Subtract<T> subtract(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
	`372`	`+ static <T> Subtract<T> subtract(BindableColumn<T> firstColumn, BasicColumn secondColumn,`
`373`	`373`	`BasicColumn... subsequentColumns) {`
`374`	`374`	`return Subtract.of(firstColumn, secondColumn, subsequentColumns);`
`375`	`375`	`}`
`@@ -384,15 +384,15 @@ static <T> OperatorFunction<T> applyOperator(String operator, BindableColumn<T>`
`384`	`384`	`return OperatorFunction.of(operator, firstColumn, secondColumn, subsequentColumns);`
`385`	`385`	`}`
`386`	`386`
`387`		`- static Lower lower(BindableColumn<String> column) {`
	`387`	`+ static <T> Lower<T> lower(BindableColumn<T> column) {`
`388`	`388`	`return Lower.of(column);`
`389`	`389`	`}`
`390`	`390`
`391`		`- static Substring substring(BindableColumn<String> column, int offset, int length) {`
	`391`	`+ static <T> Substring<T> substring(BindableColumn<T> column, int offset, int length) {`
`392`	`392`	`return Substring.of(column, offset, length);`
`393`	`393`	`}`
`394`	`394`
`395`		`- static Upper upper(BindableColumn<String> column) {`
	`395`	`+ static <T> Upper<T> upper(BindableColumn<T> column) {`
`396`	`396`	`return Upper.of(column);`
`397`	`397`	`}`
`398`	`398`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2020 the original author or authors.`
	`2`	`+ * Copyright 2016-2021 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -18,9 +18,9 @@`
`18`	`18`	`import org.mybatis.dynamic.sql.BindableColumn;`
`19`	`19`	`import org.mybatis.dynamic.sql.render.TableAliasCalculator;`
`20`	`20`
`21`		`-public class Lower extends AbstractUniTypeFunction<String, Lower> {`
	`21`	`+public class Lower<T> extends AbstractUniTypeFunction<T, Lower<T>> {`
`22`	`22`
`23`		`- private Lower(BindableColumn<String> column) {`
	`23`	`+ private Lower(BindableColumn<T> column) {`
`24`	`24`	`super(column);`
`25`	`25`	`}`
`26`	`26`
`@@ -32,11 +32,11 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`		`- protected Lower copy() {`
`36`		`- return new Lower(column);`
	`35`	`+ protected Lower<T> copy() {`
	`36`	`+ return new Lower<>(column);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public static Lower of(BindableColumn<String> column) {`
`40`		`- return new Lower(column);`
	`39`	`+ public static <T> Lower<T> of(BindableColumn<T> column) {`
	`40`	`+ return new Lower<>(column);`
`41`	`41`	`}`
`42`	`42`	`}`