Skip to content

Commit 1d43138

Browse files
jeffgbutlerjeffgbutler
committed
Updates after merge
1 parent 70f5ed4 commit 1d43138

File tree

5 files changed

+19
-47
lines changed

5 files changed

+19
-47
lines changed

‎src/test/java/examples/r2dbc/raw/ConnectionFactoryExtensions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public Mono<Long> delete(DeleteStatementProvider deleteStatement) {
6767
}
6868

6969
/**
70-
* This is from https://github.com/eugenp/tutorials/tree/master/persistence-modules/r2dbc.
70+
* This is from <a href="https://github.com/eugenp/tutorials/tree/master/persistence-modules/r2dbc">...</a>.
7171
*
7272
* Not sure why we need it.
7373
*/

‎src/test/java/examples/r2dbc/raw/R2DBCUtils.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,7 @@ private static Statement createStatement(Connection connection, String sql, Map<
3333
// change this to use the bindings rather than the parameter map
3434
Statement statement = connection.createStatement(sql);
3535

36-
parameters.forEach((k, v) -> {
37-
if (v == null) {
38-
// TODO - change to class from parameter binding
39-
statement.bindNull(k, Double.class);
40-
} else {
41-
statement.bind(k, v);
42-
}
43-
});
36+
parameters.forEach(statement::bind);
4437

4538
return statement;
4639
}

‎src/test/java/examples/r2dbc/raw/RawR2DBCTest.java‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ private AnimalData rowMapper(Row row, RowMetadata rowMetadata) {
6464
Double bodyWeight = row.get("body_weight", Double.class);
6565
Double brainWeight = row.get("brain_weight", Double.class);
6666

67-
AnimalData animal = new AnimalData();
68-
animal.setId(id);
69-
animal.setAnimalName(animalName);
70-
animal.setBodyWeight(bodyWeight);
71-
animal.setBrainWeight(brainWeight);
67+
AnimalData animal = new AnimalData(id, animalName, bodyWeight, brainWeight);
7268
return animal;
7369
}
7470

@@ -94,7 +90,7 @@ void testSelectAllRows() {
9490
List<AnimalData> animals = connectionFactory.selectMany(selectStatement, this::rowMapper).collectList().block();
9591

9692
assertThat(animals).hasSize(65);
97-
assertThat(animals.get(0).getId()).isEqualTo(1);
93+
assertThat(animals.get(0).id()).isEqualTo(1);
9894
}
9995

10096
@Test
@@ -106,7 +102,7 @@ void testSelectAllRowsWithOrder() {
106102
.render(H2_R2DBC);
107103
List<AnimalData> animals = connectionFactory.selectMany(selectStatement, this::rowMapper).collectList().block();
108104
assertThat(animals).hasSize(65);
109-
assertThat(animals.get(0).getId()).isEqualTo(65);
105+
assertThat(animals.get(0).id()).isEqualTo(65);
110106
}
111107

112108
@Test
@@ -119,7 +115,7 @@ void testSelectAllRowsAllColumnsWithOrder() {
119115
List<AnimalData> animals = connectionFactory.selectMany(selectStatement, this::rowMapper).collectList().block();
120116
assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id DESC");
121117
assertThat(animals).hasSize(65);
122-
assertThat(animals.get(0).getId()).isEqualTo(65);
118+
assertThat(animals.get(0).id()).isEqualTo(65);
123119
}
124120

125121
@Test
@@ -132,7 +128,7 @@ void testSelectAllRowsAllColumnsWithOrderAndAlias() {
132128
List<AnimalData> animals = connectionFactory.selectMany(selectStatement, this::rowMapper).collectList().block();
133129
assertThat(selectStatement.getSelectStatement()).isEqualTo("select ad.* from AnimalData ad order by id DESC");
134130
assertThat(animals).hasSize(65);
135-
assertThat(animals.get(0).getId()).isEqualTo(65);
131+
assertThat(animals.get(0).id()).isEqualTo(65);
136132
}
137133

