SONAR suggestion - generic exceptions
Replace uses of generic RuntimeException
with more appropriate unchecked exceptions
Change-Id: If283743c2cf7252b8d280bdb788708ebbe57da9d
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java
index e958765..c510647 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java
@@ -193,10 +193,8 @@
*
* @param floatingIpNodes the floatingIp json node
* @return floatingIps a collection of floatingIp
- * @throws Exception when any argument is illegal
*/
- public Collection<FloatingIp> changeJsonToSub(JsonNode floatingIpNodes)
- throws Exception {
+ public Collection<FloatingIp> changeJsonToSub(JsonNode floatingIpNodes) {
checkNotNull(floatingIpNodes, JSON_NOT_NULL);
Map<FloatingIpId, FloatingIp> subMap = new HashMap<FloatingIpId, FloatingIp>();
if (!floatingIpNodes.hasNonNull("id")) {
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java
index c09b5cd..0d32a8d 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java
@@ -131,7 +131,7 @@
}
return Response.status(CREATED).entity(result.toString()).build();
- } catch (Exception e) {
+ } catch (IllegalArgumentException | IOException e) {
return Response.status(BAD_REQUEST).entity(e.getMessage()).build();
}
}
@@ -271,8 +271,7 @@
}
}
- private Collection<Router> createOrUpdateByInputStream(JsonNode subnode)
- throws Exception {
+ private Collection<Router> createOrUpdateByInputStream(JsonNode subnode) {
checkNotNull(subnode, JSON_NOT_NULL);
JsonNode routerNode = subnode.get("routers");
if (routerNode == null) {
@@ -281,7 +280,7 @@
log.debug("routerNode is {}", routerNode.toString());
if (routerNode.isArray()) {
- throw new Exception("only singleton requests allowed");
+ throw new IllegalArgumentException("only singleton requests allowed");
} else {
return changeJsonToSub(routerNode);
}
@@ -292,10 +291,8 @@
*
* @param routerNode the router json node
* @return routers a collection of router
- * @throws Exception when any argument is illegal
*/
- public Collection<Router> changeJsonToSub(JsonNode routerNode)
- throws Exception {
+ public Collection<Router> changeJsonToSub(JsonNode routerNode) {
checkNotNull(routerNode, JSON_NOT_NULL);
Map<RouterId, Router> subMap = new HashMap<RouterId, Router>();
if (!routerNode.hasNonNull("id")) {
@@ -361,11 +358,9 @@
* @param subnode the router json node
* @param routerId the router identify
* @return routers a collection of router
- * @throws Exception when any argument is illegal
*/
public Collection<Router> changeUpdateJsonToSub(JsonNode subnode,
- String routerId)
- throws Exception {
+ String routerId) {
checkNotNull(subnode, JSON_NOT_NULL);
checkNotNull(routerId, "routerId should not be null");
Map<RouterId, Router> subMap = new HashMap<RouterId, Router>();