neo4j
diff --git a/‎driver/clirr-ignored-differences.xml
Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions b/‎driver/clirr-ignored-differences.xml
Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/Driver.java
Copy file name to clipboard
-38Lines changed: 0 additions & 38 deletions b/‎driver/src/main/java/org/neo4j/driver/Driver.java
Copy file name to clipboard
-38Lines changed: 0 additions & 38 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
Copy file name to clipboard
+1-5Lines changed: 1 addition & 5 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
Copy file name to clipboard
+1-5Lines changed: 1 addition & 5 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/reactive/AbstractReactiveSession.java
Copy file name to clipboard
-14Lines changed: 0 additions & 14 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/reactive/AbstractReactiveSession.java
Copy file name to clipboard
-14Lines changed: 0 additions & 14 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxResult.java
Copy file name to clipboard
-140Lines changed: 0 additions & 140 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxResult.java
Copy file name to clipboard
-140Lines changed: 0 additions & 140 deletions
@@ -645,4 +645,41 @@
         <method>java.lang.Object as(java.lang.Class)</method>
     </difference>
 
+    <difference>
+        <className>org/neo4j/driver/Driver</className>
+        <differenceType>7002</differenceType>
+        <method>org.neo4j.driver.reactive.RxSession rxSession()</method>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/Driver</className>
+        <differenceType>7002</differenceType>
+        <method>org.neo4j.driver.reactive.RxSession rxSession(org.neo4j.driver.SessionConfig)</method>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/reactive/RxQueryRunner</className>
+        <differenceType>8001</differenceType>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/reactive/RxResult</className>
+        <differenceType>8001</differenceType>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/reactive/RxSession</className>
+        <differenceType>8001</differenceType>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/reactive/RxTransaction</className>
+        <differenceType>8001</differenceType>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/reactive/RxTransactionWork</className>
+        <differenceType>8001</differenceType>
+    </difference>
+
 </differences>
@@ -21,7 +21,6 @@
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.exceptions.UnsupportedFeatureException;
 import org.neo4j.driver.reactive.ReactiveSession;
-import org.neo4j.driver.reactive.RxSession;
 import org.neo4j.driver.types.TypeSystem;
 import org.neo4j.driver.util.Experimental;
 
