Skip to content

Commit e15d359

Browse files
jeffgbutlerjeffgbutler
committed
Revert test changes to check backwards compatibility
1 parent 9b23570 commit e15d359

17 files changed

+92
-94
lines changed

‎src/test/java/examples/animal/data/AnimalDataTest.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ void testInCaseSensitiveCondition() {
744744

745745
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
746746
.from(animalData)
747-
.where(animalName, isInCaseInsensitive("yellow-bellied marmot", "verbet"))
747+
.where(animalName, isInCaseInsensitive("yellow-bellied marmot", "verbet", null))
748748
.build()
749749
.render(RenderingStrategies.MYBATIS3);
750750

@@ -785,6 +785,22 @@ void testNotInCaseSensitiveCondition() {
785785
}
786786
}
787787

788+
@Test
789+
void testNotInCaseSensitiveConditionWithNull() {
790+
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
791+
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
792+
793+
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
794+
.from(animalData)
795+
.where(animalName, isNotInCaseInsensitive((String)null))
796+
.build()
797+
.render(RenderingStrategies.MYBATIS3);
798+
799+
List<AnimalData> animals = mapper.selectMany(selectStatement);
800+
assertThat(animals).isEmpty();
801+
}
802+
}
803+
788804
@Test
789805
void testNotInConditionWithEventuallyEmptyList() {
790806
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {

‎src/test/java/examples/animal/data/Length.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818
import java.sql.JDBCType;
1919
import java.util.Optional;
2020

21-
import org.jspecify.annotations.NullMarked;
2221
import org.mybatis.dynamic.sql.BasicColumn;
2322
import org.mybatis.dynamic.sql.BindableColumn;
2423
import org.mybatis.dynamic.sql.render.RenderingContext;
2524
import org.mybatis.dynamic.sql.select.function.AbstractTypeConvertingFunction;
2625
import org.mybatis.dynamic.sql.util.FragmentAndParameters;
2726

28-
@NullMarked
2927
public class Length extends AbstractTypeConvertingFunction<Object, Integer, Length> {
3028
private Length(BasicColumn column) {
3129
super(column);

‎src/test/java/examples/animal/data/OptionalConditionsWithPredicatesAnimalDataTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void testAllIgnored() {
7878
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
7979
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
8080
.from(animalData)
81-
.where(id, isGreaterThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull)) // the where clause should not render
81+
.where(id, isGreaterThan(NULL_INTEGER).filter(Objects::nonNull)) // the where clause should not render
8282
.orderBy(id)
8383
.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
8484
.build()
@@ -120,7 +120,7 @@ void testIgnoredBetweenRendered() {
120120
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
121121
.from(animalData)
122122
.where(id, isEqualTo(3))
123-
.and(id, isNotEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
123+
.and(id, isNotEqualTo(NULL_INTEGER).filter(Objects::nonNull))
124124
.or(id, isEqualTo(4).filter(Objects::nonNull))
125125
.orderBy(id)
126126
.build()
@@ -141,7 +141,7 @@ void testIgnoredInWhere() {
141141
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
142142
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
143143
.from(animalData)
144-
.where(id, isLessThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
144+
.where(id, isLessThan(NULL_INTEGER).filter(Objects::nonNull))
145145
.and(id, isEqualTo(3).filter(Objects::nonNull))
146146
.or(id, isEqualTo(4).filter(Objects::nonNull))
147147
.orderBy(id)
@@ -163,10 +163,10 @@ void testManyIgnored() {
163163
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
164164
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
165165
.from(animalData)
166-
.where(id, isLessThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull), and(id, isGreaterThanOrEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull)))
167-
.and(id, isEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull), or(id, isEqualTo(3), and(id, isLessThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull))))
168-
.or(id, isEqualTo(4).filter(Objects::nonNull), and(id, isGreaterThanOrEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull)))
169-
.and(id, isNotEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
166+
.where(id, isLessThan(NULL_INTEGER).filter(Objects::nonNull), and(id, isGreaterThanOrEqualTo(NULL_INTEGER).filter(Objects::nonNull)))
167+
.and(id, isEqualTo(NULL_INTEGER).filter(Objects::nonNull), or(id, isEqualTo(3), and(id, isLessThan(NULL_INTEGER).filter(Objects::nonNull))))
168+
.or(id, isEqualTo(4).filter(Objects::nonNull), and(id, isGreaterThanOrEqualTo(NULL_INTEGER).filter(Objects::nonNull)))
169+
.and(id, isNotEqualTo(NULL_INTEGER).filter(Objects::nonNull))
170170
.orderBy(id)
171171
.build()
172172
.render(RenderingStrategies.MYBATIS3);
@@ -186,7 +186,7 @@ void testIgnoredInitialWhere() {
186186
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
187187
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
188188
.from(animalData)
189-
.where(id, isLessThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull), and(id, isEqualTo(3).filter(Objects::nonNull)))
189+
.where(id, isLessThan(NULL_INTEGER).filter(Objects::nonNull), and(id, isEqualTo(3).filter(Objects::nonNull)))
190190
.or(id, isEqualTo(4).filter(Objects::nonNull))
191191
.orderBy(id)
192192
.build()
@@ -226,7 +226,7 @@ void testEqualWhenWithoutValue() {
226226
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
227227
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
228228
.from(animalData)
229-
.where(id, isEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
229+
.where(id, isEqualTo(NULL_INTEGER).filter(Objects::nonNull))
230230
.and(id, isLessThanOrEqualTo(10))
231231
.orderBy(id)
232232
.build()
@@ -266,7 +266,7 @@ void testNotEqualWhenWithoutValue() {
266266
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
267267
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
268268
.from(animalData)
269-
.where(id, isNotEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
269+
.where(id, isNotEqualTo(NULL_INTEGER).filter(Objects::nonNull))
270270
.and(id, isLessThanOrEqualTo(10))
271271
.orderBy(id)
272272
.build()
@@ -306,7 +306,7 @@ void testGreaterThanWhenWithoutValue() {
306306
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
307307
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
308308
.from(animalData)
309-
.where(id, isGreaterThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
309+
.where(id, isGreaterThan(NULL_INTEGER).filter(Objects::nonNull))
310310
.and(id, isLessThanOrEqualTo(10))
311311
.orderBy(id)
312312
.build()
@@ -346,7 +346,7 @@ void testGreaterThanOrEqualToWhenWithoutValue() {
346346
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
347347
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
348348
.from(animalData)
349-
.where(id, isGreaterThanOrEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
349+
.where(id, isGreaterThanOrEqualTo(NULL_INTEGER).filter(Objects::nonNull))
350350
.and(id, isLessThanOrEqualTo(10))
351351
.orderBy(id)
352352
.build()
@@ -385,7 +385,7 @@ void testLessThanWhenWithoutValue() {
385385
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
386386
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
387387
.from(animalData)
388-
.where(id, isLessThanWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
388+
.where(id, isLessThan(NULL_INTEGER).filter(Objects::nonNull))
389389
.and(id, isLessThanOrEqualTo(10))
390390
.orderBy(id)
391391
.build()
@@ -424,7 +424,7 @@ void testLessThanOrEqualToWhenWithoutValue() {
424424
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
425425
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
426426
.from(animalData)
427-
.where(id, isLessThanOrEqualToWhenPresent(NULL_INTEGER).filter(Objects::nonNull))
427+
.where(id, isLessThanOrEqualTo(NULL_INTEGER).filter(Objects::nonNull))
428428
.and(id, isLessThanOrEqualTo(10))
429429
.orderBy(id)
430430
.build()
@@ -862,7 +862,7 @@ void testIsLikeCaseInsensitiveWhenWithoutValue() {
862862
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
863863
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
864864
.from(animalData)
865-
.where(animalName, isLikeCaseInsensitiveWhenPresent((String) null).filter(Objects::nonNull))
865+
.where(animalName, isLikeCaseInsensitive((String) null).filter(Objects::nonNull))
866866
.and(id, isLessThanOrEqualTo(10))
867867
.orderBy(id)
868868
.build()
@@ -902,7 +902,7 @@ void testIsNotLikeWhenWithoutValue() {
902902
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
903903
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
904904
.from(animalData)
905-
.where(animalName, isNotLikeWhenPresent((String) null).filter(Objects::nonNull))
905+
.where(animalName, isNotLike((String) null).filter(Objects::nonNull))
906906
.and(id, isLessThanOrEqualTo(10))
907907
.orderBy(id)
908908
.build()
@@ -942,7 +942,7 @@ void testIsNotLikeCaseInsensitiveWhenWithoutValue() {
942942
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
943943
SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
944944
.from(animalData)
945-
.where(animalName, isNotLikeCaseInsensitiveWhenPresent((String) null).filter(Objects::nonNull))
945+
.where(animalName, isNotLikeCaseInsensitive((String) null).filter(Objects::nonNull))
946946
.and(id, isLessThanOrEqualTo(10))
947947
.orderBy(id)
948948
.build()

‎src/test/java/examples/custom_render/JsonRenderingStrategy.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
*/
1616
package examples.custom_render;
1717

18-
import org.jspecify.annotations.NullMarked;
1918
import org.mybatis.dynamic.sql.BindableColumn;
2019
import org.mybatis.dynamic.sql.render.MyBatis3RenderingStrategy;
2120

22-
@NullMarked
2321
public class JsonRenderingStrategy extends MyBatis3RenderingStrategy {
2422

2523
@Override

‎src/test/java/examples/joins/ItemMasterDynamicSQLSupport.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717

1818
import java.sql.JDBCType;
1919

20-
import org.jspecify.annotations.NullMarked;
2120
import org.mybatis.dynamic.sql.AliasableSqlTable;
2221
import org.mybatis.dynamic.sql.SqlColumn;
2322

24-
@NullMarked
2523
public final class ItemMasterDynamicSQLSupport {
2624
public static final ItemMaster itemMaster = new ItemMaster();
2725
public static final SqlColumn<Integer> itemId = itemMaster.itemId;

‎src/test/java/examples/joins/UserDynamicSQLSupport.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717

1818
import java.sql.JDBCType;
1919

20-
import org.jspecify.annotations.NullMarked;
2120
import org.mybatis.dynamic.sql.AliasableSqlTable;
2221
import org.mybatis.dynamic.sql.SqlColumn;
2322

24-
@NullMarked
2523
public class UserDynamicSQLSupport {
2624
public static final User user = new User();
2725
public final SqlColumn<Integer> userId = user.userId;

‎src/test/java/examples/paging/LimitAndOffsetAdapter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Objects;
2121
import java.util.function.Function;
2222

23-
import org.jspecify.annotations.NullMarked;
2423
import org.mybatis.dynamic.sql.render.RenderingStrategies;
2524
import org.mybatis.dynamic.sql.select.SelectModel;
2625
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -41,7 +40,6 @@
4140
*
4241
* @author Jeff Butler
4342
*/
44-
@NullMarked
4543
public class LimitAndOffsetAdapter<R> {
4644
private final SelectModel selectModel;
4745
private final Function<SelectStatementProvider, R> mapperMethod;

‎src/test/java/examples/sharding/TableCodesDynamicSqlSupport.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717

1818
import java.sql.JDBCType;
1919

20-
import org.jspecify.annotations.NullMarked;
2120
import org.mybatis.dynamic.sql.AliasableSqlTable;
2221
import org.mybatis.dynamic.sql.SqlColumn;
2322

24-
@NullMarked
2523
public final class TableCodesDynamicSqlSupport {
2624
public static final TableCodes tableCodes = new TableCodes();
2725
public static final SqlColumn<Integer> id = tableCodes.id;

‎src/test/java/examples/spring/LastNameParameterConverter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package examples.spring;
1717

18-
import org.jspecify.annotations.Nullable;
1918
import org.mybatis.dynamic.sql.ParameterTypeConverter;
2019
import org.springframework.core.convert.converter.Converter;
2120

2221
public class LastNameParameterConverter implements ParameterTypeConverter<LastName, String>,
2322
Converter<LastName, String> {
2423
@Override
25-
public @Nullable String convert(LastName source) {
26-
return source.getName();
24+
public String convert(LastName source) {
25+
return source == null ? null : source.getName();
2726
}
2827
}

‎src/test/java/examples/spring/YesNoParameterConverter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515
*/
1616
package examples.spring;
1717

18-
import org.jspecify.annotations.NonNull;
19-
import org.jspecify.annotations.Nullable;
2018
import org.mybatis.dynamic.sql.ParameterTypeConverter;
2119

2220
public class YesNoParameterConverter implements ParameterTypeConverter<Boolean, String> {
2321

2422
@Override
25-
public @Nullable String convert(@NonNull Boolean source) {
26-
return source ? "Yes" : "No";
23+
public String convert(Boolean source) {
24+
return source == null ? null : source ? "Yes" : "No";
2725
}
2826
}

‎src/test/java/examples/type_conversion/ToBase64.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818
import java.sql.JDBCType;
1919
import java.util.Optional;
2020

21-
import org.jspecify.annotations.NullMarked;
2221
import org.mybatis.dynamic.sql.BasicColumn;
2322
import org.mybatis.dynamic.sql.BindableColumn;
2423
import org.mybatis.dynamic.sql.render.RenderingContext;
2524
import org.mybatis.dynamic.sql.select.function.AbstractTypeConvertingFunction;
2625
import org.mybatis.dynamic.sql.util.FragmentAndParameters;
2726

28-
@NullMarked
2927
public class ToBase64 extends AbstractTypeConvertingFunction<byte[], String, ToBase64> {
3028

3129
protected ToBase64(BasicColumn column) {

‎src/test/java/issues/gh105/Issue105Test.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void testFuzzyLikeFirstNameNull() {
5757

5858
SelectStatementProvider selectStatement = select(id, firstName, lastName)
5959
.from(person)
60-
.where(firstName, isLikeWhenPresent(fName).filter(Objects::nonNull).map(SearchUtils::addWildcards))
60+
.where(firstName, isLike(fName).filter(Objects::nonNull).map(SearchUtils::addWildcards))
6161
.and(lastName, isLike(lName).filter(Objects::nonNull).map(SearchUtils::addWildcards))
6262
.build()
6363
.render(RenderingStrategies.MYBATIS3);
@@ -527,7 +527,7 @@ void testBetweenTransformWithNull() {
527527

528528
SelectStatementProvider selectStatement = select(id, firstName, lastName)
529529
.from(person)
530-
.where(age, isBetweenWhenPresent(1).and((Integer) null).filter(Predicates.bothPresent()).map(i1 -> i1 + 1, i2 -> i2 + 2))
530+
.where(age, isBetween(1).and((Integer) null).filter(Predicates.bothPresent()).map(i1 -> i1 + 1, i2 -> i2 + 2))
531531
.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
532532
.build()
533533
.render(RenderingStrategies.MYBATIS3);
@@ -735,7 +735,7 @@ void testLikeCaseInsensitiveTransformWithNull() {
735735

736736
SelectStatementProvider selectStatement = select(id, firstName, lastName)
737737
.from(person)
738-
.where(firstName, isLikeCaseInsensitiveWhenPresent((String) null).filter(Objects::nonNull).map(SearchUtils::addWildcards))
738+
.where(firstName, isLikeCaseInsensitive((String) null).filter(Objects::nonNull).map(SearchUtils::addWildcards))
739739
.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
740740
.build()
741741
.render(RenderingStrategies.MYBATIS3);
@@ -863,7 +863,7 @@ void testNotLikeCaseInsensitiveTransformWithNull() {
863863

864864
SelectStatementProvider selectStatement = select(id, firstName, lastName)
865865
.from(person)
866-
.where(firstName, isNotLikeCaseInsensitiveWhenPresent((String) null).filter(Objects::nonNull).map(SearchUtils::addWildcards))
866+
.where(firstName, isNotLikeCaseInsensitive((String) null).filter(Objects::nonNull).map(SearchUtils::addWildcards))
867867
.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
868868
.build()
869869
.render(RenderingStrategies.MYBATIS3);

‎src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.MissingResourceException;
2828
import java.util.Optional;
2929

30-
import org.jspecify.annotations.Nullable;
3130
import org.junit.jupiter.api.Test;
3231
import org.mybatis.dynamic.sql.common.OrderByModel;
3332
import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
@@ -262,9 +261,9 @@ void testInvalidValueAlias() {
262261
}
263262

264263
static class TestRow {
265-
private @Nullable Integer id;
264+
private Integer id;
266265

267-
public @Nullable Integer getId() {
266+
public Integer getId() {
268267
return id;
269268
}
270269

0 commit comments

Comments
 (0)