Skip to content

Commit 12bf0e7

Browse files
authored
Revert "[INTERNAL] Add interrupt to sync API (#1427)" (#1428)
This reverts commit b11f4d8.
1 parent b11f4d8 commit 12bf0e7

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

driver/src/main/java/org/neo4j/driver/internal/InternalTransaction.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,6 @@ public boolean isOpen() {
6666
return tx.isOpen();
6767
}
6868

69-
/**
70-
* Marks transaction as terminated and sends {@code RESET} message over allocated connection.
71-
* <p>
72-
* <b>THIS METHOD IS NOT PART OF PUBLIC API. This method may be changed or removed at any moment in time.</b>
73-
*/
74-
public void interrupt() {
75-
Futures.blockingGet(tx.interruptAsync());
76-
}
77-
7869
private void terminateConnectionOnThreadInterrupt(String reason) {
7970
tx.connection().terminateAndRelease(reason);
8071
}

driver/src/test/java/org/neo4j/driver/internal/InternalTransactionTest.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import static org.junit.Assert.assertFalse;
2525
import static org.junit.jupiter.api.Assertions.assertThrows;
2626
import static org.mockito.ArgumentMatchers.any;
27-
import static org.mockito.BDDMockito.given;
28-
import static org.mockito.BDDMockito.then;
2927
import static org.mockito.Mockito.mock;
3028
import static org.mockito.Mockito.verify;
3129
import static org.mockito.Mockito.when;
@@ -40,7 +38,6 @@
4038
import static org.neo4j.driver.testutil.TestUtil.verifyRollbackTx;
4139
import static org.neo4j.driver.testutil.TestUtil.verifyRunAndPull;
4240

43-
import java.util.concurrent.CompletableFuture;
4441
import java.util.function.Consumer;
4542
import java.util.function.Function;
4643
import java.util.stream.Stream;
@@ -53,7 +50,6 @@
5350
import org.neo4j.driver.Transaction;
5451
import org.neo4j.driver.Value;
5552
import org.neo4j.driver.internal.async.ConnectionContext;
56-
import org.neo4j.driver.internal.async.UnmanagedTransaction;
5753
import org.neo4j.driver.internal.messaging.v4.BoltProtocolV4;
5854
import org.neo4j.driver.internal.spi.Connection;
5955
import org.neo4j.driver.internal.spi.ConnectionProvider;
@@ -154,17 +150,6 @@ void shouldReleaseConnectionWhenFailedToClose() {
154150
shouldReleaseConnectionWhenFailedToAction(Transaction::close);
155151
}
156152

157-
@Test
158-
void shouldDelegateInterrupt() {
159-
var unmanagedTx = mock(UnmanagedTransaction.class);
160-
given(unmanagedTx.interruptAsync()).willReturn(CompletableFuture.completedFuture(null));
161-
var tx = new InternalTransaction(unmanagedTx);
162-
163-
tx.interrupt();
164-
165-
then(unmanagedTx).should().interruptAsync();
166-
}
167-
168153
private void shouldReleaseConnectionWhenFailedToAction(Consumer<Transaction> txAction) {
169154
setupFailingRollback(connection);
170155
assertThrows(Exception.class, () -> txAction.accept(tx));

0 commit comments

Comments
 (0)