Skip to content

Commit 4cb129a

Browse files
committed
CodeQL Nags
1 parent 2ceddae commit 4cb129a

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

src/main/java/org/mybatis/dynamic/sql/dsl/SelectDSL.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ public SelectDSL orderBy(Collection<? extends SortSpecification> columns) {
163163
return this;
164164
}
165165

166+
@Override
166167
public SelectDSL groupBy(Collection<? extends BasicColumn> columns) {
167168
currentQueryValues.builder.withGroupByModel(GroupByModel.of(columns));
168169
return this;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ public R build() {
157157
return selectDSL.build();
158158
}
159159

160+
@Override
160161
public QueryExpressionDSL<R> groupBy(Collection<? extends BasicColumn> columns) {
161162
groupByModel = GroupByModel.of(columns);
162163
return this;
@@ -252,6 +253,7 @@ public SelectDSL<R> orderBy(Collection<? extends SortSpecification> columns) {
252253
return QueryExpressionDSL.this.orderBy(columns);
253254
}
254255

256+
@Override
255257
public QueryExpressionDSL<R> groupBy(Collection<? extends BasicColumn> columns) {
256258
return QueryExpressionDSL.this.groupBy(columns);
257259
}
@@ -340,6 +342,7 @@ public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
340342
return QueryExpressionDSL.this.applyWhere(whereApplier);
341343
}
342344

345+
@Override
343346
public QueryExpressionDSL<R> groupBy(Collection<? extends BasicColumn> columns) {
344347
return QueryExpressionDSL.this.groupBy(columns);
345348
}

src/test/java/examples/joins/JoinMapperV2Test.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ class JoinMapperV2Test {
5858
@BeforeEach
5959
void setup() throws Exception {
6060
Class.forName(JDBC_DRIVER);
61-
InputStream is = getClass().getResourceAsStream("/examples/joins/CreateJoinDB.sql");
62-
assert is != null;
63-
try (Connection connection = DriverManager.getConnection(JDBC_URL, "sa", "")) {
64-
ScriptRunner sr = new ScriptRunner(connection);
65-
sr.setLogWriter(null);
66-
sr.runScript(new InputStreamReader(is));
61+
try (InputStream is = getClass().getResourceAsStream("/examples/joins/CreateJoinDB.sql")) {
62+
assert is != null;
63+
try (Connection connection = DriverManager.getConnection(JDBC_URL, "sa", "")) {
64+
ScriptRunner sr = new ScriptRunner(connection);
65+
sr.setLogWriter(null);
66+
sr.runScript(new InputStreamReader(is));
67+
}
6768
}
6869

6970
UnpooledDataSource ds = new UnpooledDataSource(JDBC_DRIVER, JDBC_URL, "sa", "");

src/test/java/examples/simple/PersonMapperV2Test.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ class PersonMapperV2Test {
7979
@BeforeEach
8080
void setup() throws Exception {
8181
Class.forName(JDBC_DRIVER);
82-
InputStream is = getClass().getResourceAsStream("/examples/simple/CreateSimpleDB.sql");
83-
assert is != null;
84-
try (Connection connection = DriverManager.getConnection(JDBC_URL, "sa", "")) {
85-
ScriptRunner sr = new ScriptRunner(connection);
86-
sr.setLogWriter(null);
87-
sr.runScript(new InputStreamReader(is));
82+
try (InputStream is = getClass().getResourceAsStream("/examples/simple/CreateSimpleDB.sql")) {
83+
assert is != null;
84+
try (Connection connection = DriverManager.getConnection(JDBC_URL, "sa", "")) {
85+
ScriptRunner sr = new ScriptRunner(connection);
86+
sr.setLogWriter(null);
87+
sr.runScript(new InputStreamReader(is));
88+
}
8889
}
8990

9091
UnpooledDataSource ds = new UnpooledDataSource(JDBC_DRIVER, JDBC_URL, "sa", "");

0 commit comments

Comments
 (0)