@@ -118,8 +117,6 @@ default Session session(SessionConfig sessionConfig) {
      *     <li>{@link org.neo4j.driver.reactive.ReactiveSession} - reactive session using Flow API</li>
      *     <li>{@link org.neo4j.driver.reactivestreams.ReactiveSession} - reactive session using Reactive Streams
      * API</li>
-     *     <li>{@link org.neo4j.driver.reactive.RxSession} - deprecated reactive session using Reactive Streams
-     * API, superseded by {@link org.neo4j.driver.reactivestreams.ReactiveSession}</li>
      * </ul>
      * <p>
      * Sample usage:
@@ -154,8 +151,6 @@ default <T extends BaseSession> T session(Class<T> sessionClass) {
      *     <li>{@link org.neo4j.driver.reactive.ReactiveSession} - reactive session using Flow API</li>
      *     <li>{@link org.neo4j.driver.reactivestreams.ReactiveSession} - reactive session using Reactive Streams
      * API</li>
-     *     <li>{@link org.neo4j.driver.reactive.RxSession} - deprecated reactive session using Reactive Streams
-     * API, superseded by {@link org.neo4j.driver.reactivestreams.ReactiveSession}</li>
      * </ul>
      * <p>
      * Sample usage:
@@ -187,8 +182,6 @@ default <T extends BaseSession> T session(Class<T> sessionClass, AuthToken sessi
      *     <li>{@link org.neo4j.driver.reactive.ReactiveSession} - reactive session using Flow API</li>
      *     <li>{@link org.neo4j.driver.reactivestreams.ReactiveSession} - reactive session using Reactive Streams
      * API</li>
-     *     <li>{@link org.neo4j.driver.reactive.RxSession} - deprecated reactive session using Reactive Streams
-     * API, superseded by {@link org.neo4j.driver.reactivestreams.ReactiveSession}</li>
      * </ul>
      * <p>
      * Sample usage:
@@ -225,8 +218,6 @@ default <T extends BaseSession> T session(Class<T> sessionClass, SessionConfig s
      *     <li>{@link org.neo4j.driver.reactive.ReactiveSession} - reactive session using Flow API</li>
      *     <li>{@link org.neo4j.driver.reactivestreams.ReactiveSession} - reactive session using Reactive Streams
      * API</li>
-     *     <li>{@link org.neo4j.driver.reactive.RxSession} - deprecated reactive session using Reactive Streams
-     * API, superseded by {@link org.neo4j.driver.reactivestreams.ReactiveSession}</li>
      * </ul>
      * <p>
      * Sample usage:
@@ -247,38 +238,9 @@ default <T extends BaseSession> T session(Class<T> sessionClass, SessionConfig s
     @SuppressWarnings("deprecation")
     <T extends BaseSession> T session(Class<T> sessionClass, SessionConfig sessionConfig, AuthToken sessionAuthToken);
 
-    /**
-     * Create a new general purpose {@link RxSession} with default {@link SessionConfig session configuration}. The {@link RxSession} provides a reactive way to
-     * run queries and process results.
-     * <p>
-     * Alias to {@link #rxSession(SessionConfig)}}.
-     *
-     * @return a new {@link RxSession} object.
-     * @deprecated superseded by {@link #session(Class)}
-     */
-    @Deprecated
-    default RxSession rxSession() {
-        return session(RxSession.class);
-    }
-
-    /**
-     * Create a new {@link RxSession} with a specified {@link SessionConfig session configuration}. Use {@link SessionConfig#forDatabase(String)} to obtain a
-     * general purpose session configuration for the specified database. The {@link RxSession} provides a reactive way to run queries and process results.
-     *
-     * @param sessionConfig used to customize the session.
-     * @return a new {@link RxSession} object.
-     * @deprecated superseded by {@link #session(Class, SessionConfig)}
-     */
-    @Deprecated
-    default RxSession rxSession(SessionConfig sessionConfig) {
-        return session(RxSession.class, sessionConfig);
-    }
-
     /**
      * Create a new general purpose {@link ReactiveSession} with default {@link SessionConfig session configuration}. The {@link ReactiveSession} provides a
      * reactive way to run queries and process results.
-     * <p>
-     * Alias to {@link #rxSession(SessionConfig)}}.
      *
      * @return a new {@link ReactiveSession} object.
      * @deprecated superseded by {@link #session(Class)}
 
@@ -46,11 +46,9 @@
 import org.neo4j.driver.internal.async.NetworkSession;
 import org.neo4j.driver.internal.metrics.DevNullMetricsProvider;
 import org.neo4j.driver.internal.metrics.MetricsProvider;
-import org.neo4j.driver.internal.reactive.InternalRxSession;
 import org.neo4j.driver.internal.security.BoltSecurityPlanManager;
 import org.neo4j.driver.internal.types.InternalTypeSystem;
 import org.neo4j.driver.internal.util.Futures;
-import org.neo4j.driver.reactive.RxSession;
 import org.neo4j.driver.types.TypeSystem;
 
 public class InternalDriver implements Driver {
@@ -99,7 +97,7 @@ public BookmarkManager executableQueryBookmarkManager() {
         return queryBookmarkManager;
     }
 
-    @SuppressWarnings({"unchecked", "deprecation"})
+    @SuppressWarnings("unchecked")
     @Override
     public <T extends BaseSession> T session(
             Class<T> sessionClass, SessionConfig sessionConfig, AuthToken sessionAuthToken) {
@@ -116,8 +114,6 @@ public <T extends BaseSession> T session(
         } else if (org.neo4j.driver.reactivestreams.ReactiveSession.class.isAssignableFrom(sessionClass)) {
             session = (T) new org.neo4j.driver.internal.reactivestreams.InternalReactiveSession(
                     newSession(sessionConfig, notificationConfig, sessionAuthToken));
-        } else if (RxSession.class.isAssignableFrom(sessionClass)) {
-            session = (T) new InternalRxSession(newSession(sessionConfig, notificationConfig, sessionAuthToken));
         } else {
             throw new IllegalArgumentException(
                     String.format("Unsupported session type '%s'", sessionClass.getCanonicalName()));
 
@@ -38,7 +38,6 @@
 import org.neo4j.driver.internal.cursor.RxResultCursor;
 import org.neo4j.driver.internal.telemetry.ApiTelemetryWork;
 import org.neo4j.driver.internal.util.Futures;
-import org.neo4j.driver.reactive.RxResult;
 import org.neo4j.driver.reactivestreams.ReactiveResult;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -105,7 +104,6 @@ private Publisher<S> beginTransaction(
                 tx -> Mono.fromDirect(closeTransaction(tx, false)).subscribe());
     }
 
-    @SuppressWarnings("deprecation")
     protected <T> Publisher<T> runTransaction(
             AccessMode mode, Function<S, ? extends Publisher<T>> work, TransactionConfig config) {
         work = work.andThen(publisher -> Flux.from(publisher).handle((value, sink) -> {
@@ -133,18 +131,6 @@ protected <T> Publisher<T> runTransaction(
                         GqlStatusError.DIAGNOSTIC_RECORD,
                         null));
                 return;
-            } else if (value instanceof RxResult) {
-                var message = String.format(
-                        "%s is not a valid return value, it should be consumed before producing a return value",
-                        RxResult.class.getName());
-                sink.error(new ClientException(
-                        GqlStatusError.UNKNOWN.getStatus(),
-                        GqlStatusError.UNKNOWN.getStatusDescription(message),
-                        "N/A",
-                        message,
-                        GqlStatusError.DIAGNOSTIC_RECORD,
-                        null));
-                return;
             }
             sink.next(value);
         }));