Spring/spring-data-r2dbc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#15 - Incorporate review feedback.

Browse Source 
Improve Javadoc. Rename parameters for more expressiveness. Replace ASCII filtering with filter Function to move actual filtering into dialects.

Original pull request: #19.
This commit is contained in:
Mark Paluch
2018-11-20 12:20:36 +01:00
parent 9700c3c087
commit 5df9b355eb
5 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkersUnitTests.java
View File

@@ -29,13 +29,18 @@ public class IndexedBindMarkersUnitTests {
@Test // gh-15
public void nextShouldIncrementBindMarker() {
BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 0).create();
String[] prefixes = { "$", "?" };
BindMarker marker1 = bindMarkers.next();
BindMarker marker2 = bindMarkers.next();
for (String prefix : prefixes) {
assertThat(marker1.getPlaceholder()).isEqualTo("$0");
assertThat(marker2.getPlaceholder()).isEqualTo("$1");
BindMarkers bindMarkers = BindMarkersFactory.indexed(prefix, 0).create();
BindMarker marker1 = bindMarkers.next();
BindMarker marker2 = bindMarkers.next();
assertThat(marker1.getPlaceholder()).isEqualTo(prefix + "0");
assertThat(marker2.getPlaceholder()).isEqualTo(prefix + "1");
}
}
@Test // gh-15

41
src/test/java/org/springframework/data/r2dbc/dialect/NamedBindMarkersUnitTests.java
View File

@@ -29,24 +29,46 @@ public class NamedBindMarkersUnitTests {
@Test // gh-15
public void nextShouldIncrementBindMarker() {
BindMarkers bindMarkers = BindMarkersFactory.named("@", "p", 32).create();
String[] prefixes = { "$", "?" };
BindMarker marker1 = bindMarkers.next();
BindMarker marker2 = bindMarkers.next();
for (String prefix : prefixes) {
assertThat(marker1.getPlaceholder()).isEqualTo("@p0");
assertThat(marker2.getPlaceholder()).isEqualTo("@p1");
BindMarkers bindMarkers = BindMarkersFactory.named(prefix, "p", 32).create();
BindMarker marker1 = bindMarkers.next();
BindMarker marker2 = bindMarkers.next();
assertThat(marker1.getPlaceholder()).isEqualTo(prefix + "p0");
assertThat(marker2.getPlaceholder()).isEqualTo(prefix + "p1");
}
}
@Test // gh-15
public void nextShouldConsiderNameHint() {
BindMarkers bindMarkers = BindMarkersFactory.named("@", "p", 32).create();
BindMarkers bindMarkers = BindMarkersFactory.named("@", "x", 32).create();
BindMarker marker1 = bindMarkers.next("foo.bar?");
BindMarker marker1 = bindMarkers.next("foo1bar");
BindMarker marker2 = bindMarkers.next();
assertThat(marker1.getPlaceholder()).isEqualTo("@p0_foobar");
assertThat(marker1.getPlaceholder()).isEqualTo("@x0foo1bar");
assertThat(marker2.getPlaceholder()).isEqualTo("@x1");
}
@Test // gh-15
public void nextShouldConsiderFilteredNameHint() {
BindMarkers bindMarkers = BindMarkersFactory.named("@", "p", 32, s -> {
return s.chars().filter(Character::isAlphabetic)
.collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append).toString();
}).create();
BindMarker marker1 = bindMarkers.next("foo1.bar?");
BindMarker marker2 = bindMarkers.next();
assertThat(marker1.getPlaceholder()).isEqualTo("@p0foobar");
assertThat(marker2.getPlaceholder()).isEqualTo("@p1");
}
@@ -57,7 +79,7 @@ public class NamedBindMarkersUnitTests {
BindMarker marker1 = bindMarkers.next("123456789");
assertThat(marker1.getPlaceholder()).isEqualTo("@p0_1234567");
assertThat(marker1.getPlaceholder()).isEqualTo("@p012345678");
}
@Test // gh-15
@@ -82,7 +104,6 @@ public class NamedBindMarkersUnitTests {
BindMarkers bindMarkers = BindMarkersFactory.named("@", "p", 32).create();
bindMarkers.next(); // ignore
bindMarkers.next().bindNull(statement, Integer.class);
verify(statement).bindNull("p1", Integer.class);