From c430d8edcc4ed5f631775cca231f02fbe8d5a82f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 11 Apr 2015 22:40:02 +0200 Subject: [PATCH] Do not declare RuntimeExceptions as thrown Fix a bunch of sonar warnings around declaring runtime exceptions. Change-Id: I6e8267e29ef6c0d3f2d220531ca656ff564331ec Signed-off-by: Robert Varga --- .../impl/BindingToNormalizedStreamWriter.java | 30 ++++++++----------- .../XMLStreamNormalizedNodeStreamWriter.java | 10 +++---- .../ImmutableNormalizedNodeStreamWriter.java | 28 ++++++++--------- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingToNormalizedStreamWriter.java b/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingToNormalizedStreamWriter.java index 40fce12aa6..617b514ccd 100644 --- a/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingToNormalizedStreamWriter.java +++ b/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingToNormalizedStreamWriter.java @@ -107,54 +107,51 @@ class BindingToNormalizedStreamWriter implements BindingStreamEventWriter, Deleg } @Override - public void leafNode(final String localName, final Object value) throws IOException, IllegalArgumentException { + public void leafNode(final String localName, final Object value) throws IOException { Entry dom = serializeLeaf(localName, value); getDelegate().leafNode(dom.getKey(), dom.getValue()); } @Override - public void anyxmlNode(final String name, final Object value) throws IOException, IllegalArgumentException { + public void anyxmlNode(final String name, final Object value) throws IOException { Entry dom = serializeLeaf(name, value); getDelegate().anyxmlNode(dom.getKey(), dom.getValue()); } @Override - public void leafSetEntryNode(final Object value) throws IOException, IllegalArgumentException { + public void leafSetEntryNode(final Object value) throws IOException { LeafNodeCodecContext ctx = (LeafNodeCodecContext) current(); getDelegate().leafSetEntryNode(ctx.getValueCodec().serialize(value)); } @Override - public void startAugmentationNode(final Class> augmentationType) - throws IOException, IllegalArgumentException { + public void startAugmentationNode(final Class> augmentationType) throws IOException { getDelegate().startAugmentationNode(enter(augmentationType, AugmentationIdentifier.class)); } @Override - public void startCase(final Class caze, final int childSizeHint) - throws IllegalArgumentException { + public void startCase(final Class caze, final int childSizeHint) { enter(caze, NodeIdentifier.class); } @Override - public void startChoiceNode(final Class type, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startChoiceNode(final Class type, final int childSizeHint) throws IOException { getDelegate().startChoiceNode(enter(type, NodeIdentifier.class), childSizeHint); } @Override public void startContainerNode(final Class object, final int childSizeHint) - throws IOException, IllegalArgumentException { + throws IOException { getDelegate().startContainerNode(enter(object, NodeIdentifier.class), childSizeHint); } @Override - public void startLeafSet(final String localName, final int childSizeHint) throws IOException, IllegalArgumentException { + public void startLeafSet(final String localName, final int childSizeHint) throws IOException { getDelegate().startLeafSet(enter(localName, NodeIdentifier.class), childSizeHint); } @Override - public void startMapEntryNode(final Identifier key, final int childSizeHint) throws IOException, IllegalArgumentException { + public void startMapEntryNode(final Identifier key, final int childSizeHint) throws IOException { duplicateSchemaEnter(); NodeIdentifierWithPredicates identifier = ((KeyedListNodeCodecContext) current()).serialize(key); getDelegate().startMapEntryNode(identifier, childSizeHint); @@ -162,24 +159,23 @@ class BindingToNormalizedStreamWriter implements BindingStreamEventWriter, Deleg @Override public > void startMapNode(final Class mapEntryType, - final int childSizeHint) throws IOException, IllegalArgumentException { + final int childSizeHint) throws IOException { getDelegate().startMapNode(enter(mapEntryType, NodeIdentifier.class), childSizeHint); } @Override public > void startOrderedMapNode(final Class mapEntryType, - final int childSizeHint) throws IOException, IllegalArgumentException { + final int childSizeHint) throws IOException { getDelegate().startOrderedMapNode(enter(mapEntryType, NodeIdentifier.class), childSizeHint); } @Override - public void startUnkeyedList(final Class obj, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startUnkeyedList(final Class obj, final int childSizeHint) throws IOException { getDelegate().startUnkeyedList(enter(obj, NodeIdentifier.class), childSizeHint); } @Override - public void startUnkeyedListItem(final int childSizeHint) throws IllegalStateException, IOException { + public void startUnkeyedListItem(final int childSizeHint) throws IOException { getDelegate().startUnkeyedListItem(duplicateSchemaEnter(), childSizeHint); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java index 9c62fbb1d0..ddef032d92 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java @@ -164,25 +164,25 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode } @Override - public void leafSetEntryNode(final Object value, final Map attributes) throws IOException, IllegalArgumentException { + public void leafSetEntryNode(final Object value, final Map attributes) throws IOException { final LeafListSchemaNode schema = tracker.leafSetEntryNode(); writeElement(schema.getQName(), schema, value, attributes); } @Override - public void startContainerNode(final NodeIdentifier name, final int childSizeHint, final Map attributes) throws IOException, IllegalArgumentException { + public void startContainerNode(final NodeIdentifier name, final int childSizeHint, final Map attributes) throws IOException { startContainerNode(name, childSizeHint); writeAttributes(attributes); } @Override - public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint, final Map attributes) throws IOException, IllegalStateException { + public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint, final Map attributes) throws IOException { startUnkeyedListItem(name, childSizeHint); writeAttributes(attributes); } @Override - public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint, final Map attributes) throws IOException, IllegalArgumentException { + public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint, final Map attributes) throws IOException { startMapEntryNode(identifier, childSizeHint); writeAttributes(attributes); } @@ -502,7 +502,7 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode } @Override - public Object getProperty(final String name) throws IllegalArgumentException { + public Object getProperty(final String name) { return writer.getProperty(name); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java index c97819bb38..35ddb97e71 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java @@ -130,13 +130,13 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void leafNode(final NodeIdentifier name, final Object value) throws IllegalArgumentException { + public void leafNode(final NodeIdentifier name, final Object value) { checkDataNodeContainer(); writeChild(ImmutableNodes.leafNode(name, value)); } @Override - public void startLeafSet(final NodeIdentifier name, final int childSizeHint) throws IllegalArgumentException { + public void startLeafSet(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); ListNodeBuilder> builder = UNKNOWN_SIZE == childSizeHint ? ImmutableLeafSetNodeBuilder.create() : ImmutableLeafSetNodeBuilder.create(childSizeHint); @@ -145,7 +145,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void leafSetEntryNode(final Object value) throws IllegalArgumentException { + public void leafSetEntryNode(final Object value) { Preconditions.checkArgument(getCurrent() instanceof ImmutableLeafSetNodeBuilder); @SuppressWarnings("unchecked") ListNodeBuilder> builder = ((ImmutableLeafSetNodeBuilder) getCurrent()); @@ -153,12 +153,12 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void anyxmlNode(final NodeIdentifier name, final Object value) throws IllegalArgumentException { + public void anyxmlNode(final NodeIdentifier name, final Object value) { checkDataNodeContainer(); } @Override - public void startContainerNode(final NodeIdentifier name, final int childSizeHint) throws IllegalArgumentException { + public void startContainerNode(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); final DataContainerNodeAttrBuilder builder = UNKNOWN_SIZE == childSizeHint ? @@ -167,7 +167,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) throws IllegalArgumentException { + public void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); final CollectionNodeBuilder builder = UNKNOWN_SIZE == childSizeHint ? @@ -176,7 +176,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) throws IllegalStateException { + public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) { Preconditions.checkArgument(getCurrent() instanceof ImmutableUnkeyedListNodeBuilder); final DataContainerNodeAttrBuilder builder = UNKNOWN_SIZE == childSizeHint ? @@ -185,7 +185,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startMapNode(final NodeIdentifier name, final int childSizeHint) throws IllegalArgumentException { + public void startMapNode(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); final CollectionNodeBuilder builder = UNKNOWN_SIZE == childSizeHint ? @@ -194,7 +194,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) throws IllegalArgumentException { + public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) { if(!(getCurrent() instanceof NormalizedNodeResultBuilder)) { Preconditions.checkArgument(getCurrent() instanceof ImmutableMapNodeBuilder || getCurrent() instanceof ImmutableOrderedMapNodeBuilder); } @@ -205,7 +205,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) throws IllegalArgumentException { + public void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); final CollectionNodeBuilder builder = UNKNOWN_SIZE == childSizeHint ? @@ -214,7 +214,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startChoiceNode(final NodeIdentifier name, final int childSizeHint) throws IllegalArgumentException { + public void startChoiceNode(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); final DataContainerNodeBuilder builder = UNKNOWN_SIZE == childSizeHint ? @@ -223,7 +223,7 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream } @Override - public void startAugmentationNode(final AugmentationIdentifier identifier) throws IllegalArgumentException { + public void startAugmentationNode(final AugmentationIdentifier identifier) { checkDataNodeContainer(); Preconditions.checkArgument(!(getCurrent() instanceof ImmutableAugmentationNodeBuilder)); enter(Builders.augmentationBuilder().withNodeIdentifier(identifier)); @@ -232,8 +232,8 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream private void checkDataNodeContainer() { @SuppressWarnings("rawtypes") NormalizedNodeContainerBuilder current = getCurrent(); - if(!(current instanceof NormalizedNodeResultBuilder)) { - Preconditions.checkArgument(current instanceof DataContainerNodeBuilder, "Invalid nesting of data."); + if (!(current instanceof NormalizedNodeResultBuilder)) { + Preconditions.checkArgument(current instanceof DataContainerNodeBuilder, "Invalid nesting of data."); } } -- 2.36.6