From: Robert Varga <rovarga@cisco.com>
Date: Fri, 9 May 2014 09:59:55 +0000 (+0200)
Subject: BUG-731: do not throw Exceptions
X-Git-Tag: release/helium~269
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8865bb30862dc22ce70573c5f5364a03e5136811;p=bgpcep.git

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 98c00d01f8..18977330a8 100644
--- 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 244b8ee68a..2f05e459bc 100644
--- 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 ec153e3ef1..53d0aa513d 100644
--- 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 1c5c83f1f9..51faca02a6 100644
--- 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 73f888d0ac..de014aa3df 100644
--- 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 b584ded111..c36e45e0ec 100644
--- 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 b9abdf0e23..a29bb8ac65 100644
--- 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 c8c65b1f75..395602ac9a 100644
--- 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);