Skip to content

Commit 5c01b9c

Browse files
michael-simonsmeistermeier
michael-simons
authored and
meistermeier
committed
Replace most string concatenations in tests with text blocks.
1 parent bcf7e85 commit 5c01b9c

14 files changed

+479
-387
lines changed

‎src/test/java/org/springframework/data/neo4j/core/Neo4jClientTest.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,11 @@ void queryCreationShouldFeelGood() {
232232
parameters.put("bikeName", "M.*");
233233
parameters.put("location", "Sweden");
234234

235-
String cypher = ""
236-
+ "MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike) - [:USED_ON] -> (t:Trip) "
237-
+ "WHERE t.takenOn > $aDate " + " AND b.name =~ $bikeName " + " AND t.location = $location "
238-
+ "RETURN b";
235+
String cypher = """
236+
MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike) - [:USED_ON] -> (t:Trip)\s
237+
WHERE t.takenOn > $aDate AND b.name =~ $bikeName AND t.location = $location\s
238+
RETURN b
239+
""";
239240

240241
Collection<Map<String, Object>> usedBikes = client.query(cypher).bind("michael").to("name").bindAll(parameters)
241242
.bind(LocalDate.of(2019, 1, 1)).to("aDate").fetch().all();
@@ -244,8 +245,7 @@ void queryCreationShouldFeelGood() {
244245

245246
verifyDatabaseSelection(null);
246247

247-
Map<String, Object> expectedParameters = new HashMap<>();
248-
expectedParameters.putAll(parameters);
248+
Map<String, Object> expectedParameters = new HashMap<>(parameters);
249249
expectedParameters.put("name", "michael");
250250
expectedParameters.put("aDate", LocalDate.of(2019, 1, 1));
251251
verify(session).run(eq(cypher), MockitoHamcrest.argThat(new MapAssertionMatcher(expectedParameters)));
@@ -409,7 +409,7 @@ void reading() {
409409

410410
Neo4jClient client = Neo4jClient.create(driver);
411411

412-
String cypher = "MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike)" + "RETURN o, collect(b) as bikes";
412+
String cypher = "MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike) RETURN o, collect(b) as bikes";
413413

414414
BikeOwnerReader mappingFunction = new BikeOwnerReader();
415415
Collection<BikeOwner> bikeOwners = client.query(cypher).bind("michael").to("name").fetchAs(BikeOwner.class)
@@ -470,8 +470,11 @@ void writing() {
470470
Neo4jClient client = Neo4jClient.create(driver);
471471

472472
BikeOwner michael = new BikeOwner("Michael", Arrays.asList(new Bike("Road"), new Bike("MTB")));
473-
String cypher = "MERGE (u:User {name: 'Michael'}) " + "WITH u UNWIND $bikes as bike "
474-
+ "MERGE (b:Bike {name: bike}) " + "MERGE (u) - [o:OWNS] -> (b) ";
473+
String cypher = """
474+
MERGE (u:User {name: 'Michael'})
475+
WITH u UNWIND $bikes as bike
476+
MERGE (b:Bike {name: bike}) MERGE (u) - [o:OWNS] -> (b)
477+
""";
475478
ResultSummary summary = client.query(cypher).bind(michael).with(new BikeOwnerBinder()).run();
476479

477480
verifyDatabaseSelection(null);

‎src/test/java/org/springframework/data/neo4j/core/ReactiveNeo4jClientTest.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,12 @@ void queryCreationShouldFeelGood() {
230230
parameters.put("bikeName", "M.*");
231231
parameters.put("location", "Sweden");
232232

233-
String cypher = "MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike) - [:USED_ON] -> (t:Trip) "
234-
+ "WHERE t.takenOn > $aDate " + " AND b.name =~ $bikeName " + " AND t.location = $location " + "RETURN b";
233+
String cypher = """
234+
MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike) - [:USED_ON] -> (t:Trip)
235+
WHERE t.takenOn > $aDate
236+
AND b.name =~ $bikeName
237+
AND t.location = $location RETURN b
238+
""";
235239

236240
Flux<Map<String, Object>> usedBikes = client.query(cypher).bind("michael").to("name").bindAll(parameters)
237241
.bind(LocalDate.of(2019, 1, 1)).to("aDate").fetch().all();
@@ -408,7 +412,7 @@ void reading() {
408412

409413
ReactiveNeo4jClient client = ReactiveNeo4jClient.create(driver);
410414

411-
String cypher = "MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike)" + "RETURN o, collect(b) as bikes";
415+
String cypher = "MATCH (o:User {name: $name}) - [:OWNS] -> (b:Bike) RETURN o, collect(b) as bikes";
412416

413417
Neo4jClientTest.BikeOwnerReader mappingFunction = new Neo4jClientTest.BikeOwnerReader();
414418
Flux<Neo4jClientTest.BikeOwner> bikeOwners = client.query(cypher).bind("michael").to("name")
@@ -475,8 +479,7 @@ void writing() {
475479

476480
Neo4jClientTest.BikeOwner michael = new Neo4jClientTest.BikeOwner("Michael",
477481
Arrays.asList(new Neo4jClientTest.Bike("Road"), new Neo4jClientTest.Bike("MTB")));
478-
String cypher = "MERGE (u:User {name: 'Michael'}) " + "WITH u UNWIND $bikes as bike "
479-
+ "MERGE (b:Bike {name: bike}) " + "MERGE (u) - [o:OWNS] -> (b) ";
482+
String cypher = "MERGE (u:User {name: 'Michael'}) WITH u UNWIND $bikes as bike MERGE (b:Bike {name: bike}) MERGE (u) - [o:OWNS] -> (b) ";
480483

481484
Mono<ResultSummary> summary = client.query(cypher).bind(michael).with(new Neo4jClientTest.BikeOwnerBinder())
482485
.run();

‎src/test/java/org/springframework/data/neo4j/documentation/spring_boot/ReactiveTemplateExampleTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ static void neo4jProperties(DynamicPropertyRegistry registry) {
6161
void shouldSaveAndReadEntities(@Autowired ReactiveNeo4jTemplate neo4jTemplate) {
6262

6363
MovieEntity movie = new MovieEntity("The Love Bug",
64-
"A movie that follows the adventures of Herbie, Herbie's driver, "
65-
+ "Jim Douglas (Dean Jones), and Jim's love interest, " + "Carole Bennett (Michele Lee)");
64+
"A movie that follows the adventures of Herbie, Herbie's driver, Jim Douglas (Dean Jones), and Jim's love interest, Carole Bennett (Michele Lee)");
6665

6766
Roles role1 = new Roles(new PersonEntity(1931, "Dean Jones"), Collections.singletonList("Didi"));
6867
Roles role2 = new Roles(new PersonEntity(1942, "Michele Lee"), Collections.singletonList("Michi"));

‎src/test/java/org/springframework/data/neo4j/integration/imperative/DynamicLabelsIT.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@ class EntityWithSingleStaticLabelAndAssignedId extends SpringTestBase {
208208

209209
@Override
210210
Long createTestEntity(Transaction transaction) {
211-
Record r = transaction.run("" + "CREATE (e:SimpleDynamicLabelsWithBusinessId:Foo:Bar:Baz:Foobar {id: 'E1'}) "
212-
+ "RETURN id(e) as existingEntityId").single();
211+
Record r = transaction.run("""
212+
CREATE (e:SimpleDynamicLabelsWithBusinessId:Foo:Bar:Baz:Foobar {id: 'E1'})
213+
RETURN id(e) as existingEntityId
214+
""").single();
213215
long newId = r.get("existingEntityId").asLong();
214216
transaction.commit();
215217
return newId;
@@ -300,9 +302,7 @@ class EntityWithSingleStaticLabelAssignedIdAndVersion extends SpringTestBase {
300302

301303
@Override
302304
Long createTestEntity(Transaction transaction) {
303-
Record r = transaction.run(
304-
"" + "CREATE (e:SimpleDynamicLabelsWithBusinessIdAndVersion:Foo:Bar:Baz:Foobar {id: 'E2', myVersion: 0}) "
305-
+ "RETURN id(e) as existingEntityId")
305+
Record r = transaction.run("CREATE (e:SimpleDynamicLabelsWithBusinessIdAndVersion:Foo:Bar:Baz:Foobar {id: 'E2', myVersion: 0}) RETURN id(e) as existingEntityId")
306306
.single();
307307
long newId = r.get("existingEntityId").asLong();
308308
transaction.commit();
@@ -352,7 +352,7 @@ class ConstructorInitializedEntity extends SpringTestBase {
352352
@Override
353353
Long createTestEntity(Transaction transaction) {
354354
Record r = transaction
355-
.run("" + "CREATE (e:SimpleDynamicLabelsCtor:Foo:Bar:Baz:Foobar) " + "RETURN id(e) as existingEntityId")
355+
.run("CREATE (e:SimpleDynamicLabelsCtor:Foo:Bar:Baz:Foobar) RETURN id(e) as existingEntityId")
356356
.single();
357357
long newId = r.get("existingEntityId").asLong();
358358
transaction.commit();
@@ -375,7 +375,7 @@ class ClassesWithAdditionalLabels extends SpringTestBase {
375375
@Override
376376
Long createTestEntity(Transaction transaction) {
377377
Record r = transaction
378-
.run("" + "CREATE (e:SimpleDynamicLabels:Foo:Bar:Baz:Foobar) " + "RETURN id(e) as existingEntityId").single();
378+
.run("CREATE (e:SimpleDynamicLabels:Foo:Bar:Baz:Foobar) RETURN id(e) as existingEntityId").single();
379379
long newId = r.get("existingEntityId").asLong();
380380
transaction.commit();
381381
return newId;
@@ -419,8 +419,7 @@ class ClassesWithAdditionalLabelsInInheritanceTree extends SpringTestBase {
419419

420420
@Override
421421
Long createTestEntity(Transaction transaction) {
422-
Record r = transaction.run(
423-
"" + "CREATE (e:DynamicLabelsBaseClass:ExtendedBaseClass1:D1:D2:D3) " + "RETURN id(e) as existingEntityId")
422+
Record r = transaction.run("CREATE (e:DynamicLabelsBaseClass:ExtendedBaseClass1:D1:D2:D3) RETURN id(e) as existingEntityId")
424423
.single();
425424
long newId = r.get("existingEntityId").asLong();
426425
transaction.commit();

‎src/test/java/org/springframework/data/neo4j/integration/imperative/DynamicRelationshipsIT.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,11 @@ void shouldWriteDynamicRelationships(@Autowired PersonWithRelativesRepository re
216216

217217
try (Transaction transaction = driver.session().beginTransaction()) {
218218
long numberOfRelations = transaction
219-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
220-
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
219+
.run(("MATCH (t:%s) WHERE id(t) = $id RETURN size((t)-->(:Person)) as numberOfRelations").formatted(labelOfTestSubject), Values.parameters("id", newPerson.getId()))
221220
.single().get("numberOfRelations").asLong();
222221
assertThat(numberOfRelations).isEqualTo(2L);
223222
numberOfRelations = transaction
224-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
225-
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
223+
.run(("MATCH (t:%s) WHERE id(t) = $id RETURN size((t)-->(:Club)) as numberOfRelations").formatted(labelOfTestSubject), Values.parameters("id", newPerson.getId()))
226224
.single().get("numberOfRelations").asLong();
227225
assertThat(numberOfRelations).isEqualTo(2L);
228226
}
@@ -264,13 +262,13 @@ void shouldWriteDynamicCollectionRelationships(@Autowired PersonWithRelativesRep
264262

265263
try (Transaction transaction = driver.session().beginTransaction()) {
266264
long numberOfRelations = transaction
267-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
268-
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
265+
.run(("MATCH (t:%s) WHERE id(t) = $id RETURN size((t)-->(:Pet)) as numberOfRelations").formatted(labelOfTestSubject),
266+
Values.parameters("id", newPerson.getId()))
269267
.single().get("numberOfRelations").asLong();
270268
assertThat(numberOfRelations).isEqualTo(3L);
271269
numberOfRelations = transaction
272-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
273-
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
270+
.run(("MATCH (t:%s) WHERE id(t) = $id RETURN size((t)-->(:Hobby)) as numberOfRelations").formatted(labelOfTestSubject),
271+
Values.parameters("id", newPerson.getId()))
274272
.single().get("numberOfRelations").asLong();
275273
assertThat(numberOfRelations).isEqualTo(2L);
276274
}

0 commit comments

Comments
 (0)