diff --git a/.github/project.yml b/.github/project.yml
index 14e242e..e8fca3f 100644
--- a/.github/project.yml
+++ b/.github/project.yml
@@ -1,4 +1,4 @@
release:
current-version: 2.2.7
- next-version: 2.2.8-SNAPSHOT
+ next-version: 3.0.0-SNAPSHOT
diff --git a/deployment/pom.xml b/deployment/pom.xml
index 095c283..fa8d0b2 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -4,7 +4,7 @@
io.quarkiverse.neo4j
quarkus-neo4j-parent
- 2.2.8-SNAPSHOT
+ 3.0.0-SNAPSHOT
quarkus-neo4j-deployment
Quarkus - Neo4j - Deployment
diff --git a/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java b/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java
index 677de3e..0081cdc 100644
--- a/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java
+++ b/deployment/src/test/java/io/quarkus/neo4j/deployment/Neo4jDevModeTests.java
@@ -10,7 +10,7 @@
import java.util.function.Predicate;
import java.util.logging.LogRecord;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
index 27a1fe6..0822aca 100644
--- a/docs/modules/ROOT/pages/includes/attributes.adoc
+++ b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,4 +1,4 @@
-:quarkus-version: 2.16.6.Final
+:quarkus-version: 3.0.0.Final
:quarkus-neo4j-version: 2.2.7
:maven-version: 3.8.1+
diff --git a/docs/pom.xml b/docs/pom.xml
index 238d620..b014a3a 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -4,7 +4,7 @@
io.quarkiverse.neo4j
quarkus-neo4j-parent
- 2.2.8-SNAPSHOT
+ 3.0.0-SNAPSHOT
../pom.xml
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7a703e4..c066ecd 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -4,7 +4,7 @@
io.quarkiverse.neo4j
quarkus-neo4j-parent
- 2.2.8-SNAPSHOT
+ 3.0.0-SNAPSHOT
quarkus-neo4j-integration-tests
Quarkus - Neo4j - Integration Tests
diff --git a/integration-tests/src/main/java/io/quarkus/it/neo4j/FruitResource.java b/integration-tests/src/main/java/io/quarkus/it/neo4j/FruitResource.java
index 9a10c06..6896b08 100644
--- a/integration-tests/src/main/java/io/quarkus/it/neo4j/FruitResource.java
+++ b/integration-tests/src/main/java/io/quarkus/it/neo4j/FruitResource.java
@@ -7,17 +7,17 @@
import java.util.concurrent.CompletionException;
import java.util.concurrent.CompletionStage;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
import org.eclipse.microprofile.context.ThreadContext;
import org.neo4j.driver.Driver;
diff --git a/integration-tests/src/main/java/io/quarkus/it/neo4j/Neo4jResource.java b/integration-tests/src/main/java/io/quarkus/it/neo4j/Neo4jResource.java
index 9ab23b7..181ebb9 100644
--- a/integration-tests/src/main/java/io/quarkus/it/neo4j/Neo4jResource.java
+++ b/integration-tests/src/main/java/io/quarkus/it/neo4j/Neo4jResource.java
@@ -1,18 +1,17 @@
package io.quarkus.it.neo4j;
-import static javax.ws.rs.core.MediaType.*;
-import static org.reactivestreams.FlowAdapters.toFlowPublisher;
-import static org.reactivestreams.FlowAdapters.toPublisher;
+import static jakarta.ws.rs.core.MediaType.*;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Flow;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
import org.eclipse.microprofile.context.ThreadContext;
import org.neo4j.driver.Driver;
@@ -21,8 +20,8 @@
import org.neo4j.driver.Transaction;
import org.neo4j.driver.Values;
import org.neo4j.driver.async.AsyncSession;
+import org.neo4j.driver.reactive.ReactiveResult;
import org.neo4j.driver.reactive.ReactiveSession;
-import org.reactivestreams.Publisher;
import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.Uni;
@@ -76,18 +75,17 @@ public CompletionStage> doStuffWithNeo4jAsynchronous() {
@GET
@Path("/reactive")
@Produces(SERVER_SENT_EVENTS)
- public Publisher doStuffWithNeo4jReactive() {
+ public Flow.Publisher doStuffWithNeo4jReactive() {
return Multi.createFrom().resource(() -> driver.session(ReactiveSession.class),
- session -> toPublisher(session.executeRead(tx -> {
+ session -> session.executeRead(tx -> {
var result = tx.run("UNWIND range(1, 3) AS x RETURN x");
- return toFlowPublisher(
- Multi.createFrom().publisher(toPublisher(result))
- .flatMap(v -> toPublisher(v.records()))
- .map(record -> record.get("x").asInt()));
- })))
+ return Multi.createFrom().publisher(result)
+ .flatMap(ReactiveResult::records)
+ .map(record -> record.get("x").asInt());
+ }))
.withFinalizer(session -> {
- return Uni.createFrom().publisher(toPublisher(session.close()));
+ return Uni.createFrom().publisher(session.close());
});
}
diff --git a/integration-tests/src/main/java/io/quarkus/it/neo4j/ReactiveFruitResource.java b/integration-tests/src/main/java/io/quarkus/it/neo4j/ReactiveFruitResource.java
index 1050f3d..c94907c 100644
--- a/integration-tests/src/main/java/io/quarkus/it/neo4j/ReactiveFruitResource.java
+++ b/integration-tests/src/main/java/io/quarkus/it/neo4j/ReactiveFruitResource.java
@@ -1,23 +1,21 @@
// tag::get[]
package io.quarkus.it.neo4j;
-import static org.reactivestreams.FlowAdapters.toFlowPublisher;
-import static org.reactivestreams.FlowAdapters.toPublisher;
-
import java.util.Map;
+import java.util.concurrent.Flow;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.jboss.resteasy.reactive.ResponseStatus;
import org.neo4j.driver.Driver;
+import org.neo4j.driver.reactive.ReactiveResult;
import org.neo4j.driver.reactive.ReactiveSession;
-import org.reactivestreams.Publisher;
import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.Uni;
@@ -30,19 +28,18 @@ public class ReactiveFruitResource {
Driver driver;
static Uni sessionFinalizer(ReactiveSession session) { // <.>
- return Uni.createFrom().publisher(toPublisher(session.close()));
+ return Uni.createFrom().publisher(session.close());
}
@GET
@Produces(MediaType.SERVER_SENT_EVENTS)
- public Publisher get() {
+ public Flow.Publisher get() {
// Create a stream from a resource we can close in a finalizer...
return Multi.createFrom().resource(() -> driver.session(ReactiveSession.class), // <.>
- session -> toPublisher(session.executeRead(tx -> {
+ session -> session.executeRead(tx -> {
var result = tx.run("MATCH (f:Fruit) RETURN f.name as name ORDER BY f.name");
- return toFlowPublisher(
- Multi.createFrom().publisher(toPublisher(result)).flatMap(v -> toPublisher(v.records())));
- })))
+ return Multi.createFrom().publisher(result).flatMap(ReactiveResult::records);
+ }))
.withFinalizer(ReactiveFruitResource::sessionFinalizer) // <.>
.map(record -> record.get("name").asString());
}
@@ -55,13 +52,12 @@ public Publisher get() {
public Uni create(Fruit fruit) {
return Uni.createFrom().emitter(e -> Multi.createFrom().resource(() -> driver.session(ReactiveSession.class), // <.>
- session -> toPublisher(session.executeWrite(tx -> {
+ session -> session.executeWrite(tx -> {
var result = tx.run(
"CREATE (f:Fruit {id: randomUUID(), name: $name}) RETURN f",
Map.of("name", fruit.name));
- return toFlowPublisher(
- Multi.createFrom().publisher(toPublisher(result)).flatMap(v -> toPublisher(v.records())));
- })))
+ return Multi.createFrom().publisher(result).flatMap(ReactiveResult::records);
+ }))
.withFinalizer(ReactiveFruitResource::sessionFinalizer)
.map(record -> Fruit.from(record.get("f").asNode()))
.subscribe().with( // <.>
diff --git a/integration-tests/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java b/integration-tests/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java
index 2df0efa..91c5466 100644
--- a/integration-tests/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java
+++ b/integration-tests/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java
@@ -14,7 +14,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.Status;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.AfterAll;
diff --git a/pom.xml b/pom.xml
index ead0ee9..29859f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
io.quarkiverse.neo4j
quarkus-neo4j-parent
- 2.2.8-SNAPSHOT
+ 3.0.0-SNAPSHOT
pom
Quarkus - Neo4j - Parent
@@ -24,7 +24,7 @@
17
UTF-8
UTF-8
- 2.16.6.Final
+ 3.0.0.Final
3.24.2
5.7.0
diff --git a/runtime/pom.xml b/runtime/pom.xml
index bbbcff4..eb7afb5 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -4,7 +4,7 @@
io.quarkiverse.neo4j
quarkus-neo4j-parent
- 2.2.8-SNAPSHOT
+ 3.0.0-SNAPSHOT
quarkus-neo4j
Quarkus - Neo4j - Runtime
diff --git a/runtime/src/main/java/io/quarkus/neo4j/runtime/health/Neo4jHealthCheck.java b/runtime/src/main/java/io/quarkus/neo4j/runtime/health/Neo4jHealthCheck.java
index 52258f9..fcbedfe 100644
--- a/runtime/src/main/java/io/quarkus/neo4j/runtime/health/Neo4jHealthCheck.java
+++ b/runtime/src/main/java/io/quarkus/neo4j/runtime/health/Neo4jHealthCheck.java
@@ -1,7 +1,7 @@
package io.quarkus.neo4j.runtime.health;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;