From 2b4958a4635362c8f5cbe6845d9bb9aff9d0f47b Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Tue, 6 Feb 2018 18:59:06 -0800 Subject: [PATCH] SONAR suggestion - don't use generic exceptions Change-Id: I77c4325281e94e189b7f1212a932f7e912b56b51 --- .../java/org/onosproject/ofagent/impl/OFMessageEncoder.java | 3 +-- .../src/main/java/org/onosproject/rabbitmq/util/MQUtil.java | 2 +- .../onosproject/vtnweb/resources/FloatingIpWebResource.java | 3 +-- .../java/org/onosproject/cli/cfg/NetworkConfigCommand.java | 2 +- .../drivers/polatis/netconf/PolatisFlowRuleProgrammable.java | 4 ++-- .../org/onosproject/pipelines/fabric/PipeconfLoader.java | 2 +- .../org/onosproject/isis/controller/impl/Controller.java | 3 +-- .../onosproject/isis/controller/impl/IsisChannelHandler.java | 3 +-- .../onosproject/isis/io/isispacket/IsisMessageReader.java | 5 ++--- 9 files changed, 11 insertions(+), 16 deletions(-) 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 256970df82..060cb4a67f 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 @@ import org.projectfloodlight.openflow.protocol.OFMessage; public final class OFMessageEncoder extends MessageToByteEncoder> { @Override - protected void encode(ChannelHandlerContext ctx, Iterable msgList, ByteBuf out) - throws Exception { + protected void encode(ChannelHandlerContext ctx, Iterable 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 f5f649b500..cfcea12178 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 @@ public final class MQUtil { 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 c510647185..3c4daa5f09 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 @@ public class FloatingIpWebResource extends AbstractWebResource { } } - private Collection createOrUpdateByInputStream(JsonNode subnode) - throws Exception { + private Collection createOrUpdateByInputStream(JsonNode subnode) { checkNotNull(subnode, JSON_NOT_NULL); Collection 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 e427a8ca40..a45efcb089 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 @@ public class NetworkConfigCommand extends AbstractShellCommand { 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 46b6a87030..d5a025c6ca 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 @@ public class PolatisFlowRuleProgrammable 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 @@ public class PolatisFlowRuleProgrammable 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 030d2ff8b4..4a623114c6 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 @@ public class PipeconfLoader { 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 e8dc9f0daa..8e1006e2d1 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 @@ public class Controller { * 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 da0c94621b..937935b4b7 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 @@ public class IsisChannelHandler extends IdleStateAwareChannelHandler { * * @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 09cac03c73..883a8920a0 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 @@ public class IsisMessageReader { * * @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 @@ public class IsisMessageReader { * * @param channelBuffer ISIS header * @return ISIS header - * @throws Exception */ private IsisHeader getIsisHeader(ChannelBuffer channelBuffer) {