Do not wrap SourceException

SourceException and InferenceException are based on RuntimeException,
there is no need to wrap them in ISE. Remove the wrapper.

Change-Id: Ie599ba317671cfe2d91d54be6864d83e7e2b7c25
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 5a7a62137eeb17307a65848ae14860cd2da5aefe..e070bfd4e7b9c4c9d470f1aac5c063a937ec44dd 100644 (file)
--- 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
@@ -21,13 +21,11 @@ import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementNamespace;
 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.reactor.StatementContextBase.ContextMutation;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase.OnNamespaceItemAdded;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase.OnPhaseFinished;
@@ -61,11 +59,6 @@ final class ModifierImpl implements ModelActionBuilder {
         Preconditions.checkState(action == null, "Action was already registered.");
     }
 
-    private static IllegalStateException shouldNotHappenProbablyBug(final SourceException cause) {
-        return new IllegalStateException("Source exception during registering prerequisite. This is probably bug.",
-            cause);
-    }
-
     private boolean removeSatisfied() {
         final Iterator<AbstractPrerequisite<?>> it = unsatisfied.iterator();
         while (it.hasNext()) {
@@ -101,28 +94,20 @@ final class ModifierImpl implements ModelActionBuilder {
                     final ModelProcessingPhase phase)  {
         checkNotRegistered();
 
-        try {
-            AddedToNamespace<C> addedToNs = new AddedToNamespace<>(phase);
-            addReq(addedToNs);
-            contextImpl(context).onNamespaceItemAddedAction((Class) namespace, key, addedToNs);
-            return addedToNs;
-        } catch (SourceException e) {
-            throw shouldNotHappenProbablyBug(e);
-        }
+        AddedToNamespace<C> addedToNs = new AddedToNamespace<>(phase);
+        addReq(addedToNs);
+        contextImpl(context).onNamespaceItemAddedAction((Class) namespace, key, addedToNs);
+        return addedToNs;
     }
 
     private <C extends StmtContext<?, ?, ?>> AbstractPrerequisite<C> requiresCtxImpl(final C context,
             final ModelProcessingPhase phase) {
         checkNotRegistered();
 
-        try {
-            PhaseFinished<C> phaseFin = new PhaseFinished<>();
-            addReq(phaseFin);
-            contextImpl(context).addPhaseCompletedListener(phase, phaseFin);
-            return phaseFin;
-        } catch (SourceException e) {
-            throw shouldNotHappenProbablyBug(e);
-        }
+        PhaseFinished<C> phaseFin = new PhaseFinished<>();
+        addReq(phaseFin);
+        contextImpl(context).addPhaseCompletedListener(phase, phaseFin);
+        return phaseFin;
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -132,15 +117,11 @@ final class ModifierImpl implements ModelActionBuilder {
                 final ModelProcessingPhase phase) {
         checkNotRegistered();
 
-        try {
-            PhaseModificationInNamespace<C> mod = new PhaseModificationInNamespace<>(phase);
-            addReq(mod);
-            addMutation(mod);
-            contextImpl(context).onNamespaceItemAddedAction((Class) namespace, key, mod);
-            return mod;
-        } catch (SourceException e) {
-            throw shouldNotHappenProbablyBug(e);
-        }
+        PhaseModificationInNamespace<C> mod = new PhaseModificationInNamespace<>(phase);
+        addReq(mod);
+        addMutation(mod);
+        contextImpl(context).onNamespaceItemAddedAction((Class) namespace, key, mod);
+        return mod;
     }
 
     private static StatementContextBase<?,?,?> contextImpl(final Object value) {
@@ -163,11 +144,7 @@ final class ModifierImpl implements ModelActionBuilder {
     @Override
     public <C extends Mutable<?, ?, ?>, CT extends C> Prerequisite<C> mutatesCtx(final CT context,
             final ModelProcessingPhase phase) {
-        try {
-            return addMutation(new PhaseMutation<>(contextImpl(context), phase));
-        } catch (InferenceException e) {
-            throw shouldNotHappenProbablyBug(e);
-        }
+        return addMutation(new PhaseMutation<>(contextImpl(context), phase));
     }
 
     @Nonnull
@@ -239,11 +216,7 @@ final class ModifierImpl implements ModelActionBuilder {
     @Override
     public <N extends IdentifierNamespace<?, ?>> Prerequisite<Mutable<?, ?, ?>> mutatesNs(
             final Mutable<?, ?, ?> context, final Class<N> namespace) {
-        try {
-            return addMutation(new NamespaceMutation<>(contextImpl(context), namespace));
-        } catch (SourceException e) {
-            throw shouldNotHappenProbablyBug(e);
-        }
+        return addMutation(new NamespaceMutation<>(contextImpl(context), namespace));
     }
 
     @Nonnull