SONAR suggestion - don't use generic exceptions
Change-Id: I77c4325281e94e189b7f1212a932f7e912b56b51
diff --git a/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFMessageEncoder.java b/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFMessageEncoder.java
index 256970d..060cb4a 100644
--- a/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFMessageEncoder.java
+++ b/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFMessageEncoder.java
@@ -26,8 +26,7 @@
public final class OFMessageEncoder extends MessageToByteEncoder<Iterable<OFMessage>> {
@Override
- protected void encode(ChannelHandlerContext ctx, Iterable<OFMessage> msgList, ByteBuf out)
- throws Exception {
+ protected void encode(ChannelHandlerContext ctx, Iterable<OFMessage> msgList, ByteBuf out) {
if (!ctx.channel().isActive()) {
return;
}
diff --git a/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java b/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java
index f5f649b..cfcea12 100644
--- a/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java
+++ b/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java
@@ -225,7 +225,7 @@
properties.load(is);
} catch (Exception e) {
log.error(ExceptionUtils.getFullStackTrace(e));
- throw new RuntimeException(e);
+ throw new IllegalStateException(e);
}
return properties;
}
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 c510647..3c4daa5 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
@@ -170,8 +170,7 @@
}
}
- private Collection<FloatingIp> createOrUpdateByInputStream(JsonNode subnode)
- throws Exception {
+ private Collection<FloatingIp> createOrUpdateByInputStream(JsonNode subnode) {
checkNotNull(subnode, JSON_NOT_NULL);
Collection<FloatingIp> floatingIps = null;
JsonNode floatingIpNodes = subnode.get("floatingips");
diff --git a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
index e427a8c..a45efcb 100644
--- a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
@@ -92,7 +92,7 @@
try {
print("%s", mapper.writerWithDefaultPrettyPrinter().writeValueAsString(root));
} catch (JsonProcessingException e) {
- throw new RuntimeException("Error writing JSON to string", e);
+ throw new IllegalStateException("Error writing JSON to string", e);
}
}
diff --git a/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisFlowRuleProgrammable.java b/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisFlowRuleProgrammable.java
index 46b6a87..d5a025c 100644
--- a/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisFlowRuleProgrammable.java
+++ b/drivers/polatis/netconf/src/main/java/org/onosproject/drivers/polatis/netconf/PolatisFlowRuleProgrammable.java
@@ -143,7 +143,7 @@
private String parseKeyPairCompat() {
String rev = opticalRevision(handler());
if (rev == null) {
- throw new RuntimeException(new NetconfException("Failed to obtain the revision."));
+ throw new IllegalStateException(new NetconfException("Failed to obtain the revision."));
}
String keyPairCompat;
try {
@@ -156,7 +156,7 @@
keyPairCompat = KEY_PAIR;
}
} catch (ParseException e) {
- throw new RuntimeException(new NetconfException(String.format("Incorrect date format: %s", rev)));
+ throw new IllegalArgumentException(new NetconfException(String.format("Incorrect date format: %s", rev)));
}
return keyPairCompat;
}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
index 030d2ff..4a62311 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
@@ -93,7 +93,7 @@
try {
return P4InfoParser.parse(p4InfoUrl);
} catch (P4InfoParserException e) {
- throw new RuntimeException(e);
+ throw new IllegalStateException(e);
}
}
}
diff --git a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/Controller.java b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/Controller.java
index e8dc9f0..8e1006e 100644
--- a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/Controller.java
+++ b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/Controller.java
@@ -94,9 +94,8 @@
* Updates the processes configuration.
*
* @param jsonNode json node instance
- * @throws Exception might throws parse exception
*/
- public void updateConfig(JsonNode jsonNode) throws Exception {
+ public void updateConfig(JsonNode jsonNode) {
log.debug("Controller::UpdateConfig called");
configPacket = new byte[IsisConstants.CONFIG_LENGTH];
byte numberOfInterface = 0; // number of interfaces to configure
diff --git a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/IsisChannelHandler.java b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/IsisChannelHandler.java
index da0c946..937935b 100644
--- a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/IsisChannelHandler.java
+++ b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/IsisChannelHandler.java
@@ -236,9 +236,8 @@
*
* @param isisMessage received ISIS message
* @param ctx channel handler context instance.
- * @throws Exception might throws exception
*/
- public void processIsisMessage(IsisMessage isisMessage, ChannelHandlerContext ctx) throws Exception {
+ public void processIsisMessage(IsisMessage isisMessage, ChannelHandlerContext ctx) {
log.debug("IsisChannelHandler::processIsisMessage...!!!");
int interfaceIndex = isisMessage.interfaceIndex();
IsisInterface isisInterface = isisInterfaceMap.get(interfaceIndex);
diff --git a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java
index 09cac03..883a892 100644
--- a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java
+++ b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java
@@ -40,9 +40,9 @@
*
* @param channelBuffer buffer
* @return ISIS message
- * @throws Exception exception
+ * @throws IsisParseException exception
*/
- public IsisMessage readFromBuffer(ChannelBuffer channelBuffer) throws Exception {
+ public IsisMessage readFromBuffer(ChannelBuffer channelBuffer) throws IsisParseException {
int dataLength = channelBuffer.readableBytes();
log.debug("IsisMessageReader::readFromBuffer Data length {}", dataLength);
@@ -103,7 +103,6 @@
*
* @param channelBuffer ISIS header
* @return ISIS header
- * @throws Exception
*/
private IsisHeader getIsisHeader(ChannelBuffer channelBuffer) {