BUG-731: do not throw Exceptions

This patch updates the configuration bindings to declare concrete
exceptions as thrown.

Furthermore it removes the ability for a LocRIBListener to throw checked
exceptoins: implementations are expected to handle them from now on.

Change-Id: Iaf4785075ea901af5cd9d9a9ad5e9954526e9a93
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java
index 98c00d01f8c7d3d92a32adffd75f5fda66ac3c5a..18977330a857f0add984be198286000c49ea5a09 100644 (file)
--- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java
+++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java
@@ -25,7 +25,7 @@ public final class ServiceLoaderBGPExtensionProviderContext {
         }
     }
 
-    public static BGPExtensionProviderContext create() throws Exception {
+    public static BGPExtensionProviderContext create() {
         final BGPExtensionProviderContext ctx = new SimpleBGPExtensionProviderContext();
 
         final ServiceLoader<BGPExtensionProviderActivator> loader = ServiceLoader

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
index 244b8ee68aeb7405ea9da8eadbe5ded7c4f5cadc..2f05e459bca7489d1a39564e1a0eb409a5cc2e02 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
@@ -16,6 +16,8 @@
  */
 package org.opendaylight.controller.config.yang.bgp.topology.provider;
 
+import java.util.concurrent.ExecutionException;
+
 import org.opendaylight.bgpcep.bgp.topology.provider.Ipv4ReachabilityTopologyBuilder;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.controller.config.api.JmxAttributeValidationException;
@@ -65,7 +67,7 @@ public final class Ipv4ReachabilityTopologyBuilderModule extends org.opendayligh
                        }
 
                        @Override
-                       public void close() throws Exception {
+                       public void close() throws InterruptedException, ExecutionException {
                                try {
                                        r.close();
                                } finally {

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
index ec153e3ef1471442a99549ab33524216c5d46b13..53d0aa513de3bfb79873af08c0331b69b22b1ade 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
@@ -16,6 +16,8 @@
  */
 package org.opendaylight.controller.config.yang.bgp.topology.provider;
 
+import java.util.concurrent.ExecutionException;
+
 import org.opendaylight.bgpcep.bgp.topology.provider.Ipv6ReachabilityTopologyBuilder;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.controller.config.api.JmxAttributeValidationException;
@@ -64,7 +66,7 @@ public final class Ipv6ReachabilityTopologyBuilderModule extends org.opendayligh
                        }
 
                        @Override
-                       public void close() throws Exception {
+                       public void close() throws InterruptedException, ExecutionException {
                                try {
                                        r.close();
                                } finally {

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
index 1c5c83f1f9baa937e9e60e50224d0a8d09eea77c..51faca02a6b41ab333edc6cf52254718e9b17043 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
@@ -16,6 +16,8 @@
  */
 package org.opendaylight.controller.config.yang.bgp.topology.provider;
 
+import java.util.concurrent.ExecutionException;
+
 import org.opendaylight.bgpcep.bgp.topology.provider.LinkstateTopologyBuilder;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.controller.config.api.JmxAttributeValidationException;
@@ -65,7 +67,7 @@ public final class LinkstateTopologyBuilderModule extends org.opendaylight.contr
                        }
 
                        @Override
-                       public void close() throws Exception {
+                       public void close() throws InterruptedException, ExecutionException {
                                try {
                                        r.close();
                                } finally {

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
index 73f888d0acbe8398eedd023ca4bd58b9f335703e..de014aa3df19bd74af0b1ef3a6fcc45532d2dcfd 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
@@ -45,7 +45,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.OspfPseudonodeCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.isis.node._case.IsisNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.isis.pseudonode._case.IsisPseudonode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.ospf.node._case.OspfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.node.identifier.c.router.identifier.ospf.pseudonode._case.OspfPseudonode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.route.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;
@@ -613,9 +612,8 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        ab.setRouterType(new PseudonodeBuilder().setPseudonode(Boolean.TRUE).build());
                        ab.setDrInterfaceId(pn.getLanInterface().getValue());
                } else if (ri instanceof OspfNodeCase) {
-                       final OspfNode in = ((OspfNodeCase) ri).getOspfNode();
-
                        // TODO: what should we do with in.getOspfRouterId()?
+                       // final OspfNode in = ((OspfNodeCase) ri).getOspfNode();
 
                        if (na != null) {
                                final NodeFlagBits nf = na.getNodeFlags();

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java
index b584ded111fa1371af7562e13d28c1f4964e0ed0..c36e45e0ec3660464fde0f7d58d3cc0b7ab4e20b 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java
@@ -22,8 +22,7 @@ public interface LocRIBListener extends EventListener {
         *              caller if it is not committed before this method returns.
         * @param event Data change event
         * @param depth Subscription path depth.
-        * @throws Exception throw it if you must. If you can handle it, please do so.
         */
        void onLocRIBChange(DataModification<InstanceIdentifier<?>, DataObject> trans,
-                       DataChangeEvent<InstanceIdentifier<?>, DataObject> event) throws Exception;
+                       DataChangeEvent<InstanceIdentifier<?>, DataObject> event);
 }

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
index b9abdf0e23e66feb871d156f1e26f8028f39a60e..a29bb8ac6522251cbd71815345e334f435465ec4 100644 (file)
--- a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
@@ -72,7 +72,8 @@ org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPSessionProposalFac
                }
 
                @Override
-               public void close() throws Exception {
+               public void close() {
+                       // Nothing to do
                }
 
                @Override

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/ServiceLoaderPCEPExtensionProviderContext.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/ServiceLoaderPCEPExtensionProviderContext.java
index c8c65b1f756a07a02a0089fa2be109fb5e990c11..395602ac9a42dead18393b7a7913c7fa7b0977f1 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/ServiceLoaderPCEPExtensionProviderContext.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/ServiceLoaderPCEPExtensionProviderContext.java
@@ -29,7 +29,7 @@ public final class ServiceLoaderPCEPExtensionProviderContext extends SimplePCEPE
 
        }
 
-       public static PCEPExtensionProviderContext create() throws Exception {
+       public static PCEPExtensionProviderContext create() {
                final PCEPExtensionProviderContext ctx = new SimplePCEPExtensionProviderContext();
 
                final ServiceLoader<PCEPExtensionProviderActivator> loader = ServiceLoader.load(PCEPExtensionProviderActivator.class);