Skip to content

Commit 03b560c

Browse files
authored
Merge pull request #256 from jeffgbutler/master
Fix a few build warnings and errors
2 parents 36fafb2 + 4ba4f4c commit 03b560c

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<junit.jupiter.version>5.7.0</junit.jupiter.version>
3737
<junit.platform.version>1.7.0</junit.platform.version>
3838
<spring.batch.version>4.2.4.RELEASE</spring.batch.version>
39-
<clirr.comparisonVersion>1.1.0</clirr.comparisonVersion>
39+
<clirr.comparisonVersion>1.2.0</clirr.comparisonVersion>
4040
<module.name>org.mybatis.dynamic.sql</module.name>
4141
<kotlin.version>1.4.10</kotlin.version>
4242
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
@@ -45,6 +45,7 @@
4545
<jacoco.version>0.8.5</jacoco.version>
4646
<kotlin.code.style>official</kotlin.code.style>
4747
<test.containers.version>1.14.3</test.containers.version>
48+
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
4849
</properties>
4950

5051
<build>

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,29 @@ public interface SqlBuilder {
110110

111111
/**
112112
* Renders as select count(distinct column) from table...
113+
*
114+
* @param column the column to count
115+
* @return the next step in the DSL
113116
*/
114117
static CountDSL.FromGatherer<SelectModel> countDistinctColumn(BasicColumn column) {
115118
return CountDSL.countDistinct(column);
116119
}
117120

118121
/**
119122
* Renders as select count(column) from table...
123+
*
124+
* @param column the column to count
125+
* @return the next step in the DSL
120126
*/
121127
static CountDSL.FromGatherer<SelectModel> countColumn(BasicColumn column) {
122128
return CountDSL.count(column);
123129
}
124130

125131
/**
126132
* Renders as select count(*) from table...
133+
*
134+
* @param table the table to count
135+
* @return the next step in the DSL
127136
*/
128137
static CountDSL<SelectModel> countFrom(SqlTable table) {
129138
return CountDSL.countFrom(table);

0 commit comments

Comments
 (0)