From 7ca786c387d769ee9b4db41446052646ed85bf32 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 24 Apr 2022 10:23:22 +0200 Subject: [PATCH] Clean up unhandled request exceptions We have a few places which throw the same exception, make sure we share the formatting and expose the proper control flow to Java. Change-Id: I514faf987b780de813fe6a1374c5e634e22326a6 Signed-off-by: Robert Varga --- .../actors/dds/AbstractProxyTransaction.java | 6 +++++- .../actors/dds/LocalProxyTransaction.java | 14 +++++--------- .../actors/dds/RemoteProxyTransaction.java | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java index 461c90f605..11027e4ce8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java @@ -855,7 +855,11 @@ abstract class AbstractProxyTransaction implements Identifiable request, @Nullable Consumer> callback, long enqueuedTicks); - private static IllegalStateException unhandledResponseException(final Response resp) { + static final @NonNull IllegalArgumentException unhandledRequest(final TransactionRequest request) { + return new IllegalArgumentException("Unhandled request " + request); + } + + private static @NonNull IllegalStateException unhandledResponseException(final Response resp) { return new IllegalStateException("Unhandled response " + resp.getClass()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java index cc09265b5d..64f5641fb7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java @@ -96,7 +96,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { if (request instanceof AbortLocalTransactionRequest) { enqueueAbort(request, callback, enqueuedTicks); } else { - throw new IllegalArgumentException("Unhandled request" + request); + throw unhandledRequest(request); } } @@ -138,7 +138,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { // hence we can skip sequence increments. LOG.debug("Not replaying {}", request); } else { - throw new IllegalArgumentException("Unhandled request " + request); + throw unhandledRequest(request); } } @@ -158,7 +158,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { } else if (request instanceof TransactionPurgeRequest) { enqueuePurge(callback); } else { - throw new IllegalArgumentException("Unhandled request " + request); + throw unhandledRequest(request); } } @@ -199,7 +199,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { } else if (request instanceof ModifyTransactionRequest) { successor.handleForwardedRequest(request, callback); } else { - throwUnhandledRequest(request); + throw unhandledRequest(request); } } @@ -211,16 +211,12 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { } else if (request instanceof TransactionPurgeRequest) { successor.enqueuePurge(callback); } else { - throwUnhandledRequest(request); + throw unhandledRequest(request); } LOG.debug("Forwarded request {} to successor {}", request, successor); } - private static void throwUnhandledRequest(final TransactionRequest request) { - throw new IllegalArgumentException("Unhandled request " + request); - } - void sendAbort(final TransactionRequest request, final Consumer> callback) { sendRequest(request, callback); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java index addf564993..dc0ff82c13 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/RemoteProxyTransaction.java @@ -336,7 +336,7 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { } else if (request instanceof TransactionPurgeRequest) { enqueuePurge(callback); } else { - throw new IllegalArgumentException("Unhandled request {}" + request); + throw unhandledRequest(request); } } @@ -404,7 +404,7 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { } else if (request instanceof AbortLocalTransactionRequest) { enqueueRequest(abortRequest(), callback, enqueuedTicks); } else { - throw new IllegalStateException("Unhandled request " + request); + throw unhandledRequest(request); } } @@ -479,7 +479,7 @@ final class RemoteProxyTransaction extends AbstractProxyTransaction { snapshotOnly, req.getIncrement()), callback, enqueuedTicks); incrementSequence(req.getIncrement()); } else { - throw new IllegalArgumentException("Unhandled request {}" + request); + throw unhandledRequest(request); } } -- 2.36.6