From 0b39d9b1e6674b0a961af8be126ba76c6b6c3619 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 8 Nov 2023 18:35:37 -0500 Subject: [PATCH] [ci] Minor formatting / import sorting --- .../dynamic/sql/AbstractTwoValueCondition.java | 3 +-- .../org/mybatis/dynamic/sql/CriteriaGroup.java | 1 + .../configuration/StatementConfiguration.java | 2 ++ .../mybatis/dynamic/sql/delete/DeleteDSL.java | 2 +- .../dynamic/sql/select/function/Add.java | 2 +- .../sql/select/function/Concatenate.java | 2 +- .../dynamic/sql/select/function/Divide.java | 2 +- .../dynamic/sql/select/function/Multiply.java | 2 +- .../sql/select/function/OperatorFunction.java | 2 +- .../mybatis/dynamic/sql/where/WhereModel.java | 2 +- .../where/condition/IsLessThanOrEqualTo.java | 2 +- .../dynamic/sql/where/condition/IsLike.java | 2 +- .../where/condition/IsLikeCaseInsensitive.java | 2 +- .../sql/where/condition/IsNotBetween.java | 2 +- .../sql/where/condition/IsNotEqualTo.java | 2 +- .../examples/animal/data/AnimalDataMapper.java | 6 +++--- .../always/mybatis/GeneratedAlwaysMapper.java | 2 +- .../generated/always/spring/SpringTest.java | 2 +- .../mariadb/ItemsDynamicSQLSupport.java | 4 ++-- .../java/examples/mariadb/MariaDBTest.java | 7 ++++--- .../java/examples/sharding/ShardingTest.java | 3 +-- .../sharding/TableCodesDynamicSqlSupport.java | 7 ++++--- .../simple/CompoundKeyDynamicSqlSupport.java | 4 ++-- .../examples/simple/MyBatisMapToRowTest.java | 18 +++++++++--------- .../java/examples/simple/PersonMapper.java | 2 +- .../common/UpdateStatementConvertor.java | 2 +- .../cursor/SpringBatchCursorTest.java | 3 ++- .../paging/PagingReaderBatchConfiguration.java | 2 +- .../paging/SpringBatchPagingTest.java | 3 ++- .../java/issues/gh100/FromGroupByTest.java | 3 ++- src/test/java/issues/gh655/Gh655Test.java | 2 +- .../mybatis/dynamic/sql/InvalidSQLTest.java | 2 +- .../sql/update/UpdateStatementTest.java | 1 - 33 files changed, 54 insertions(+), 49 deletions(-) diff --git a/src/main/java/org/mybatis/dynamic/sql/AbstractTwoValueCondition.java b/src/main/java/org/mybatis/dynamic/sql/AbstractTwoValueCondition.java index 74fd498f0..ff27f734f 100644 --- a/src/main/java/org/mybatis/dynamic/sql/AbstractTwoValueCondition.java +++ b/src/main/java/org/mybatis/dynamic/sql/AbstractTwoValueCondition.java @@ -21,8 +21,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; -public abstract class AbstractTwoValueCondition - implements VisitableCondition { +public abstract class AbstractTwoValueCondition implements VisitableCondition { protected final T value1; protected final T value2; diff --git a/src/main/java/org/mybatis/dynamic/sql/CriteriaGroup.java b/src/main/java/org/mybatis/dynamic/sql/CriteriaGroup.java index 5a1210a06..90681d7f5 100644 --- a/src/main/java/org/mybatis/dynamic/sql/CriteriaGroup.java +++ b/src/main/java/org/mybatis/dynamic/sql/CriteriaGroup.java @@ -23,6 +23,7 @@ * as in an expression like ((A < 5 and B > 6) or C = 3) * * @author Jeff Butler, inspired by @JoshuaJeme + * * @since 1.4.0 */ public class CriteriaGroup extends SqlCriterion { diff --git a/src/main/java/org/mybatis/dynamic/sql/configuration/StatementConfiguration.java b/src/main/java/org/mybatis/dynamic/sql/configuration/StatementConfiguration.java index 20fc1860f..128c9b01c 100644 --- a/src/main/java/org/mybatis/dynamic/sql/configuration/StatementConfiguration.java +++ b/src/main/java/org/mybatis/dynamic/sql/configuration/StatementConfiguration.java @@ -35,7 +35,9 @@ * * * @see GlobalConfiguration + * * @since 1.4.1 + * * @author Jeff Butler */ public class StatementConfiguration { diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java index 1d660c4d4..d40f25f2e 100644 --- a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java +++ b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java @@ -96,7 +96,7 @@ public DeleteDSL configureStatement(Consumer consumer } public static DeleteDSL deleteFrom(Function adapterFunction, SqlTable table, - String tableAlias) { + String tableAlias) { return new DeleteDSL<>(table, tableAlias, adapterFunction); } 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 index b25d60653..11fea5ddd 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/function/Add.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/function/Add.java @@ -34,7 +34,7 @@ protected Add copy() { } public static Add of(BindableColumn firstColumn, BasicColumn secondColumn, - BasicColumn... subsequentColumns) { + BasicColumn... subsequentColumns) { return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns)); } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/Concatenate.java b/src/main/java/org/mybatis/dynamic/sql/select/function/Concatenate.java index c305897fe..36acb91f9 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/function/Concatenate.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/function/Concatenate.java @@ -39,7 +39,7 @@ public static Concatenate concatenate(BindableColumn firstColumn, Basi } public static Concatenate of(BindableColumn firstColumn, BasicColumn secondColumn, - List subsequentColumns) { + List subsequentColumns) { return new Concatenate<>(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 index f71548756..eec2aceb2 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/function/Divide.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/function/Divide.java @@ -34,7 +34,7 @@ protected Divide copy() { } public static Divide of(BindableColumn firstColumn, BasicColumn secondColumn, - BasicColumn... subsequentColumns) { + BasicColumn... subsequentColumns) { return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns)); } 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 index 704958f05..2a4cee712 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/function/Multiply.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/function/Multiply.java @@ -34,7 +34,7 @@ protected Multiply copy() { } public static Multiply of(BindableColumn firstColumn, BasicColumn secondColumn, - BasicColumn... subsequentColumns) { + BasicColumn... subsequentColumns) { return of(firstColumn, secondColumn, Arrays.asList(subsequentColumns)); } diff --git a/src/main/java/org/mybatis/dynamic/sql/select/function/OperatorFunction.java b/src/main/java/org/mybatis/dynamic/sql/select/function/OperatorFunction.java index a6ba5fd98..92a1ee568 100644 --- a/src/main/java/org/mybatis/dynamic/sql/select/function/OperatorFunction.java +++ b/src/main/java/org/mybatis/dynamic/sql/select/function/OperatorFunction.java @@ -67,7 +67,7 @@ public static OperatorFunction of(String operator, BindableColumn firs } public static OperatorFunction of(String operator, BindableColumn firstColumn, BasicColumn secondColumn, - List subsequentColumns) { + List subsequentColumns) { return new OperatorFunction<>(operator, firstColumn, secondColumn, subsequentColumns); } } diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java index d744cbbdf..18c31df8d 100644 --- a/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java +++ b/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java @@ -34,7 +34,7 @@ public class WhereModel extends AbstractBooleanExpressionModel { private final StatementConfiguration statementConfiguration; public WhereModel(SqlCriterion initialCriterion, List subCriteria, - StatementConfiguration statementConfiguration) { + StatementConfiguration statementConfiguration) { super(initialCriterion, subCriteria); this.statementConfiguration = Objects.requireNonNull(statementConfiguration); } diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLessThanOrEqualTo.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLessThanOrEqualTo.java index 9025938a3..3b29ec9b7 100644 --- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLessThanOrEqualTo.java +++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLessThanOrEqualTo.java @@ -54,7 +54,7 @@ public IsLessThanOrEqualTo filter(Predicate predicate) { /** * If renderable, apply the mapping to the value and return a new condition with the new value. Else return a - * condition that will not render (this). + * condition that will not render (this). * * @param mapper a mapping function to apply to the value, if renderable * @param type of the new condition diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLike.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLike.java index afc335bd0..cc56aef72 100644 --- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLike.java +++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLike.java @@ -54,7 +54,7 @@ public IsLike filter(Predicate predicate) { /** * If renderable, apply the mapping to the value and return a new condition with the new value. Else return a - * condition that will not render (this). + * condition that will not render (this). * * @param mapper a mapping function to apply to the value, if renderable * @param type of the new condition diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitive.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitive.java index f7310cb7b..b9b001ac4 100644 --- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitive.java +++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitive.java @@ -50,7 +50,7 @@ public IsLikeCaseInsensitive filter(Predicate predicate) { /** * If renderable, apply the mapping to the value and return a new condition with the new value. Else return a - * condition that will not render (this). + * condition that will not render (this). * * @param mapper a mapping function to apply to the value, if renderable * @return a new condition with the result of applying the mapper to the value of this condition, diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotBetween.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotBetween.java index 28e1e764b..74973c5a0 100644 --- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotBetween.java +++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotBetween.java @@ -62,7 +62,7 @@ public IsNotBetween filter(Predicate predicate) { /** * If renderable, apply the mappings to the values and return a new condition with the new values. Else return a - * condition that will not render (this). + * condition that will not render (this). * * @param mapper1 a mapping function to apply to the first value, if renderable * @param mapper2 a mapping function to apply to the second value, if renderable diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotEqualTo.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotEqualTo.java index e514eae73..4e3e093fc 100644 --- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotEqualTo.java +++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotEqualTo.java @@ -54,7 +54,7 @@ public IsNotEqualTo filter(Predicate predicate) { /** * If renderable, apply the mapping to the value and return a new condition with the new value. Else return a - * condition that will not render (this). + * condition that will not render (this). * * @param mapper a mapping function to apply to the value, if renderable * @param type of the new condition diff --git a/src/test/java/examples/animal/data/AnimalDataMapper.java b/src/test/java/examples/animal/data/AnimalDataMapper.java index b83cac2a4..9611497ab 100644 --- a/src/test/java/examples/animal/data/AnimalDataMapper.java +++ b/src/test/java/examples/animal/data/AnimalDataMapper.java @@ -42,11 +42,11 @@ public interface AnimalDataMapper extends CommonDeleteMapper, CommonInsertMapper }) List selectMany(SelectStatementProvider selectStatement); - @SelectProvider(type=SqlProviderAdapter.class, method="select") + @SelectProvider(type = SqlProviderAdapter.class, method = "select") @ResultMap("AnimalDataResult") List selectManyWithRowBounds(SelectStatementProvider selectStatement, RowBounds rowBounds); - @SelectProvider(type=SqlProviderAdapter.class, method="select") + @SelectProvider(type = SqlProviderAdapter.class, method = "select") @ResultMap("AnimalDataResult") AnimalData selectOne(SelectStatementProvider selectStatement); @@ -75,7 +75,7 @@ public interface AnimalDataMapper extends CommonDeleteMapper, CommonInsertMapper }) @ResultMap("AnimalDataResult") List selectWithWhereClauseLimitAndOffset(@Param("whereClauseProvider") WhereClauseProvider whereClause, - @Param("limit") int limit, @Param("offset") int offset); + @Param("limit") int limit, @Param("offset") int offset); @Select({ "select b.id, b.animal_name, b.brain_weight, b.body_weight", diff --git a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java index 925a3a8a9..c0c945056 100644 --- a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java +++ b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java @@ -16,7 +16,7 @@ package examples.generated.always.mybatis; import static examples.generated.always.mybatis.GeneratedAlwaysDynamicSqlSupport.*; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import java.util.Arrays; import java.util.Collection; diff --git a/src/test/java/examples/generated/always/spring/SpringTest.java b/src/test/java/examples/generated/always/spring/SpringTest.java index 016830fbd..21097d6f6 100644 --- a/src/test/java/examples/generated/always/spring/SpringTest.java +++ b/src/test/java/examples/generated/always/spring/SpringTest.java @@ -37,8 +37,8 @@ import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider; import org.mybatis.dynamic.sql.util.Buildable; -import org.mybatis.dynamic.sql.util.spring.NamedParameterJdbcTemplateExtensions; import org.mybatis.dynamic.sql.util.spring.BatchInsertUtility; +import org.mybatis.dynamic.sql.util.spring.NamedParameterJdbcTemplateExtensions; import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/src/test/java/examples/mariadb/ItemsDynamicSQLSupport.java b/src/test/java/examples/mariadb/ItemsDynamicSQLSupport.java index 465d906d1..e1aeed746 100644 --- a/src/test/java/examples/mariadb/ItemsDynamicSQLSupport.java +++ b/src/test/java/examples/mariadb/ItemsDynamicSQLSupport.java @@ -15,11 +15,11 @@ */ package examples.mariadb; +import java.sql.JDBCType; + import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; -import java.sql.JDBCType; - public final class ItemsDynamicSQLSupport { public static final Items items = new Items(); public static final SqlColumn id = items.id; diff --git a/src/test/java/examples/mariadb/MariaDBTest.java b/src/test/java/examples/mariadb/MariaDBTest.java index 83a3c5763..fa70e2f1b 100644 --- a/src/test/java/examples/mariadb/MariaDBTest.java +++ b/src/test/java/examples/mariadb/MariaDBTest.java @@ -24,12 +24,15 @@ import static org.assertj.core.api.Assertions.entry; import static org.mybatis.dynamic.sql.SqlBuilder.add; import static org.mybatis.dynamic.sql.SqlBuilder.constant; -import static org.mybatis.dynamic.sql.SqlBuilder.isLessThan; import static org.mybatis.dynamic.sql.SqlBuilder.deleteFrom; +import static org.mybatis.dynamic.sql.SqlBuilder.isLessThan; import static org.mybatis.dynamic.sql.SqlBuilder.select; import static org.mybatis.dynamic.sql.SqlBuilder.update; import config.TestContainersConfiguration; +import java.util.List; +import java.util.Map; + import org.apache.ibatis.datasource.unpooled.UnpooledDataSource; import org.apache.ibatis.mapping.Environment; import org.apache.ibatis.session.Configuration; @@ -50,8 +53,6 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import java.util.List; -import java.util.Map; @Testcontainers class MariaDBTest { diff --git a/src/test/java/examples/sharding/ShardingTest.java b/src/test/java/examples/sharding/ShardingTest.java index 597c227c0..1fb2474e0 100644 --- a/src/test/java/examples/sharding/ShardingTest.java +++ b/src/test/java/examples/sharding/ShardingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 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. @@ -51,7 +51,6 @@ class ShardingTest { private SqlSessionFactory sqlSessionFactory; - @BeforeEach void setup() throws Exception { Class.forName(JDBC_DRIVER); diff --git a/src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java b/src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java index c9dd2e72a..76cd329ab 100644 --- a/src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java +++ b/src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 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. @@ -15,11 +15,11 @@ */ package examples.sharding; +import java.sql.JDBCType; + import org.mybatis.dynamic.sql.AliasableSqlTable; import org.mybatis.dynamic.sql.SqlColumn; -import java.sql.JDBCType; - public final class TableCodesDynamicSqlSupport { public static final TableCodes tableCodes = new TableCodes(); public static final SqlColumn id = tableCodes.id; @@ -28,6 +28,7 @@ public final class TableCodesDynamicSqlSupport { public static final class TableCodes extends AliasableSqlTable { public final SqlColumn id = column("id", JDBCType.INTEGER); public final SqlColumn description = column("description", JDBCType.VARCHAR); + public TableCodes() { super("tableCodes_even", TableCodes::new); } diff --git a/src/test/java/examples/simple/CompoundKeyDynamicSqlSupport.java b/src/test/java/examples/simple/CompoundKeyDynamicSqlSupport.java index 2366bfb96..f6f30d995 100644 --- a/src/test/java/examples/simple/CompoundKeyDynamicSqlSupport.java +++ b/src/test/java/examples/simple/CompoundKeyDynamicSqlSupport.java @@ -15,11 +15,11 @@ */ package examples.simple; +import java.sql.JDBCType; + import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; -import java.sql.JDBCType; - public class CompoundKeyDynamicSqlSupport { public static final CompoundKey compoundKey = new CompoundKey(); public static final SqlColumn id1 = compoundKey.id1; diff --git a/src/test/java/examples/simple/MyBatisMapToRowTest.java b/src/test/java/examples/simple/MyBatisMapToRowTest.java index 7dd3cb7ec..af402bc58 100644 --- a/src/test/java/examples/simple/MyBatisMapToRowTest.java +++ b/src/test/java/examples/simple/MyBatisMapToRowTest.java @@ -15,6 +15,15 @@ */ package examples.simple; +import static examples.simple.CompoundKeyDynamicSqlSupport.compoundKey; +import static examples.simple.CompoundKeyDynamicSqlSupport.id1; +import static examples.simple.CompoundKeyDynamicSqlSupport.id2; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mybatis.dynamic.sql.SqlBuilder.insert; +import static org.mybatis.dynamic.sql.SqlBuilder.insertBatch; +import static org.mybatis.dynamic.sql.SqlBuilder.insertMultiple; +import static org.mybatis.dynamic.sql.SqlBuilder.select; + import java.io.InputStream; import java.io.InputStreamReader; import java.sql.Connection; @@ -42,15 +51,6 @@ import org.mybatis.dynamic.sql.render.RenderingStrategies; import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; -import static examples.simple.CompoundKeyDynamicSqlSupport.compoundKey; -import static examples.simple.CompoundKeyDynamicSqlSupport.id1; -import static examples.simple.CompoundKeyDynamicSqlSupport.id2; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mybatis.dynamic.sql.SqlBuilder.insert; -import static org.mybatis.dynamic.sql.SqlBuilder.insertBatch; -import static org.mybatis.dynamic.sql.SqlBuilder.insertMultiple; -import static org.mybatis.dynamic.sql.SqlBuilder.select; - class MyBatisMapToRowTest { private static final String JDBC_URL = "jdbc:hsqldb:mem:aname"; private static final String JDBC_DRIVER = "org.hsqldb.jdbcDriver"; diff --git a/src/test/java/examples/simple/PersonMapper.java b/src/test/java/examples/simple/PersonMapper.java index eb3d0b07f..f9f15ac30 100644 --- a/src/test/java/examples/simple/PersonMapper.java +++ b/src/test/java/examples/simple/PersonMapper.java @@ -16,7 +16,7 @@ package examples.simple; import static examples.simple.PersonDynamicSqlSupport.*; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import java.util.Arrays; import java.util.Collection; diff --git a/src/test/java/examples/springbatch/common/UpdateStatementConvertor.java b/src/test/java/examples/springbatch/common/UpdateStatementConvertor.java index 13c59d870..6cd242d5c 100644 --- a/src/test/java/examples/springbatch/common/UpdateStatementConvertor.java +++ b/src/test/java/examples/springbatch/common/UpdateStatementConvertor.java @@ -16,7 +16,7 @@ package examples.springbatch.common; import static examples.springbatch.mapper.PersonDynamicSqlSupport.*; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import org.mybatis.dynamic.sql.render.RenderingStrategies; import org.mybatis.dynamic.sql.update.UpdateDSL; diff --git a/src/test/java/examples/springbatch/cursor/SpringBatchCursorTest.java b/src/test/java/examples/springbatch/cursor/SpringBatchCursorTest.java index c99b873e5..a65209634 100644 --- a/src/test/java/examples/springbatch/cursor/SpringBatchCursorTest.java +++ b/src/test/java/examples/springbatch/cursor/SpringBatchCursorTest.java @@ -17,7 +17,8 @@ import static examples.springbatch.mapper.PersonDynamicSqlSupport.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.count; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; diff --git a/src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java b/src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java index 30e79878b..81ff7a857 100644 --- a/src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java +++ b/src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java @@ -16,7 +16,7 @@ package examples.springbatch.paging; import static examples.springbatch.mapper.PersonDynamicSqlSupport.*; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import javax.sql.DataSource; diff --git a/src/test/java/examples/springbatch/paging/SpringBatchPagingTest.java b/src/test/java/examples/springbatch/paging/SpringBatchPagingTest.java index 358943336..aba79be59 100644 --- a/src/test/java/examples/springbatch/paging/SpringBatchPagingTest.java +++ b/src/test/java/examples/springbatch/paging/SpringBatchPagingTest.java @@ -17,7 +17,8 @@ import static examples.springbatch.mapper.PersonDynamicSqlSupport.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.count; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; diff --git a/src/test/java/issues/gh100/FromGroupByTest.java b/src/test/java/issues/gh100/FromGroupByTest.java index 07b8ccd91..0831428cc 100644 --- a/src/test/java/issues/gh100/FromGroupByTest.java +++ b/src/test/java/issues/gh100/FromGroupByTest.java @@ -16,7 +16,8 @@ package issues.gh100; import static org.assertj.core.api.Assertions.assertThat; -import static org.mybatis.dynamic.sql.SqlBuilder.*; +import static org.mybatis.dynamic.sql.SqlBuilder.count; +import static org.mybatis.dynamic.sql.SqlBuilder.select; import org.junit.jupiter.api.Test; import org.mybatis.dynamic.sql.render.RenderingStrategies; diff --git a/src/test/java/issues/gh655/Gh655Test.java b/src/test/java/issues/gh655/Gh655Test.java index f7b865d52..230170696 100644 --- a/src/test/java/issues/gh655/Gh655Test.java +++ b/src/test/java/issues/gh655/Gh655Test.java @@ -17,10 +17,10 @@ import static examples.mariadb.ItemsDynamicSQLSupport.id; import static examples.mariadb.ItemsDynamicSQLSupport.items; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mybatis.dynamic.sql.SqlBuilder.add; import static org.mybatis.dynamic.sql.SqlBuilder.constant; -import static org.assertj.core.api.Assertions.assertThat; import static org.mybatis.dynamic.sql.SqlBuilder.isEqualToWhenPresent; import static org.mybatis.dynamic.sql.SqlBuilder.isGreaterThan; import static org.mybatis.dynamic.sql.SqlBuilder.select; diff --git a/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java b/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java index 933116b84..92aa57003 100644 --- a/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java +++ b/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java @@ -29,6 +29,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; +import org.mybatis.dynamic.sql.common.OrderByModel; import org.mybatis.dynamic.sql.exception.DynamicSqlException; import org.mybatis.dynamic.sql.exception.InvalidSqlException; import org.mybatis.dynamic.sql.insert.BatchInsertModel; @@ -40,7 +41,6 @@ import org.mybatis.dynamic.sql.render.RenderingStrategies; import org.mybatis.dynamic.sql.render.TableAliasCalculator; import org.mybatis.dynamic.sql.select.GroupByModel; -import org.mybatis.dynamic.sql.common.OrderByModel; import org.mybatis.dynamic.sql.select.PagingModel; import org.mybatis.dynamic.sql.select.QueryExpressionModel; import org.mybatis.dynamic.sql.select.SelectModel; diff --git a/src/test/java/org/mybatis/dynamic/sql/update/UpdateStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/update/UpdateStatementTest.java index 59640f3cd..760c9ab77 100644 --- a/src/test/java/org/mybatis/dynamic/sql/update/UpdateStatementTest.java +++ b/src/test/java/org/mybatis/dynamic/sql/update/UpdateStatementTest.java @@ -218,4 +218,3 @@ void testUpdateSelectStatement() { ); } } -