Skip to content

Update project dependencies #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
<description>GraphQL to Cypher Mapping</description>

<dependencies>
<dependency>
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver</artifactId>
<version>4.4.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.test</groupId>
<artifactId>neo4j-harness</artifactId>
Expand All @@ -37,7 +43,7 @@
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java</artifactId>
<version>17.3</version>
<version>19.2</version>
</dependency>
<dependency>
<groupId>org.atteo</groupId>
Expand All @@ -62,12 +68,12 @@
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-dsl</artifactId>
<version>2021.4.1</version>
<version>2022.7.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.7</version>
<version>1.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -79,7 +85,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.2</version>
<version>5.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -99,12 +105,12 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.19.0</version>
<version>3.23.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
<version>2.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class CypherTestSuite(fileName: String, val neo4j: Neo4j? = null) : AsciiDocTest
is Map<*, *> -> Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.MAP)
.hasSize(expected.size)
.containsOnlyKeys(*expected.keys.toTypedArray())
.satisfies { it.forEach { (key, value) -> assertEqualIgnoreOrder(expected[key], value) } }
.satisfies(Consumer { it.forEach { (key, value) -> assertEqualIgnoreOrder(expected[key], value) } })
is Collection<*> -> {
val assertions: List<Consumer<Any>> = expected.map { e -> Consumer<Any> { a -> assertEqualIgnoreOrder(e, a) } }
Assertions.assertThat(actual).asInstanceOf(InstanceOfAssertFactories.LIST)
Expand Down
18 changes: 9 additions & 9 deletions core/src/test/resources/dynamic-property-tests.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (updatePerson:Person {
MATCH (updatePerson:Person {
id: $updatePersonId
})
SET updatePerson += {
SET updatePerson += {
`properties.foo`: $updatePersonJsonFoo,
`properties.x`: $updatePersonJsonX
}
Expand Down Expand Up @@ -165,10 +165,10 @@ mutation {
.Cypher
[source,cypher]
----
MERGE (mergePerson:Person {
MERGE (mergePerson:Person {
id: $mergePersonId
})
SET mergePerson += {
SET mergePerson += {
`properties.foo`: $mergePersonJsonFoo,
`properties.x`: $mergePersonJsonX
}
Expand Down Expand Up @@ -206,13 +206,13 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (source:Person {
MATCH (source:Person {
id: $sourceSource_id
})
MATCH (knows:Person {
MATCH (knows:Person {
id: $knowsKnows_id
})
CREATE (source)-[createKnows:KNOWS {
CREATE (source)-[createKnows:KNOWS {
`prefix.foo`: $createKnowsJsonFoo
}]->(knows)
WITH createKnows
Expand Down Expand Up @@ -250,7 +250,7 @@ mutation {
----
MATCH ()-[updateKnows:KNOWS]->()
WHERE id(updateKnows) = toInteger($updateKnows_id)
SET updateKnows += {
SET updateKnows += {
`prefix.foo`: $updateKnowsJsonFoo
}
WITH updateKnows
Expand Down Expand Up @@ -287,7 +287,7 @@ mutation {
----
MATCH ()-[mergeKnows:KNOWS]->()
WHERE id(mergeKnows) = toInteger($mergeKnows_id)
SET mergeKnows += {
SET mergeKnows += {
`prefix.foo`: $mergeKnowsJsonFoo
}
WITH mergeKnows
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/issues/gh-112.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:User {
MATCH (from:User {
uuid: $fromUuid
})
MATCH (to:User)
Expand Down
6 changes: 3 additions & 3 deletions core/src/test/resources/issues/gh-45.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Category {
MATCH (from:Category {
id: $fromId
})
MATCH (to:Category {
MATCH (to:Category {
id: $toParentCategory
})
MERGE (from)-[:PARENT_CATEGORY]->(to)
Expand Down Expand Up @@ -77,7 +77,7 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Category {
MATCH (from:Category {
id: $fromId
})
MATCH (to:Category)
Expand Down
56 changes: 28 additions & 28 deletions core/src/test/resources/movie-tests.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -788,10 +788,10 @@ mutation {
.Cypher
[source,cypher]
----
MERGE (actor:Actor {
MERGE (actor:Actor {
userId: $actorUserId
})
SET actor += {
SET actor += {
name: $actorName
}
WITH actor
Expand Down Expand Up @@ -826,7 +826,7 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Movie {
MATCH (from:Movie {
movieId: $fromMovieId
})
MATCH (to:Genre)
Expand Down Expand Up @@ -864,7 +864,7 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Movie {
MATCH (from:Movie {
movieId: $fromMovieId
})
MATCH (to:Genre)
Expand Down Expand Up @@ -902,10 +902,10 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Movie {
MATCH (from:Movie {
movieId: $fromMovieId
})
MATCH (to:Publisher {
MATCH (to:Publisher {
name: $toPublishedBy
})
MERGE (from)-[:PUBLISHED_BY]->(to)
Expand Down Expand Up @@ -941,10 +941,10 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Movie {
MATCH (from:Movie {
movieId: $fromMovieId
})
MATCH (to:Publisher {
MATCH (to:Publisher {
name: $toPublishedBy
})
MATCH (from)-[r:PUBLISHED_BY]->(to) DELETE r
Expand Down Expand Up @@ -980,7 +980,7 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:User {
MATCH (from:User {
userId: $fromUserId
})
MATCH (to:User)
Expand Down Expand Up @@ -1156,22 +1156,22 @@ CALL {
WITH userKnowsKnows ORDER BY userKnowsKnows.born ASC, userKnowsKnows.born DESC SKIP $userKnowsKnowsOffset LIMIT $userKnowsKnowsFirst
RETURN collect(userKnowsKnows {
.name,
born: {
born: {
formatted: toString(userKnowsKnows.born)
}
}) AS userKnowsKnows
}
RETURN collect(userKnows {
.name,
born: {
born: {
formatted: toString(userKnows.born)
},
knows: userKnowsKnows
}) AS userKnows
}
RETURN user {
.name,
born: {
born: {
formatted: toString(user.born)
},
knows: userKnows
Expand Down Expand Up @@ -1238,13 +1238,13 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:User {
MATCH (from:User {
userId: $fromFrom_userId
})
MATCH (to:Movie {
MATCH (to:Movie {
movieId: $toTo_movieId
})
CREATE (from)-[createRated:RATED {
CREATE (from)-[createRated:RATED {
rating: $createRatedRating
}]->(to)
WITH createRated
Expand Down Expand Up @@ -1281,7 +1281,7 @@ mutation {
----
MATCH ()-[updateRated:RATED]->()
WHERE id(updateRated) = toInteger($updateRated_id)
SET updateRated += {
SET updateRated += {
rating: $updateRatedRating
}
WITH updateRated
Expand Down Expand Up @@ -1316,7 +1316,7 @@ mutation {
.Cypher
[source,cypher]
----
MATCH (from:Genre {
MATCH (from:Genre {
name: $fromName
})
MATCH (to:Movie)
Expand Down Expand Up @@ -1355,7 +1355,7 @@ mutation {
.Cypher
[source,cypher]
----
CREATE (createUser:User:Person {
CREATE (createUser:User:Person {
userId: $createUserUserId
})
WITH createUser
Expand Down Expand Up @@ -1395,7 +1395,7 @@ query {
----
MATCH (user:User)
RETURN user {
born: {
born: {
formatted: toString(user.born),
year: user.born.year
}
Expand Down Expand Up @@ -1434,7 +1434,7 @@ MATCH (user:User)
WHERE (user.born.year = $userBornAnd1Year
AND user.born = datetime($userBornAnd2Formatted))
RETURN user {
born: {
born: {
year: user.born.year
}
} AS User
Expand Down Expand Up @@ -1469,10 +1469,10 @@ mutation {
.Cypher
[source,cypher]
----
MERGE (actor:Actor {
MERGE (actor:Actor {
userId: $actorUserId
})
SET actor += {
SET actor += {
name: $actorName,
born: datetime($actorBorn.formatted)
}
Expand Down Expand Up @@ -1511,7 +1511,7 @@ mutation {
.Cypher
[source,cypher]
----
CREATE (actor:Actor:Person {
CREATE (actor:Actor:Person {
userId: $actorUserId,
name: $actorName,
born: datetime($actorBorn.formatted)
Expand Down Expand Up @@ -1569,10 +1569,10 @@ mutation {
.Cypher
[source,cypher]
----
MERGE (actor:Actor {
MERGE (actor:Actor {
userId: $actorUserId
})
SET actor += {
SET actor += {
name: $actorName,
born: datetime($actorBorn)
}
Expand Down Expand Up @@ -1633,15 +1633,15 @@ mutation {
.Cypher
[source,cypher]
----
CREATE (actor:Actor:Person {
CREATE (actor:Actor:Person {
userId: $actorUserId,
name: $actorName,
born: datetime($actorBorn)
})
WITH actor
RETURN actor {
.name,
born: {
born: {
year: actor.born.year,
month: actor.born.month
}
Expand Down Expand Up @@ -1675,7 +1675,7 @@ mutation{
.Cypher
[source,cypher]
----
MATCH (deleteMovie:Movie {
MATCH (deleteMovie:Movie {
movieId: $deleteMovieMovieId
})
WITH deleteMovie AS toDelete, deleteMovie {
Expand Down
Loading