Skip to content

Commit b6fddaa

Browse files
refactor: Use :param k => v format for tracing named parameters.
Closes #2519.
1 parent c51f90f commit b6fddaa

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed

src/main/java/org/springframework/data/neo4j/core/NamedParameters.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public boolean isEmpty() {
134134

135135
@Override
136136
public String toString() {
137-
return parameters.entrySet().stream().map(e -> String.format("%s: %s", e.getKey(), formatValue(e.getValue())))
138-
.collect(Collectors.joining(", ", ":params {", "}"));
137+
return parameters.entrySet().stream().map(e -> String.format(":param %s => %s", e.getKey(), formatValue(e.getValue())))
138+
.collect(Collectors.joining(System.lineSeparator()));
139139
}
140140

141141
@Nullable

src/test/java/org/springframework/data/neo4j/core/NamedParametersTest.java

+21-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ void shouldConvertCorrectListOfParametersIntoMap() {
4141
namedParameters.add("b", "Something");
4242
namedParameters.add("c", null);
4343

44-
assertThat(namedParameters.get()).containsEntry("a", 1).containsEntry("b", "Something").containsEntry("c", null);
44+
assertThat(namedParameters.get()).containsEntry("a", 1).containsEntry("b", "Something")
45+
.containsEntry("c", null);
4546
}
4647

4748
@Test
@@ -100,7 +101,7 @@ void shouldEscapeStrings() {
100101
NamedParameters p = new NamedParameters();
101102
p.add("aKey", "A fancy\\ value");
102103

103-
assertThat(p.toString()).isEqualTo(":params {aKey: 'A fancy\\\\ value'}");
104+
assertThat(p.toString()).isEqualTo(":param aKey => 'A fancy\\\\ value'");
104105
}
105106

106107
@Test
@@ -109,7 +110,7 @@ void shouldDealWithNullValues() {
109110
NamedParameters p = new NamedParameters();
110111
p.add("aKey", null);
111112

112-
assertThat(p.toString()).isEqualTo(":params {aKey: null}");
113+
assertThat(p.toString()).isEqualTo(":param aKey => null");
113114
}
114115

115116
@Test
@@ -122,7 +123,11 @@ void shouldDealWithMaps() {
122123
NamedParameters p = new NamedParameters();
123124
p.add("aKey", outer);
124125

125-
assertThat(p.toString()).isEqualTo(":params {aKey: {oma: 'Something', omb: {ims: 'Something else'}}}");
126+
String[] output = p.toString().split(System.lineSeparator());
127+
assertThat(output)
128+
.containsExactly(
129+
":param aKey => {oma: 'Something', omb: {ims: 'Something else'}}"
130+
);
126131
}
127132

128133
@Test
@@ -136,8 +141,11 @@ void shouldDealWithNestedMaps() {
136141
NamedParameters p = new NamedParameters();
137142
p.add("aKey", outer);
138143

139-
assertThat(p.toString()).isEqualTo(
140-
":params {aKey: {oma: 'Something', omb: {ims: {imi: 'Embedded Thing'}}, omc: {ims: 'Something else'}}}");
144+
String[] output = p.toString().split(System.lineSeparator());
145+
assertThat(output)
146+
.containsExactly(
147+
":param aKey => {oma: 'Something', omb: {ims: {imi: 'Embedded Thing'}}, omc: {ims: 'Something else'}}"
148+
);
141149
}
142150

143151
@Test
@@ -149,8 +157,13 @@ void shouldDealWithLists() {
149157
p.add("m", Arrays.asList(
150158
Collections.singletonMap("a", "av"), Collections.singletonMap("b", Arrays.asList("A", "b"))));
151159

152-
assertThat(p.toString())
153-
.isEqualTo(":params {a: ['Something', 'Else'], l: [1, 2, 3], m: [{a: 'av'}, {b: ['A', 'b']}]}");
160+
String[] output = p.toString().split(System.lineSeparator());
161+
assertThat(output)
162+
.containsExactly(
163+
":param a => ['Something', 'Else']",
164+
":param l => [1, 2, 3]",
165+
":param m => [{a: 'av'}, {b: ['A', 'b']}]"
166+
);
154167
}
155168
}
156169
}

0 commit comments

Comments
 (0)