From 3e79ff3fef1772922809f6eaa7c15785afd5d403 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 16 Feb 2016 20:13:07 +0100 Subject: [PATCH] Eliminate SourceException throws declarations SourceException is a RuntimeException, no need to declare it, fixing Sonar warnings. Change-Id: I1a96ecd098cfcd489a17a2307a27256bce2754fc Signed-off-by: Robert Varga --- .../parser/stmt/reactor/ModifierImpl.java | 22 +++++++++---------- .../stmt/rfc6020/AnyxmlStatementImpl.java | 3 +-- .../stmt/rfc6020/ArgumentStatementImpl.java | 5 ++--- .../stmt/rfc6020/AugmentStatementImpl.java | 3 +-- .../parser/stmt/rfc6020/AugmentUtils.java | 7 +++--- .../parser/stmt/rfc6020/BitStatementImpl.java | 5 ++--- .../stmt/rfc6020/BitsSpecificationImpl.java | 5 ++--- .../stmt/rfc6020/CaseStatementImpl.java | 3 +-- .../stmt/rfc6020/ChoiceStatementImpl.java | 6 ++--- .../stmt/rfc6020/ConfigStatementImpl.java | 5 ++--- .../stmt/rfc6020/ContactStatementImpl.java | 5 ++--- .../stmt/rfc6020/ContainerStatementImpl.java | 3 +-- .../rfc6020/Decimal64SpecificationImpl.java | 7 +++--- .../stmt/rfc6020/DefaultStatementImpl.java | 5 ++--- .../rfc6020/DescriptionStatementImpl.java | 5 ++--- .../stmt/rfc6020/DeviateStatementImpl.java | 5 ++--- .../stmt/rfc6020/DeviationStatementImpl.java | 3 +-- .../stmt/rfc6020/EnumSpecificationImpl.java | 5 ++--- .../stmt/rfc6020/EnumStatementImpl.java | 3 +-- .../rfc6020/ErrorAppTagStatementImpl.java | 5 ++--- .../rfc6020/ErrorMessageStatementImpl.java | 3 +-- .../stmt/rfc6020/ExtensionStatementImpl.java | 5 ++--- .../stmt/rfc6020/FeatureStatementImpl.java | 3 +-- .../rfc6020/FractionDigitsStatementImpl.java | 2 +- .../stmt/rfc6020/GroupingStatementImpl.java | 3 +-- .../parser/stmt/rfc6020/GroupingUtils.java | 9 ++++---- .../rfc6020/IdentityRefSpecificationImpl.java | 8 +++---- .../stmt/rfc6020/IdentityStatementImpl.java | 5 ++--- .../stmt/rfc6020/IfFeatureStatementImpl.java | 3 +-- .../stmt/rfc6020/IncludeStatementImpl.java | 5 ++--- .../stmt/rfc6020/InputStatementImpl.java | 6 ++--- .../InstanceIdentifierSpecificationImpl.java | 6 ++--- .../parser/stmt/rfc6020/KeyStatementImpl.java | 3 +-- .../stmt/rfc6020/LeafListStatementImpl.java | 5 ++--- .../stmt/rfc6020/LeafStatementImpl.java | 6 ++--- .../rfc6020/LeafrefSpecificationImpl.java | 6 ++--- .../stmt/rfc6020/LengthStatementImpl.java | 5 ++--- .../stmt/rfc6020/ListStatementImpl.java | 6 ++--- .../stmt/rfc6020/MandatoryStatementImpl.java | 3 +-- .../rfc6020/MaxElementsStatementImpl.java | 3 +-- .../rfc6020/MinElementsStatementImpl.java | 3 +-- .../stmt/rfc6020/ModuleStatementSupport.java | 2 +- .../stmt/rfc6020/MustStatementImpl.java | 3 +-- .../stmt/rfc6020/NamespaceStatementImpl.java | 3 +-- .../rfc6020/NotificationStatementImpl.java | 3 +-- .../rfc6020/NumericalRestrictionsImpl.java | 5 ++--- .../stmt/rfc6020/OrderedByStatementImpl.java | 6 ++--- .../rfc6020/OrganizationStatementImpl.java | 3 +-- .../stmt/rfc6020/OutputStatementImpl.java | 3 +-- .../stmt/rfc6020/PathStatementImpl.java | 3 +-- .../stmt/rfc6020/PatternStatementImpl.java | 3 +-- .../stmt/rfc6020/PrefixStatementImpl.java | 3 +-- .../stmt/rfc6020/PresenceStatementImpl.java | 12 ++++------ .../stmt/rfc6020/RangeStatementImpl.java | 3 +-- .../stmt/rfc6020/ReferenceStatementImpl.java | 3 +-- .../stmt/rfc6020/RefineStatementImpl.java | 3 +-- .../rfc6020/RevisionDateStatementImpl.java | 2 +- .../parser/stmt/rfc6020/RpcStatementImpl.java | 4 +--- .../stmt/rfc6020/StatusStatementImpl.java | 3 +-- .../stmt/rfc6020/StringRestrictionsImpl.java | 5 ++--- .../stmt/rfc6020/SubmoduleStatementImpl.java | 5 ++--- .../stmt/rfc6020/TypeStatementImpl.java | 5 ++--- .../stmt/rfc6020/TypedefStatementImpl.java | 2 +- .../stmt/rfc6020/UnionSpecificationImpl.java | 6 ++--- .../stmt/rfc6020/UniqueStatementImpl.java | 6 ++--- .../stmt/rfc6020/UnitsStatementImpl.java | 3 +-- .../stmt/rfc6020/UnknownStatementImpl.java | 3 +-- .../stmt/rfc6020/UsesStatementImpl.java | 3 +-- .../stmt/rfc6020/WhenStatementImpl.java | 3 +-- .../stmt/rfc6020/YangStatementSourceImpl.java | 7 +++--- .../rfc6020/YangVersionStatementImpl.java | 5 ++--- .../stmt/rfc6020/YinElementStatementImpl.java | 3 +-- .../stmt/rfc6020/YinStatementSourceImpl.java | 10 ++++----- 73 files changed, 129 insertions(+), 212 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java index 254b65c76b..31ab8b381b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java @@ -86,13 +86,13 @@ class ModifierImpl implements ModelActionBuilder { return actionApplied; } - void failModifier() throws InferenceException { + void failModifier() { removeSatisfied(); action.prerequisiteFailed(unsatisfied); action = null; } - private void applyAction() throws InferenceException { + private void applyAction() { Preconditions.checkState(!actionApplied); action.apply(); actionApplied = true; @@ -234,7 +234,7 @@ class ModifierImpl implements ModelActionBuilder { @Override - public void apply(final InferenceAction action) throws InferenceException { + public void apply(final InferenceAction action) { this.action = Preconditions.checkNotNull(action); } @@ -254,7 +254,7 @@ class ModifierImpl implements ModelActionBuilder { return done; } - protected boolean resolvePrereq(final T value) throws InferenceException { + protected boolean resolvePrereq(final T value) { this.value = value; this.done = true; return isApplied(); @@ -282,7 +282,7 @@ class ModifierImpl implements ModelActionBuilder { private class PhaseMutation extends AbstractPrerequisite implements ContextMutation { @SuppressWarnings("unchecked") - public PhaseMutation(final StatementContextBase context, final ModelProcessingPhase phase) throws InferenceException { + public PhaseMutation(final StatementContextBase context, final ModelProcessingPhase phase) { context.addMutation(phase, this); resolvePrereq((C) context); } @@ -298,14 +298,14 @@ class ModifierImpl implements ModelActionBuilder { @SuppressWarnings("unchecked") @Override - public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) throws SourceException { + public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) { return resolvePrereq((C) (context)); } } private class NamespaceMutation> extends AbstractPrerequisite> { - public NamespaceMutation(final StatementContextBase ctx, final Class namespace) throws InferenceException { + public NamespaceMutation(final StatementContextBase ctx, final Class namespace) { resolvePrereq(ctx); } @@ -321,14 +321,14 @@ class ModifierImpl implements ModelActionBuilder { @Override public void namespaceItemAdded(final StatementContextBase context, final Class namespace, final Object key, - final Object value) throws SourceException { + final Object value) { StatementContextBase targetContext = (StatementContextBase) value; targetContext.addPhaseCompletedListener(phase, this); } @SuppressWarnings("unchecked") @Override - public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) throws SourceException { + public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) { return resolvePrereq((C) context); } @@ -338,7 +338,7 @@ class ModifierImpl implements ModelActionBuilder { private final ModelProcessingPhase modPhase; - public > PhaseModificationInNamespace(final ModelProcessingPhase phase) throws SourceException { + public > PhaseModificationInNamespace(final ModelProcessingPhase phase) { Preconditions.checkArgument(phase != null, "Model processing phase must not be null"); this.modPhase = phase; } @@ -346,7 +346,7 @@ class ModifierImpl implements ModelActionBuilder { @SuppressWarnings("unchecked") @Override public void namespaceItemAdded(final StatementContextBase context, final Class namespace, final Object key, - final Object value) throws SourceException { + final Object value) { StatementContextBase targetCtx = contextImpl(value); targetCtx.addMutation(modPhase,this); resolvePrereq((C) targetCtx); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java index 8cc179e0ae..db3dc9d211 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java @@ -34,7 +34,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.source.AnyxmlSchemaLocationNamespace; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AnyXmlEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangModeledAnyXmlEffectiveStatementImpl; @@ -97,7 +96,7 @@ public class AnyxmlStatementImpl extends AbstractDeclaredStatement implem @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java index df4f9b8366..1d7a6b7195 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ArgumentStatementImpl.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ArgumentEffectiveStatementImpl; public class ArgumentStatementImpl extends AbstractDeclaredStatement @@ -58,7 +57,7 @@ public class ArgumentStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -74,4 +73,4 @@ public class ArgumentStatementImpl extends AbstractDeclaredStatement return firstDeclared(YinElementStatement.class); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java index 86b7533357..f553a88064 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentStatementImpl.java @@ -89,8 +89,7 @@ public class AugmentStatementImpl extends AbstractDeclaredStatement> augmentNode) - throws SourceException { + final StmtContext.Mutable> augmentNode) { SUBSTATEMENT_VALIDATOR.validate(augmentNode); if (StmtContextUtils.isInExtensionBody(augmentNode)) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java index c835eb24fe..bc4ad04871 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace; import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; @@ -32,14 +31,14 @@ public final class AugmentUtils { } public static void copyFromSourceToTarget(final StatementContextBase sourceCtx, - final StatementContextBase targetCtx) throws SourceException { + final StatementContextBase targetCtx) { copyDeclaredStmts(sourceCtx, targetCtx); copyEffectiveStmts(sourceCtx, targetCtx); } // FIXME: Declared statements should not be copied. private static void copyDeclaredStmts(final StatementContextBase sourceCtx, - final StatementContextBase targetCtx) throws SourceException { + final StatementContextBase targetCtx) { final List> subStatements = new Builder>() .addAll(targetCtx.declaredSubstatements()).addAll(targetCtx.effectiveSubstatements()).build(); @@ -62,7 +61,7 @@ public final class AugmentUtils { } private static void copyEffectiveStmts(final StatementContextBase sourceCtx, - final StatementContextBase targetCtx) throws SourceException { + final StatementContextBase targetCtx) { final List> subStatements = new Builder>() .addAll(targetCtx.declaredSubstatements()).addAll(targetCtx.effectiveSubstatements()).build(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java index c3aa80cf32..3a9a66afb9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java @@ -19,7 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.BitEffectiveStatementImpl; public class BitStatementImpl extends AbstractDeclaredStatement implements BitStatement { @@ -60,7 +59,7 @@ public class BitStatementImpl extends AbstractDeclaredStatement implement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -91,4 +90,4 @@ public class BitStatementImpl extends AbstractDeclaredStatement implement return firstDeclared(PositionStatement.class); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java index 59ee8d73ad..816bdb62c5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitsSpecificationImpl.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.BitsSpecificationEffectiveStatementImpl; public class BitsSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.BitsSpecification { @@ -58,7 +57,7 @@ public class BitsSpecificationImpl extends AbstractDeclaredStatement imp @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -74,4 +73,4 @@ public class BitsSpecificationImpl extends AbstractDeclaredStatement imp return allDeclared(BitStatement.class); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java index e838237846..48a07a5890 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/CaseStatementImpl.java @@ -27,7 +27,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.CaseEffectiveStatementImpl; public class CaseStatementImpl extends AbstractDeclaredStatement implements CaseStatement { @@ -79,7 +78,7 @@ public class CaseStatementImpl extends AbstractDeclaredStatement implemen @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java index faf845a407..fc151f32e2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChoiceStatementImpl.java @@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ChoiceEffectiveStatementImpl; public class ChoiceStatementImpl extends AbstractDeclaredStatement @@ -66,8 +65,7 @@ public class ChoiceStatementImpl extends AbstractDeclaredStatement } @Override - public QName parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + public QName parseArgumentValue(StmtContext ctx, String value) { return Utils.qNameFromArgument(ctx, value); } @@ -90,7 +88,7 @@ public class ChoiceStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java index 4c4a2e4753..af1d8dd428 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ConfigStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ConfigEffectiveStatementImpl; public class ConfigStatementImpl extends AbstractDeclaredStatement implements ConfigStatement { @@ -34,7 +33,7 @@ public class ConfigStatementImpl extends AbstractDeclaredStatement impl } @Override - public Boolean parseArgumentValue(final StmtContext ctx, final String value) throws SourceException { + public Boolean parseArgumentValue(final StmtContext ctx, final String value) { return Boolean.valueOf(value); } @@ -51,7 +50,7 @@ public class ConfigStatementImpl extends AbstractDeclaredStatement impl @Override public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java index 791980b95c..9ab22d759f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContactStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ContactEffectiveStatementImpl; public class ContactStatementImpl extends AbstractDeclaredStatement implements ContactStatement{ @@ -34,7 +33,7 @@ public class ContactStatementImpl extends AbstractDeclaredStatement impl } @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -50,7 +49,7 @@ public class ContactStatementImpl extends AbstractDeclaredStatement impl @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java index 7afda05eae..475949f014 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ContainerStatementImpl.java @@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ContainerEffectiveStatementImpl; public class ContainerStatementImpl extends AbstractDeclaredStatement implements ContainerStatement { @@ -88,7 +87,7 @@ public class ContainerStatementImpl extends AbstractDeclaredStatement imp @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java index 09314d2a00..7aab5c1a66 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.Decimal64SpecificationEffectiveStatementImpl; public class Decimal64SpecificationImpl extends AbstractDeclaredStatement implements Decimal64Specification { @@ -38,7 +37,7 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement ctx, final String value) throws SourceException { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @@ -55,7 +54,7 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -76,4 +75,4 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement implements @@ -36,7 +35,7 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement impl } @Override public String parseArgumentValue( - StmtContext ctx, String value) throws SourceException { + StmtContext ctx, String value) { return value; } @@ -52,7 +51,7 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement impl @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java index 7d8e1d7dae..fa1c3e3e9f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.DescriptionEffectiveStatementImpl; public class DescriptionStatementImpl extends AbstractDeclaredStatement implements DescriptionStatement { @@ -35,7 +34,7 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -51,7 +50,7 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java index 0e0886f729..325181c97d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.DeviateEffectiveStatementImpl; public class DeviateStatementImpl extends AbstractDeclaredStatement implements DeviateStatement { @@ -48,7 +47,7 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement ctx, String value) throws SourceException { + StmtContext ctx, String value) { return Utils.parseDeviateFromString(ctx, value); } @@ -65,7 +64,7 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java index 75a6c63f50..7ea5a5760d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.DeviationEffectiveStatementImpl; public class DeviationStatementImpl extends AbstractDeclaredStatement implements DeviationStatement { @@ -57,7 +56,7 @@ public class DeviationStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java index de14c071e5..deb6339754 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.EnumSpecificationEffectiveStatementImpl; public class EnumSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.EnumSpecification { @@ -40,7 +39,7 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement imp } @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -58,7 +57,7 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement imp @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java index 1015f3fc7e..4809d7cbcf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.EnumEffectiveStatementImpl; public class EnumStatementImpl extends AbstractDeclaredStatement implements EnumStatement { @@ -60,7 +59,7 @@ public class EnumStatementImpl extends AbstractDeclaredStatement impleme @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java index 3402c7e8fd..9cb51810af 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ErrorAppTagEffectiveStatementImpl; public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement @@ -55,7 +54,7 @@ public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -65,4 +64,4 @@ public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement public String getValue() { return argument(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java index 0e7f1bf379..b01a01169f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ErrorMessageEffectiveStatementImpl; public class ErrorMessageStatementImpl extends @@ -55,7 +54,7 @@ public class ErrorMessageStatementImpl extends @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java index 0dd010deba..062a3e90a7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ExtensionEffectiveStatementImpl; public class ExtensionStatementImpl extends AbstractDeclaredStatement implements ExtensionStatement { @@ -58,13 +57,13 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement imp } @Override - public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { + public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) { stmt.addContext(ExtensionNamespace.class, stmt.getStatementArgument(), stmt); } @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java index d381d16928..29578ae775 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FeatureStatementImpl.java @@ -22,7 +22,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.FeatureEffectiveStatementImpl; public class FeatureStatementImpl extends AbstractDeclaredStatement @@ -67,7 +66,7 @@ public class FeatureStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java index 1e415ec9b5..5b54c5e9b4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java @@ -68,7 +68,7 @@ public class FractionDigitsStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java index 63ff017733..df1be54756 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingStatementImpl.java @@ -25,7 +25,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.GroupingEffectiveStatementImpl; public class GroupingStatementImpl extends AbstractDeclaredStatement @@ -78,7 +77,7 @@ public class GroupingStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { SUBSTATEMENT_VALIDATOR.validate(stmt); if (stmt != null && stmt.getParentContext() != null) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java index 19d5be006a..acea0fe085 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java @@ -47,8 +47,7 @@ public final class GroupingUtils { */ public static void copyFromSourceToTarget(final StatementContextBase sourceGrpStmtCtx, final StatementContextBase targetCtx, - final StmtContext.Mutable> usesNode) - throws SourceException { + final StmtContext.Mutable> usesNode) { QNameModule newQNameModule = getNewQNameModule(targetCtx, sourceGrpStmtCtx); @@ -60,7 +59,7 @@ public final class GroupingUtils { public static void copyDeclaredStmts(final StatementContextBase sourceGrpStmtCtx, final StatementContextBase targetCtx, final StmtContext.Mutable> usesNode, - final QNameModule newQNameModule) throws SourceException { + final QNameModule newQNameModule) { for (StatementContextBase originalStmtCtx : sourceGrpStmtCtx.declaredSubstatements()) { if (needToCopyByUses(originalStmtCtx)) { StatementContextBase copy = originalStmtCtx.createCopy(newQNameModule, targetCtx, @@ -77,7 +76,7 @@ public final class GroupingUtils { public static void copyEffectiveStmts(final StatementContextBase sourceGrpStmtCtx, final StatementContextBase targetCtx, final StmtContext.Mutable> usesNode, - final QNameModule newQNameModule) throws SourceException { + final QNameModule newQNameModule) { for (StatementContextBase originalStmtCtx : sourceGrpStmtCtx.effectiveSubstatements()) { if (needToCopyByUses(originalStmtCtx)) { StatementContextBase copy = originalStmtCtx.createCopy(newQNameModule, targetCtx, @@ -143,7 +142,7 @@ public final class GroupingUtils { public static void resolveUsesNode( final Mutable> usesNode, - final StatementContextBase targetNodeStmtCtx) throws SourceException { + final StatementContextBase targetNodeStmtCtx) { for (StatementContextBase subStmtCtx : usesNode.declaredSubstatements()) { if (StmtContextUtils.producesDeclared(subStmtCtx, RefineStatement.class)) { performRefine(subStmtCtx, targetNodeStmtCtx); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java index 6f18c54348..2deb59dc92 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.IdentityRefSpecificationEffectiveStatementImpl; public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement implements TypeStatement.IdentityRefSpecification { @@ -44,8 +43,7 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement ctx, String value) - throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -64,7 +62,7 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { final StmtContext baseStmt = StmtContextUtils.findFirstDeclaredSubstatement(stmt, BaseStatement.class); Preconditions.checkArgument(baseStmt != null, "The \"base\" statement, which is a substatement to the " + @@ -80,7 +78,7 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onStatementDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java index 178dd534a6..2b31fe726b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IdentityEffectiveStatementImpl; public class IdentityStatementImpl extends AbstractDeclaredStatement @@ -62,13 +61,13 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement } @Override - public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { + public void onStatementDefinitionDeclared(final StmtContext.Mutable> stmt) { stmt.addToNs(IdentityNamespace.class, stmt.getStatementArgument(), stmt); } @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java index bacdf2cf7e..698a0d0d87 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IfFeatureEffectiveStatementImpl; public class IfFeatureStatementImpl extends AbstractDeclaredStatement @@ -56,7 +55,7 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java index 872426cf35..ea7b3db986 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java @@ -32,7 +32,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prereq import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.source.IncludedSubmoduleNameToIdentifier; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IncludeEffectiveStatementImpl; public class IncludeStatementImpl extends AbstractDeclaredStatement implements IncludeStatement { @@ -109,7 +108,7 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement impl @Override public void onFullDefinitionDeclared(final Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -130,4 +129,4 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement impl return firstDeclared(RevisionDateStatement.class); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java index 440b9ce56b..23f2547c87 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java @@ -22,7 +22,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.InputEffectiveStatementImpl; public class InputStatementImpl extends AbstractDeclaredStatement @@ -53,8 +52,7 @@ public class InputStatementImpl extends AbstractDeclaredStatement } @Override - public QName parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + public QName parseArgumentValue(StmtContext ctx, String value) { return Utils.qNameFromArgument(ctx, "input"); } @@ -77,7 +75,7 @@ public class InputStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java index 360527e68d..fd2195e4a3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.InstanceIdentifierSpecificationEffectiveStatementImpl; public class InstanceIdentifierSpecificationImpl extends @@ -40,8 +39,7 @@ public class InstanceIdentifierSpecificationImpl extends } @Override - public String parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -59,7 +57,7 @@ public class InstanceIdentifierSpecificationImpl extends @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java index 1ff0235865..3362034be3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/KeyStatementImpl.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.KeyEffectiveStatementImpl; public class KeyStatementImpl extends AbstractDeclaredStatement> implements @@ -73,7 +72,7 @@ public class KeyStatementImpl extends AbstractDeclaredStatement, KeyStatement, - EffectiveStatement, KeyStatement>> stmt) throws SourceException { + EffectiveStatement, KeyStatement>> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java index 0489699779..2f0d688c26 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java @@ -33,7 +33,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafListEffectiveStatementImpl; public class LeafListStatementImpl extends AbstractDeclaredStatement @@ -75,7 +74,7 @@ public class LeafListStatementImpl extends AbstractDeclaredStatement @Override public QName parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + { return Utils.qNameFromArgument(ctx, value); } @@ -93,7 +92,7 @@ public class LeafListStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java index a09e1957a2..0594c7ea2b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java @@ -32,7 +32,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafEffectiveStatementImpl; public class LeafStatementImpl extends AbstractDeclaredStatement implements LeafStatement { @@ -61,8 +60,7 @@ public class LeafStatementImpl extends AbstractDeclaredStatement implemen super(Rfc6020Mapping.LEAF); } - @Override public QName parseArgumentValue(StmtContext ctx, - String value) throws SourceException { + @Override public QName parseArgumentValue(StmtContext ctx, String value) { return Utils.qNameFromArgument(ctx,value); } @@ -83,7 +81,7 @@ public class LeafStatementImpl extends AbstractDeclaredStatement implemen @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java index bac3d36578..c5dd0af72c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafrefSpecificationImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.LeafrefSpecificationEffectiveStatementImpl; public class LeafrefSpecificationImpl extends AbstractDeclaredStatement @@ -40,8 +39,7 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -59,7 +57,7 @@ public class LeafrefSpecificationImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java index 0df10da959..a8fc152e54 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LengthStatementImpl.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.LengthEffectiveStatementImpl; public class LengthStatementImpl extends AbstractDeclaredStatement> implements LengthStatement { @@ -62,7 +61,7 @@ public class LengthStatementImpl extends AbstractDeclaredStatement, - LengthStatement, EffectiveStatement, LengthStatement>> stmt) throws SourceException { + LengthStatement, EffectiveStatement, LengthStatement>> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -92,4 +91,4 @@ public class LengthStatementImpl extends AbstractDeclaredStatement getValue() { return argument(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java index 622fa9859d..3e5a84c332 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java @@ -36,7 +36,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ListEffectiveStatementImpl; public class ListStatementImpl extends AbstractDeclaredStatement @@ -79,8 +78,7 @@ public class ListStatementImpl extends AbstractDeclaredStatement } @Override - public QName parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + public QName parseArgumentValue(StmtContext ctx, String value) { return Utils.qNameFromArgument(ctx, value); } @@ -103,7 +101,7 @@ public class ListStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java index 11c292a104..dfa4b916f0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MandatoryStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.MandatoryEffectiveStatementImpl; public class MandatoryStatementImpl extends AbstractDeclaredStatement implements MandatoryStatement { @@ -64,7 +63,7 @@ public class MandatoryStatementImpl extends AbstractDeclaredStatement i @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java index fb130205cf..35a7b1f16a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MaxElementsStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.MaxElementsEffectiveStatementImpl; public class MaxElementsStatementImpl extends AbstractDeclaredStatement @@ -55,7 +54,7 @@ public class MaxElementsStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java index 4f5f9bf883..91266e935f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.MinElementsEffectiveStatementImpl; public class MinElementsStatementImpl extends @@ -55,7 +54,7 @@ public class MinElementsStatementImpl extends @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java index f66e2b96c0..4044d5ebad 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java @@ -124,7 +124,7 @@ public class ModuleStatementSupport extends @Override public void onFullDefinitionDeclared(final Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java index 8cff45a27d..26dff12995 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.MustEffectiveStatementImpl; public class MustStatementImpl extends AbstractDeclaredStatement implements MustStatement { @@ -62,7 +61,7 @@ public class MustStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java index 0c75ecfd2e..39819c82d1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.NamespaceEffectiveStatementImpl; public class NamespaceStatementImpl extends AbstractDeclaredStatement implements NamespaceStatement { @@ -46,7 +45,7 @@ public class NamespaceStatementImpl extends AbstractDeclaredStatement imple @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java index b873d3f099..2000d198ca 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NotificationStatementImpl.java @@ -26,7 +26,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.NotificationEffectiveStatementImpl; public class NotificationStatementImpl extends AbstractDeclaredStatement @@ -86,7 +85,7 @@ public class NotificationStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java index 1620774b0d..0fe45c64dc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.NumericalRestrictionsEffectiveStatementImpl; public class NumericalRestrictionsImpl extends AbstractDeclaredStatement implements @@ -55,7 +54,7 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } @@ -71,4 +70,4 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement return firstDeclared(RangeStatement.class); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java index ad4f5c60d0..7661f83617 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrderedByStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OrderedByEffectiveStatementImpl; public class OrderedByStatementImpl extends AbstractDeclaredStatement @@ -42,8 +41,7 @@ public class OrderedByStatementImpl extends AbstractDeclaredStatement } @Override - public OrderedByStatement createDeclared( - StmtContext ctx) { + public OrderedByStatement createDeclared(StmtContext ctx) { return new OrderedByStatementImpl(ctx); } @@ -55,7 +53,7 @@ public class OrderedByStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java index 798c5ae685..b5eb7bc847 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OrganizationEffectiveStatementImpl; public class OrganizationStatementImpl extends @@ -55,7 +54,7 @@ public class OrganizationStatementImpl extends @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java index ac26272f62..2da48c8391 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java @@ -22,7 +22,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OutputEffectiveStatementImpl; public class OutputStatementImpl extends AbstractDeclaredStatement implements OutputStatement { @@ -73,7 +72,7 @@ public class OutputStatementImpl extends AbstractDeclaredStatement implem @Override public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java index 2ec0cbf5f1..f6e48fd18d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PathEffectiveStatementImpl; public class PathStatementImpl extends AbstractDeclaredStatement implements PathStatement { @@ -53,7 +52,7 @@ public class PathStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java index 56f562410c..2a4ab6c9c4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java @@ -22,7 +22,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.PatternConstraintEffectiveImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.PatternEffectiveStatementImpl; import org.slf4j.Logger; @@ -77,7 +76,7 @@ public class PatternStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java index fb2256fb13..7628defa12 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PrefixStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PrefixEffectiveStatementImpl; public class PrefixStatementImpl extends AbstractDeclaredStatement implements PrefixStatement { @@ -45,7 +44,7 @@ public class PrefixStatementImpl extends AbstractDeclaredStatement imple @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java index e63f9a7125..c6b27cad54 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PresenceStatementImpl.java @@ -14,17 +14,14 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.PresenceEffectiveStatementImpl; -public class PresenceStatementImpl extends AbstractDeclaredStatement - implements PresenceStatement { +public class PresenceStatementImpl extends AbstractDeclaredStatement implements PresenceStatement { private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping .PRESENCE) .build(); - protected PresenceStatementImpl( - StmtContext context) { + protected PresenceStatementImpl(StmtContext context) { super(context); } @@ -42,8 +39,7 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement } @Override - public PresenceStatement createDeclared( - StmtContext ctx) { + public PresenceStatement createDeclared(StmtContext ctx) { return new PresenceStatementImpl(ctx); } @@ -55,7 +51,7 @@ public class PresenceStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java index 7e1bf0ad6e..ef7c0c8e2c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RangeStatementImpl.java @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.RangeEffectiveStatementImpl; public class RangeStatementImpl extends AbstractDeclaredStatement> implements RangeStatement { @@ -68,7 +67,7 @@ public class RangeStatementImpl extends AbstractDeclaredStatement, RangeStatement, - EffectiveStatement, RangeStatement>> stmt) throws SourceException { + EffectiveStatement, RangeStatement>> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java index 63448a1d40..ed29d8617c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ReferenceEffectiveStatementImpl; public class ReferenceStatementImpl extends AbstractDeclaredStatement implements ReferenceStatement { @@ -51,7 +50,7 @@ public class ReferenceStatementImpl extends AbstractDeclaredStatement im @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java index ea79b9b4a8..38ccd10ed9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java @@ -19,7 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.RefineEffectiveStatementImpl; public class RefineStatementImpl extends AbstractDeclaredStatement implements RefineStatement { @@ -65,7 +64,7 @@ public class RefineStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java index 28d4ee82b0..91487a1758 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RevisionDateStatementImpl.java @@ -37,7 +37,7 @@ public class RevisionDateStatementImpl extends AbstractDeclaredStatement i } @Override - public Date parseArgumentValue(final StmtContext ctx, final String value) throws SourceException { + public Date parseArgumentValue(final StmtContext ctx, final String value) { try { return SimpleDateFormatUtil.getRevisionFormat().parse(value); } catch (ParseException e) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java index efd30ca75a..1a3006a6e2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java @@ -28,7 +28,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.RpcEffectiveStatementImpl; public class RpcStatementImpl extends AbstractDeclaredStatement @@ -80,8 +79,7 @@ public class RpcStatementImpl extends AbstractDeclaredStatement } @Override - public void onFullDefinitionDeclared(Mutable> stmt) throws SourceException { + public void onFullDefinitionDeclared(Mutable> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java index 6c75b68e93..4f21af2195 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StatusStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.StatusEffectiveStatementImpl; public class StatusStatementImpl extends AbstractDeclaredStatement @@ -56,7 +55,7 @@ public class StatusStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java index e2745bd15d..58a55cd70a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java @@ -19,7 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.StringRestrictionsEffectiveStatementImpl; public class StringRestrictionsImpl extends AbstractDeclaredStatement implements @@ -43,7 +42,7 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement im } @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -61,7 +60,7 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement im @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java index 5516f9debc..ec614c7952 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java @@ -92,8 +92,7 @@ public class SubmoduleStatementImpl extends AbstractRootStatement> stmt) - throws SourceException { + final Mutable> stmt) { final Optional revisionDate = Optional.fromNullable( Utils.getLatestRevision(stmt.declaredSubstatements())).or(DEFAULT_REVISION); @@ -117,7 +116,7 @@ public class SubmoduleStatementImpl extends AbstractRootStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java index 8253d60d37..ba3bbb982e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java @@ -89,8 +89,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(final StmtContext ctx, final String value) - throws SourceException { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } @@ -234,4 +233,4 @@ public class TypeStatementImpl extends AbstractDeclaredStatement public String getName() { return argument(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java index b96a2708e4..3267236879 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypedefStatementImpl.java @@ -79,7 +79,7 @@ public class TypedefStatementImpl extends AbstractDeclaredStatement imple @Override public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java index 398e9881ad..a3c501b791 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnionSpecificationImpl.java @@ -17,7 +17,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.UnionSpecificationEffectiveStatementImpl; public class UnionSpecificationImpl extends AbstractDeclaredStatement @@ -39,8 +38,7 @@ public class UnionSpecificationImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) - throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -57,7 +55,7 @@ public class UnionSpecificationImpl extends AbstractDeclaredStatement } @Override - public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java index 7148cbbf25..465d1a6253 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UniqueStatementImpl.java @@ -19,7 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UniqueEffectiveStatementImpl; public class UniqueStatementImpl extends AbstractDeclaredStatement> implements UniqueStatement { @@ -41,8 +40,7 @@ public class UniqueStatementImpl extends AbstractDeclaredStatement parseArgumentValue(StmtContext ctx, String value) throws - SourceException { + public Collection parseArgumentValue(StmtContext ctx, String value) { return Utils.transformKeysStringToKeyNodes(ctx, value); } @@ -60,7 +58,7 @@ public class UniqueStatementImpl extends AbstractDeclaredStatement, UniqueStatement, - EffectiveStatement, UniqueStatement>> stmt) throws SourceException { + EffectiveStatement, UniqueStatement>> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java index 2bdd91891c..d556423742 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnitsEffectiveStatementImpl; public class UnitsStatementImpl extends AbstractDeclaredStatement @@ -54,7 +53,7 @@ public class UnitsStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java index 6a48e2a4fc..341b915e31 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnknownEffectiveStatementImpl; public class UnknownStatementImpl extends AbstractDeclaredStatement implements UnknownStatement { @@ -31,7 +30,7 @@ public class UnknownStatementImpl extends AbstractDeclaredStatement impl } @Override - public String parseArgumentValue(final StmtContext ctx, final String value) throws SourceException { + public String parseArgumentValue(final StmtContext ctx, final String value) { return value; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java index a5872bd614..f7979c4f01 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java @@ -70,8 +70,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement implemen @Override public void onFullDefinitionDeclared( - final StmtContext.Mutable> usesNode) - throws SourceException { + final StmtContext.Mutable> usesNode) { SUBSTATEMENT_VALIDATOR.validate(usesNode); if (StmtContextUtils.isInExtensionBody(usesNode)) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java index 3badb10404..573ef225b3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/WhenStatementImpl.java @@ -19,7 +19,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.WhenEffectiveStatementImpl; public class WhenStatementImpl extends AbstractDeclaredStatement implements WhenStatement { @@ -58,7 +57,7 @@ public class WhenStatementImpl extends AbstractDeclaredStatement> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java index 7910044ba3..148133b94c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java @@ -25,7 +25,6 @@ import org.opendaylight.yangtools.yang.parser.impl.YangErrorListener; import org.opendaylight.yangtools.yang.parser.impl.YangStatementParserListenerImpl; import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule; import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter; import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream; @@ -78,19 +77,19 @@ public final class YangStatementSourceImpl implements StatementStreamSource { } @Override - public void writeLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef) throws SourceException { + public void writeLinkage(final StatementWriter writer, final QNameToStatementDefinition stmtDef) { yangStatementModelParser.setAttributes(writer, stmtDef); walker.walk(yangStatementModelParser, statementContext); } @Override - public void writeLinkageAndStatementDefinitions(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { + public void writeLinkageAndStatementDefinitions(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) { yangStatementModelParser.setAttributes(writer, stmtDef, prefixes); walker.walk(yangStatementModelParser, statementContext); } @Override - public void writeFull(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) throws SourceException { + public void writeFull(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) { yangStatementModelParser.setAttributes(writer, stmtDef, prefixes); walker.walk(yangStatementModelParser, statementContext); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java index 436d8cee39..2a6a14a54e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java @@ -15,7 +15,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangVersionEffectiveStatementImpl; public class YangVersionStatementImpl extends AbstractDeclaredStatement implements YangVersionStatement { @@ -35,7 +34,7 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement } @Override - public String parseArgumentValue(StmtContext ctx, String value) throws SourceException { + public String parseArgumentValue(StmtContext ctx, String value) { return value; } @@ -52,7 +51,7 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java index 1d6f24511f..ef2418d5e3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinElementStatementImpl.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YinElementEffectiveStatementImpl; public class YinElementStatementImpl extends AbstractDeclaredStatement @@ -51,7 +50,7 @@ public class YinElementStatementImpl extends AbstractDeclaredStatement @Override public void onFullDefinitionDeclared(final StmtContext.Mutable> stmt) throws SourceException { + EffectiveStatement> stmt) { super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinStatementSourceImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinStatementSourceImpl.java index 3ae5a3e217..79164d9943 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinStatementSourceImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YinStatementSourceImpl.java @@ -19,7 +19,6 @@ import javax.xml.stream.XMLStreamReader; import org.opendaylight.yangtools.yang.parser.impl.YinStatementParserImpl; import org.opendaylight.yangtools.yang.parser.spi.source.PrefixToModule; import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter; import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream; @@ -55,7 +54,7 @@ public class YinStatementSourceImpl implements StatementStreamSource { } @Override - public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) throws SourceException { + public void writeLinkage(StatementWriter writer, QNameToStatementDefinition stmtDef) { initializeReader(); yinStatementModelParser.setAttributes(writer, stmtDef); yinStatementModelParser.walk(streamReader); @@ -63,15 +62,14 @@ public class YinStatementSourceImpl implements StatementStreamSource { @Override public void writeLinkageAndStatementDefinitions(StatementWriter writer, QNameToStatementDefinition stmtDef, - PrefixToModule prefixes) throws SourceException { + PrefixToModule prefixes) { initializeReader(); yinStatementModelParser.setAttributes(writer, stmtDef, prefixes); yinStatementModelParser.walk(streamReader); } @Override - public void writeFull(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) throws - SourceException { + public void writeFull(StatementWriter writer, QNameToStatementDefinition stmtDef, PrefixToModule prefixes) { initializeReader(); yinStatementModelParser.setAttributes(writer, stmtDef, prefixes); yinStatementModelParser.walk(streamReader); @@ -115,4 +113,4 @@ public class YinStatementSourceImpl implements StatementStreamSource { return new NamedFileInputStream(file, fileName); } -} \ No newline at end of file +} -- 2.36.6