Skip to content

Commit 2174679

Browse files
Andy2003Andy2003
authored
Update project dependencies (#279)
1 parent 95a63e0 commit 2174679

File tree

18 files changed

+120
-106
lines changed

18 files changed

+120
-106
lines changed

‎core/pom.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<description>GraphQL to Cypher Mapping</description>
1616

1717
<dependencies>
18+
<dependency>
19+
<groupId>org.neo4j.driver</groupId>
20+
<artifactId>neo4j-java-driver</artifactId>
21+
<version>4.4.9</version>
22+
<scope>test</scope>
23+
</dependency>
1824
<dependency>
1925
<groupId>org.neo4j.test</groupId>
2026
<artifactId>neo4j-harness</artifactId>
@@ -37,7 +43,7 @@
3743
<dependency>
3844
<groupId>com.graphql-java</groupId>
3945
<artifactId>graphql-java</artifactId>
40-
<version>17.3</version>
46+
<version>19.2</version>
4147
</dependency>
4248
<dependency>
4349
<groupId>org.atteo</groupId>
@@ -62,12 +68,12 @@
6268
<dependency>
6369
<groupId>org.neo4j</groupId>
6470
<artifactId>neo4j-cypher-dsl</artifactId>
65-
<version>2021.4.1</version>
71+
<version>2022.7.2</version>
6672
</dependency>
6773
<dependency>
6874
<groupId>ch.qos.logback</groupId>
6975
<artifactId>logback-classic</artifactId>
70-
<version>1.2.7</version>
76+
<version>1.4.0</version>
7177
<scope>test</scope>
7278
</dependency>
7379
<dependency>
@@ -79,7 +85,7 @@
7985
<dependency>
8086
<groupId>org.junit.vintage</groupId>
8187
<artifactId>junit-vintage-engine</artifactId>
82-
<version>5.8.2</version>
88+
<version>5.9.0</version>
8389
<scope>test</scope>
8490
</dependency>
8591
</dependencies>
@@ -99,12 +105,12 @@
99105
<dependency>
100106
<groupId>org.assertj</groupId>
101107
<artifactId>assertj-core</artifactId>
102-
<version>3.19.0</version>
108+
<version>3.23.1</version>
103109
</dependency>
104110
<dependency>
105111
<groupId>org.slf4j</groupId>
106112
<artifactId>slf4j-api</artifactId>
107-
<version>1.7.32</version>
113+
<version>2.0.0</version>
108114
</dependency>
109115
</dependencies>
110116
</dependencyManagement>

‎core/src/test/kotlin/org/neo4j/graphql/utils/CypherTestSuite.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class CypherTestSuite(fileName: String, val neo4j: Neo4j? = null) : AsciiDocTest
265265
is Map<*, *> -> Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.MAP)
266266
.hasSize(expected.size)
267267
.containsOnlyKeys(*expected.keys.toTypedArray())
268-
.satisfies { it.forEach { (key, value) -> assertEqualIgnoreOrder(expected[key], value) } }
268+
.satisfies(Consumer { it.forEach { (key, value) -> assertEqualIgnoreOrder(expected[key], value) } })
269269
is Collection<*> -> {
270270
val assertions: List<Consumer<Any>> = expected.map { e -> Consumer<Any> { a -> assertEqualIgnoreOrder(e, a) } }
271271
Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.LIST)

