From fda572130077da8029e12bb770b0b8c8fb7890d0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 19 Mar 2019 18:04:49 +0100 Subject: [PATCH] Cleanup RuntimeException throws We are just wrapping exceptions in these cases, switch to wrapping with IllegalStateException to keep sonar happy. Change-Id: I571f444b9d97dd9d9129b6e18f7e91e72b30d842 Signed-off-by: Robert Varga --- .../dom/adapter/DirectGetterRouteContextExtractor.java | 2 +- .../mdsal/binding/dom/adapter/FutureSchema.java | 2 +- .../binding/dom/adapter/GetValueRouteContextExtractor.java | 2 +- .../dom/adapter/invoke/NotificationListenerInvoker.java | 2 +- .../dom/adapter/invoke/RpcMethodInvokerWithInput.java | 2 +- .../dom/adapter/invoke/RpcMethodInvokerWithoutInput.java | 2 +- .../dom/codec/impl/CachingNormalizedNodeSerializer.java | 2 +- .../binding/dom/codec/impl/DataObjectCodecContext.java | 2 +- .../binding/dom/codec/impl/EncapsulatedValueCodec.java | 6 +++--- .../mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java | 4 ++-- .../binding/dom/codec/impl/UnionValueOptionContext.java | 2 +- .../mdsal/binding/dom/codec/impl/ValueContext.java | 2 +- .../binding/spec/reflect/StringValueObjectFactory.java | 2 +- .../store/inmemory/AbstractDOMShardTreeChangePublisher.java | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractor.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractor.java index 96536bff86..3563175303 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractor.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractor.java @@ -38,7 +38,7 @@ final class DirectGetterRouteContextExtractor extends ContextReferenceExtractor return (InstanceIdentifier) handle.invokeExact(obj); } catch (final Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchema.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchema.java index 0511c4a99a..b89f7f406d 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchema.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchema.java @@ -50,7 +50,7 @@ abstract class FutureSchema implements AutoCloseable { schemaPromise.get(FutureSchema.this.duration, FutureSchema.this.unit); return true; } catch (final InterruptedException | ExecutionException e) { - throw new RuntimeException(e); + throw new IllegalStateException(e); } catch (final TimeoutException e) { return false; } finally { diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/GetValueRouteContextExtractor.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/GetValueRouteContextExtractor.java index 1879b16f10..208d9f65bb 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/GetValueRouteContextExtractor.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/GetValueRouteContextExtractor.java @@ -46,7 +46,7 @@ final class GetValueRouteContextExtractor extends ContextReferenceExtractor { return null; } catch (final Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/NotificationListenerInvoker.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/NotificationListenerInvoker.java index 0052990d1c..471d6d1378 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/NotificationListenerInvoker.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/NotificationListenerInvoker.java @@ -107,7 +107,7 @@ public final class NotificationListenerInvoker { invoker.invokeExact(impl, input); } catch (final Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithInput.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithInput.java index eceaaa68d0..cb85e00b5a 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithInput.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithInput.java @@ -32,7 +32,7 @@ class RpcMethodInvokerWithInput extends RpcMethodInvoker { return (ListenableFuture>) handle.invokeExact(impl,input); } catch (Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } \ No newline at end of file diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithoutInput.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithoutInput.java index 03bc92cee6..cb5c001302 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithoutInput.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/RpcMethodInvokerWithoutInput.java @@ -32,7 +32,7 @@ class RpcMethodInvokerWithoutInput extends RpcMethodInvoker { return (ListenableFuture>) handle.invokeExact(impl); } catch (Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } \ No newline at end of file diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java index ab1f3a87cc..b1a073eb53 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java @@ -120,7 +120,7 @@ final class CachingNormalizedNodeSerializer extends ForwardingBindingStreamEvent subtreeRoot.eventStreamSerializer().serialize(data, writer); return writer.build(); } catch (final IOException e) { - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } \ No newline at end of file diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java index b4aed692f9..3dcc386bd2 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java @@ -538,7 +538,7 @@ abstract class DataObjectCodecContext(this, node)); } catch (final Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java index 560e733252..5e9f21e89e 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java @@ -40,7 +40,7 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem this.valueType = requireNonNull(valueType); } - static Callable loader(final Class typeClz, TypeDefinition typeDef) { + static Callable loader(final Class typeClz, final TypeDefinition typeDef) { return () -> { final Method m; if (typeDef instanceof BooleanTypeDefinition || typeDef instanceof EmptyTypeDefinition) { @@ -74,7 +74,7 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem return constructor.invokeExact(input); } catch (Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } @@ -85,7 +85,7 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem return getter.invokeExact(input); } catch (Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } } \ No newline at end of file diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java index 0b38fef314..6c90da7643 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java @@ -149,7 +149,7 @@ abstract class IdentifiableItemCodec implements Codec { return ret; } catch (Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException("Failed to instantiate object with value " + string, e); } } diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java index d2f96f7698..3fc183ee34 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java @@ -250,7 +250,7 @@ abstract class AbstractDOMShardTreeChangePublisher extends AbstractDOMStoreTreeC dataTree.validate(modification); } catch (final DataValidationFailedException e) { LOG.error("Validation failed for built modification", e); - throw new RuntimeException("Notification validation failed", e); + throw new IllegalStateException("Notification validation failed", e); } // strip nodes we do not need since this listener doesn't have to be registered at the root of the DataTree -- 2.36.6