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

Support ResultSummaries with Notifications with no InputPosition reported by the driver. (#2822)

Browse Source
This commit is contained in:
Mario Ellebrecht
2023-11-17 10:01:09 +01:00
committed by Michael Simons
parent 9ae846660f
commit c94858f5be
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/neo4j/core/ResultSummaries.java
View File

@@ -111,13 +111,14 @@ final class ResultSummaries {
static String format(Notification notification, String forQuery) {
InputPosition position = notification.position();
boolean hasPosition = position != null;
StringBuilder queryHint = new StringBuilder();
String[] lines = forQuery.split("(\r\n|\n)");
for (int i = 0; i < lines.length; i++) {
String line = lines[i];
queryHint.append("\t").append(line).append(LINE_SEPARATOR);
if (i + 1 == position.line()) {
if (hasPosition && i + 1 == position.line()) {
queryHint.append("\t").append(Stream.generate(() -> " ").limit(position.column() - 1)
.collect(Collectors.joining())).append("^").append(System.lineSeparator());
}

17
src/test/java/org/springframework/data/neo4j/core/ResultSummariesTest.java
View File

@@ -54,17 +54,24 @@ class ResultSummariesTest {
+ "\tmatch (n) " + LINE_SEPARATOR
+ "\t- [r:FOO*] -> (m) " + LINE_SEPARATOR
+ "\t^" + LINE_SEPARATOR
+ "\tRETURN r" + LINE_SEPARATOR)
+ "\tRETURN r" + LINE_SEPARATOR),
Arguments.of("match (n) - [r] -> (m) RETURN r", null, null, ""
+ "\tmatch (n) - [r] -> (m) RETURN r" + LINE_SEPARATOR)
);
}
@ParameterizedTest(name = "{index}: Notifications for \"{0}\"")
@MethodSource("params")
void shouldFormatNotifications(String query, int line, int column, String expected) {
void shouldFormatNotifications(String query, Integer line, Integer column, String expected) {
InputPosition inputPosition = mock(InputPosition.class);
when(inputPosition.line()).thenReturn(line);
when(inputPosition.column()).thenReturn(column);
InputPosition inputPosition;
if (line == null || column == null) {
inputPosition = null;
} else {
inputPosition = mock(InputPosition.class);
when(inputPosition.line()).thenReturn(line);
when(inputPosition.column()).thenReturn(column);
}
Notification notification = mock(Notification.class);
when(notification.severity()).thenReturn("WARNING");