‎core/src/test/resources/dynamic-property-tests.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ mutation {
125125
.Cypher
126126
[source,cypher]
127127
----
128-
MATCH (updatePerson:Person {
128+
MATCH (updatePerson:Person {
129129
id: $updatePersonId
130130
})
131-
SET updatePerson += {
131+
SET updatePerson += {
132132
`properties.foo`: $updatePersonJsonFoo,
133133
`properties.x`: $updatePersonJsonX
134134
}
@@ -165,10 +165,10 @@ mutation {
165165
.Cypher
166166
[source,cypher]
167167
----
168-
MERGE (mergePerson:Person {
168+
MERGE (mergePerson:Person {
169169
id: $mergePersonId
170170
})
171-
SET mergePerson += {
171+
SET mergePerson += {
172172
`properties.foo`: $mergePersonJsonFoo,
173173
`properties.x`: $mergePersonJsonX
174174
}
@@ -206,13 +206,13 @@ mutation {
206206
.Cypher
207207
[source,cypher]
208208
----
209-
MATCH (source:Person {
209+
MATCH (source:Person {
210210
id: $sourceSource_id
211211
})
212-
MATCH (knows:Person {
212+
MATCH (knows:Person {
213213
id: $knowsKnows_id
214214
})
215-
CREATE (source)-[createKnows:KNOWS {
215+
CREATE (source)-[createKnows:KNOWS {
216216
`prefix.foo`: $createKnowsJsonFoo
217217
}]->(knows)
218218
WITH createKnows
@@ -250,7 +250,7 @@ mutation {
250250
----
251251
MATCH ()-[updateKnows:KNOWS]->()
252252
WHERE id(updateKnows) = toInteger($updateKnows_id)
253-
SET updateKnows += {
253+
SET updateKnows += {
254254
`prefix.foo`: $updateKnowsJsonFoo
255255
}
256256
WITH updateKnows
@@ -287,7 +287,7 @@ mutation {
287287
----
288288
MATCH ()-[mergeKnows:KNOWS]->()
289289
WHERE id(mergeKnows) = toInteger($mergeKnows_id)
290-
SET mergeKnows += {
290+
SET mergeKnows += {
291291
`prefix.foo`: $mergeKnowsJsonFoo
292292
}
293293
WITH mergeKnows

‎core/src/test/resources/issues/gh-112.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ mutation {
132132
.Cypher
133133
[source,cypher]
134134
----
135-
MATCH (from:User {
135+
MATCH (from:User {
136136
uuid: $fromUuid
137137
})
138138
MATCH (to:User)

‎core/src/test/resources/issues/gh-45.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ mutation {
3838
.Cypher
3939
[source,cypher]
4040
----
41-
MATCH (from:Category {
41+
MATCH (from:Category {
4242
id: $fromId
4343
})
44-
MATCH (to:Category {
44+
MATCH (to:Category {
4545
id: $toParentCategory
4646
})
4747
MERGE (from)-[:PARENT_CATEGORY]->(to)
@@ -77,7 +77,7 @@ mutation {
7777
.Cypher
7878
[source,cypher]
7979
----
80-
MATCH (from:Category {
80+
MATCH (from:Category {
8181
id: $fromId
8282
})
8383
MATCH (to:Category)

‎core/src/test/resources/movie-tests.adoc

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -788,10 +788,10 @@ mutation {
788788
.Cypher
789789
[source,cypher]
790790
----
791-
MERGE (actor:Actor {
791+
MERGE (actor:Actor {
792792
userId: $actorUserId
793793
})
794-
SET actor += {
794+
SET actor += {
795795
name: $actorName
796796
}
797797
WITH actor
@@ -826,7 +826,7 @@ mutation {
826826
.Cypher
827827
[source,cypher]
828828
----
829-
MATCH (from:Movie {
829+
MATCH (from:Movie {
830830
movieId: $fromMovieId
831831
})
832832
MATCH (to:Genre)
@@ -864,7 +864,7 @@ mutation {
864864
.Cypher
865865
[source,cypher]
866866
----
867-
MATCH (from:Movie {
867+
MATCH (from:Movie {
868868
movieId: $fromMovieId
869869
})
870870
MATCH (to:Genre)
@@ -902,10 +902,10 @@ mutation {
902902
.Cypher
903903
[source,cypher]
904904
----
905-
MATCH (from:Movie {
905+
MATCH (from:Movie {
906906
movieId: $fromMovieId
907907
})
908-
MATCH (to:Publisher {
908+
MATCH (to:Publisher {
909909
name: $toPublishedBy
910910
})
911911
MERGE (from)-[:PUBLISHED_BY]->(to)
@@ -941,10 +941,10 @@ mutation {
941941
.Cypher
942942
[source,cypher]
943943
----
944-
MATCH (from:Movie {
944+
MATCH (from:Movie {
945945
movieId: $fromMovieId
946946
})
947-
MATCH (to:Publisher {
947+
MATCH (to:Publisher {
948948
name: $toPublishedBy
949949
})
950950
MATCH (from)-[r:PUBLISHED_BY]->(to) DELETE r
@@ -980,7 +980,7 @@ mutation {
980980
.Cypher
981981
[source,cypher]
982982
----
983-
MATCH (from:User {
983+
MATCH (from:User {
984984
userId: $fromUserId
985985
})
986986
MATCH (to:User)
@@ -1156,22 +1156,22 @@ CALL {
11561156
WITH userKnowsKnows ORDER BY userKnowsKnows.born ASC, userKnowsKnows.born DESC SKIP $userKnowsKnowsOffset LIMIT $userKnowsKnowsFirst
11571157
RETURN collect(userKnowsKnows {
11581158
.name,
1159-
born: {
1159+
born: {
11601160
formatted: toString(userKnowsKnows.born)
11611161
}
11621162
}) AS userKnowsKnows
11631163
}
11641164
RETURN collect(userKnows {
11651165
.name,
1166-
born: {
1166+
born: {
11671167
formatted: toString(userKnows.born)
11681168
},
11691169
knows: userKnowsKnows
11701170
}) AS userKnows
11711171
}
11721172
RETURN user {
11731173
.name,
1174-
born: {
1174+
born: {
11751175
formatted: toString(user.born)
11761176
},
11771177
knows: userKnows
@@ -1238,13 +1238,13 @@ mutation {
12381238
.Cypher
12391239
[source,cypher]
12401240
----
1241-
MATCH (from:User {
1241+
MATCH (from:User {
12421242
userId: $fromFrom_userId
12431243
})
1244-
MATCH (to:Movie {
1244+
MATCH (to:Movie {
12451245
movieId: $toTo_movieId
12461246
})
1247-
CREATE (from)-[createRated:RATED {
1247+
CREATE (from)-[createRated:RATED {
12481248
rating: $createRatedRating
12491249
}]->(to)
12501250
WITH createRated
@@ -1281,7 +1281,7 @@ mutation {
12811281
----
12821282
MATCH ()-[updateRated:RATED]->()
12831283
WHERE id(updateRated) = toInteger($updateRated_id)
1284-
SET updateRated += {
1284+
SET updateRated += {
12851285
rating: $updateRatedRating
12861286
}
12871287
WITH updateRated
@@ -1316,7 +1316,7 @@ mutation {
13161316
.Cypher
13171317
[source,cypher]
13181318
----
1319-
MATCH (from:Genre {
1319+
MATCH (from:Genre {
13201320
name: $fromName
13211321
})
13221322
MATCH (to:Movie)
@@ -1355,7 +1355,7 @@ mutation {
13551355
.Cypher
13561356
[source,cypher]
13571357
----
1358-
CREATE (createUser:User:Person {
1358+
CREATE (createUser:User:Person {
13591359
userId: $createUserUserId
13601360
})
13611361
WITH createUser
@@ -1395,7 +1395,7 @@ query {
13951395
----
13961396
MATCH (user:User)
13971397
RETURN user {
1398-
born: {
1398+
born: {
13991399
formatted: toString(user.born),
14001400
year: user.born.year
14011401
}
@@ -1434,7 +1434,7 @@ MATCH (user:User)
14341434
WHERE (user.born.year = $userBornAnd1Year
14351435
AND user.born = datetime($userBornAnd2Formatted))
14361436
RETURN user {
1437-
born: {
1437+
born: {
14381438
year: user.born.year
14391439
}
14401440
} AS User
@@ -1469,10 +1469,10 @@ mutation {
14691469
.Cypher
14701470
[source,cypher]
14711471
----
1472-
MERGE (actor:Actor {
1472+
MERGE (actor:Actor {
14731473
userId: $actorUserId
14741474
})
1475-
SET actor += {
1475+
SET actor += {
14761476
name: $actorName,
14771477
born: datetime($actorBorn.formatted)
14781478
}
@@ -1511,7 +1511,7 @@ mutation {
15111511
.Cypher
15121512
[source,cypher]
15131513
----
1514-
CREATE (actor:Actor:Person {
1514+
CREATE (actor:Actor:Person {
15151515
userId: $actorUserId,
15161516
name: $actorName,
15171517
born: datetime($actorBorn.formatted)
@@ -1569,10 +1569,10 @@ mutation {
15691569
.Cypher
15701570
[source,cypher]
15711571
----
1572-
MERGE (actor:Actor {
1572+
MERGE (actor:Actor {
15731573
userId: $actorUserId
15741574
})
1575-
SET actor += {
1575+
SET actor += {
15761576
name: $actorName,
15771577
born: datetime($actorBorn)
15781578
}
@@ -1633,15 +1633,15 @@ mutation {
16331633
.Cypher
16341634
[source,cypher]
16351635
----
1636-
CREATE (actor:Actor:Person {
1636+
CREATE (actor:Actor:Person {
16371637
userId: $actorUserId,
16381638
name: $actorName,
16391639
born: datetime($actorBorn)
16401640
})
16411641
WITH actor
16421642
RETURN actor {
16431643
.name,
1644-
born: {
1644+
born: {
16451645
year: actor.born.year,
16461646
month: actor.born.month
16471647
}
@@ -1675,7 +1675,7 @@ mutation{
16751675
.Cypher
16761676
[source,cypher]
16771677
----
1678-
MATCH (deleteMovie:Movie {
1678+
MATCH (deleteMovie:Movie {
16791679
movieId: $deleteMovieMovieId
16801680
})
16811681
WITH deleteMovie AS toDelete, deleteMovie {

0 commit comments

Comments
 (0)