138134
@Test
@@ -1369,13 +1365,13 @@ void testUpdateValueOrNullWithNull() {
13691365
@DirtiesContext
13701366
void testUpdateValueWithNull() {
13711367
UpdateStatementProvider updateStatement = update(animalData)
1372-
.set(animalName).equalTo((String) null)
1368+
.set(animalName).equalToNull()
13731369
.where(id, isEqualTo(1))
13741370
.build()
13751371
.render(H2_R2DBC);
13761372

13771373
assertThat(updateStatement.getUpdateStatement()).isEqualTo(
1378-
"update AnimalData set animal_name = $1 where id = $2");
1374+
"update AnimalData set animal_name = null where id = $1");
13791375
Long rows = connectionFactory.update(updateStatement).block();
13801376
assertThat(rows).isEqualTo(1);
13811377
}
@@ -1428,16 +1424,10 @@ void testUpdateValueWithNull() {
14281424
@Test
14291425
void testMultipleInsert() {
14301426
List<AnimalData> records = new ArrayList<>();
1431-
AnimalData record = new AnimalData();
1432-
record.setId(100);
1433-
record.setAnimalName("Old Shep");
1434-
record.setBodyWeight(22.5);
1427+
AnimalData record = new AnimalData(100, "Old Shep", -1, 22.5);
14351428
records.add(record);
14361429

1437-
record = new AnimalData();
1438-
record.setId(101);
1439-
record.setAnimalName("Old Dan");
1440-
record.setBodyWeight(22.5);
1430+
record = new AnimalData(100, "Old Dan", -1, 22.5);
14411431
records.add(record);
14421432

14431433
MultiRowInsertModel<AnimalData> multiRowInsert = insertMultiple(records)
@@ -1449,22 +1439,16 @@ record = new AnimalData();
14491439
.build();
14501440

14511441
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> multiRowInsert.render(H2_R2DBC))
1452-
.withMessage(Messages.getString("ERROR.44"));
1442+
.withMessage(Messages.getString("ERROR.51"));
14531443
}
14541444

14551445
@Test
14561446
void testBatchInsert() {
14571447
List<AnimalData> records = new ArrayList<>();
1458-
AnimalData record = new AnimalData();
1459-
record.setId(100);
1460-
record.setAnimalName("Old Shep");
1461-
record.setBodyWeight(22.5);
1448+
AnimalData record = new AnimalData(100, "Old Shep", -1, 22.5);
14621449
records.add(record);
14631450

1464-
record = new AnimalData();
1465-
record.setId(101);
1466-
record.setAnimalName("Old Dan");
1467-
record.setBodyWeight(22.5);
1451+
record = new AnimalData(101, "Old Dan", -1, 22.5);
14681452
records.add(record);
14691453

14701454
BatchInsertModel<AnimalData> batchInsert = insertBatch(records)
@@ -1476,7 +1460,7 @@ record = new AnimalData();
14761460
.build();
14771461

14781462
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> batchInsert.render(H2_R2DBC))
1479-
.withMessage(Messages.getString("ERROR.44"));
1463+
.withMessage(Messages.getString("ERROR.51"));
14801464
}
14811465

14821466
// @Test

‎src/test/java/examples/r2dbc/spring/SpringR2dbcTest.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void testSelect() {
5353
.block();
5454

5555
assertThat(animals).hasSize(65);
56-
assertThat(animals.get(0).getId()).isEqualTo(1);
56+
assertThat(animals.get(0).id()).isEqualTo(1);
5757
}
5858

5959
@Test
@@ -146,11 +146,6 @@ private AnimalData rowMapper(Row row, RowMetadata rowMetadata) {
146146
Double bodyWeight = row.get("body_weight", Double.class);
147147
Double brainWeight = row.get("brain_weight", Double.class);
148148

149-
AnimalData animal = new AnimalData();
150-
animal.setId(id);
151-
animal.setAnimalName(animalName);
152-
animal.setBodyWeight(bodyWeight);
153-
animal.setBrainWeight(brainWeight);
154-
return animal;
149+
return new AnimalData(id, animalName, bodyWeight, brainWeight);
155150
}
156151
}

‎src/test/java/org/mybatis/dynamic/sql/render/AbstractR2DBCRenderingStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
public abstract class AbstractR2DBCRenderingStrategy extends RenderingStrategy{
1616
@Override
1717
public final String getRecordBasedInsertBinding(BindableColumn<?> column, String parameterName) {
18-
throw new UnsupportedOperationException(Messages.getString("ERROR.44")); //$NON-NLS-1$
18+
throw new UnsupportedOperationException(Messages.getString("ERROR.51")); //$NON-NLS-1$
1919
}
2020

2121
@Override
2222
public final String getRecordBasedInsertBinding(BindableColumn<?> column, String prefix, String parameterName) {
23-
throw new UnsupportedOperationException(Messages.getString("ERROR.44")); //$NON-NLS-1$
23+
throw new UnsupportedOperationException(Messages.getString("ERROR.51")); //$NON-NLS-1$
2424
}
2525
}

0 commit comments

Comments
 (0)