ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-11 21:13:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-11111: Reverted exposure of internal ConcurrencyUtils method (#7586)

Browse Source
This commit is contained in:
Shams Asari 2023-12-06 09:55:35 +00:00 committed by GitHub
parent 1b3ea01fc9
commit 755c7b73b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/api-current.txt
View File

@ -83,11 +83,7 @@ public final class net.corda.core.Utils extends java.lang.Object
public final class net.corda.core.concurrent.ConcurrencyUtils extends java.lang.Object public final class net.corda.core.concurrent.ConcurrencyUtils extends java.lang.Object
@NotNull @NotNull
public static final net.corda.core.concurrent.CordaFuture firstOf(net.corda.core.concurrent.CordaFuture<? extends V>[], kotlin.jvm.functions.Function1) public static final net.corda.core.concurrent.CordaFuture firstOf(net.corda.core.concurrent.CordaFuture<? extends V>[], kotlin.jvm.functions.Function1)
@NotNull
public static final net.corda.core.concurrent.CordaFuture firstOf(net.corda.core.concurrent.CordaFuture<? extends V>[], org.slf4j.Logger, kotlin.jvm.functions.Function1)
public static final W match(java.util.concurrent.Future, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1) public static final W match(java.util.concurrent.Future, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1)
@NotNull
public static final String shortCircuitedTaskFailedMessage = "Short-circuited task failed:"
## ##
public interface net.corda.core.concurrent.CordaFuture extends java.util.concurrent.Future public interface net.corda.core.concurrent.CordaFuture extends java.util.concurrent.Future
public abstract void then(kotlin.jvm.functions.Function1) public abstract void then(kotlin.jvm.functions.Function1)

9
core/src/main/kotlin/net/corda/core/concurrent/ConcurrencyUtils.kt
View File

@ -1,7 +1,7 @@
@file:JvmName("ConcurrencyUtils") @file:JvmName("ConcurrencyUtils")
package net.corda.core.concurrent package net.corda.core.concurrent
import net.corda.core.internal.VisibleForTesting import net.corda.core.CordaInternal
import net.corda.core.internal.concurrent.openFuture import net.corda.core.internal.concurrent.openFuture
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import org.slf4j.Logger import org.slf4j.Logger
@ -27,10 +27,9 @@ fun <V, W> Future<V>.match(success: (V) -> W, failure: (Throwable) -> W): W {
fun <V, W> firstOf(vararg futures: CordaFuture<out V>, handler: (CordaFuture<out V>) -> W) = firstOf(futures, defaultLog, handler) fun <V, W> firstOf(vararg futures: CordaFuture<out V>, handler: (CordaFuture<out V>) -> W) = firstOf(futures, defaultLog, handler)
private val defaultLog = LoggerFactory.getLogger("net.corda.core.concurrent") private val defaultLog = LoggerFactory.getLogger("net.corda.core.concurrent")
@VisibleForTesting
const val shortCircuitedTaskFailedMessage = "Short-circuited task failed:"
fun <V, W> firstOf(futures: Array<out CordaFuture<out V>>, log: Logger, handler: (CordaFuture<out V>) -> W): CordaFuture<W> { @CordaInternal
internal fun <V, W> firstOf(futures: Array<out CordaFuture<out V>>, log: Logger, handler: (CordaFuture<out V>) -> W): CordaFuture<W> {
val resultFuture = openFuture<W>() val resultFuture = openFuture<W>()
val winnerChosen = AtomicBoolean() val winnerChosen = AtomicBoolean()
futures.forEach { futures.forEach {
@ -40,7 +39,7 @@ fun <V, W> firstOf(futures: Array<out CordaFuture<out V>>, log: Logger, handler:
it.isCancelled -> { it.isCancelled -> {
// Do nothing. // Do nothing.
} }
else -> it.match({}, { log.error(shortCircuitedTaskFailedMessage, it) }) else -> it.match({}, { log.error("Short-circuited task failed:", it) })
} }
} }
} }

12
core/src/test/kotlin/net/corda/core/concurrent/ConcurrencyUtilsTest.kt
View File

@ -34,7 +34,7 @@ class ConcurrencyUtilsTest {
val throwable = EOFException("log me") val throwable = EOFException("log me")
f2.setException(throwable) f2.setException(throwable)
assertEquals(1, invocations) // Least astonishing to skip handler side-effects. assertEquals(1, invocations) // Least astonishing to skip handler side-effects.
verify(log).error(eq(shortCircuitedTaskFailedMessage), same(throwable)) verify(log).error(eq("Short-circuited task failed:"), same(throwable))
verifyNoMoreInteractions(log) verifyNoMoreInteractions(log)
} }
@ -68,7 +68,7 @@ class ConcurrencyUtilsTest {
f1.set(100) f1.set(100)
assertEquals(100, g.getOrThrow()) assertEquals(100, g.getOrThrow())
assertEquals(1, invocations) // Handler didn't run as g was already done. assertEquals(1, invocations) // Handler didn't run as g was already done.
verify(log).error(eq(shortCircuitedTaskFailedMessage), same(nonCancel)) verify(log).error(eq("Short-circuited task failed:"), same(nonCancel))
verifyNoMoreInteractions(log) verifyNoMoreInteractions(log)
assertThatThrownBy { f2.getOrThrow() }.isSameAs(nonCancel) assertThatThrownBy { f2.getOrThrow() }.isSameAs(nonCancel)
} }
@ -98,7 +98,7 @@ class ConcurrencyUtilsTest {
}, failures::add) }, failures::add)
}.isSameAs(x) }.isSameAs(x)
assertEquals(listOf<Any?>(100), successes) assertEquals(listOf<Any?>(100), successes)
assertEquals(emptyList<Any?>(), failures) assertEquals(emptyList(), failures)
} }
@Test(timeout=300_000) @Test(timeout=300_000)
@ -109,12 +109,12 @@ class ConcurrencyUtilsTest {
val failures = mutableListOf<Any?>() val failures = mutableListOf<Any?>()
val x = Throwable() val x = Throwable()
assertThatThrownBy { assertThatThrownBy {
f.match(successes::add, { f.match(successes::add) {
failures.add(it) failures.add(it)
throw x throw x
}) }
}.isSameAs(x) }.isSameAs(x)
assertEquals(emptyList<Any?>(), successes) assertEquals(emptyList(), successes)
assertEquals(listOf<Any?>(e), failures) assertEquals(listOf<Any?>(e), failures)
} }
} }