From 9a538fbba8e487c023eb496df4fd0a8e612cd44f Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 5 May 2020 11:48:09 +0200 Subject: [PATCH] fix inventory toString misuses SpotBugs issues JIRA: TRNSPRTPCE-207 TRNSPRTPCE-241 TRNSPRTPCE-265 Signed-off-by: guillaume.lambert Change-Id: I415c3c849e064ecca5065117d039f07527ace297 --- .../transportpce/inventory/INode121.java | 12 ++++++------ .../transportpce/inventory/INode221.java | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java index 9d7aa6423..32d25c4a2 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -515,7 +515,7 @@ public class INode121 { cpPort.getOtdrPort().getLaunchCableLength().toString())); String otdrPortPortDirection = (cpPort.getOtdrPort() == null ? "-1" : (cpPort.getOtdrPort().getPortDirection() == null ? "-1" : - Integer.valueOf(cpPort.getOtdrPort().getPortDirection().getIntValue()).toString())); + Integer.toString(cpPort.getOtdrPort().getPortDirection().getIntValue()))); //String ilaPortPortPowerCapabilityMixRx = ""; //String ilaPortPortPowerCapabilityMixTx = ""; //String ilaPortPortPowerCapabilityMaxRx = ""; @@ -716,7 +716,7 @@ public class INode121 { EthernetBuilder ethIfBuilder = new EthernetBuilder(deviceInterface.augmentation(Interface1.class) .getEthernet()); ethernetSpeed = (ethIfBuilder.getSpeed() == null ? "-1" : - Integer.valueOf(ethIfBuilder.getSpeed().intValue()).toString()); + Integer.toString(ethIfBuilder.getSpeed().intValue())); ethernetFec = ethIfBuilder.getFec().getName(); ethernetDuplexEnu = (ethIfBuilder.getDuplex() == null ? "" : ethIfBuilder.getDuplex().getName()); ethernetMtu = ethIfBuilder.getMtu().toString(); @@ -769,8 +769,8 @@ public class INode121 { maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().isEnabled().toString(); maintTestsignalTestpatternEnu = oduIfBuilder.getMaintTestsignal().getTestPattern().getName(); maintTestsignalTypeEnu = oduIfBuilder.getMaintTestsignal().getType().getName(); - maintTestsignalBiterrors = Integer.valueOf(oduIfBuilder.getMaintTestsignal().getBitErrors().intValue()) - .toString(); + maintTestsignalBiterrors = Integer.toString( + oduIfBuilder.getMaintTestsignal().getBitErrors().intValue()); maintTestsignalBiterrorsterminal = oduIfBuilder.getMaintTestsignal().getBitErrorsTerminal().toString(); maintTestsignalSyncseconds = oduIfBuilder.getMaintTestsignal().getSyncSeconds(); maintTestsignalSyncsecondsterminal = oduIfBuilder.getMaintTestsignal().getSyncSecondsTerminal(); @@ -1431,10 +1431,10 @@ public class INode121 { String externalLinkName = externalLink.getExternalLinkName(); String sourceNodeId = externalLink.getSource().getNodeId(); String sourceCircuitPackName = externalLink.getSource().getCircuitPackName(); - String sourcePortName = externalLink.getSource().getPortName().toString(); + String sourcePortName = externalLink.getSource().getPortName(); String destinationNodeId = externalLink.getDestination().getNodeId(); String destinationCircuitPackName = externalLink.getDestination().getCircuitPackName(); - String destinationPortName = externalLink.getDestination().getPortName().toString(); + String destinationPortName = externalLink.getDestination().getPortName(); Object[] parameters = {nodeId, externalLinkName, diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java index e22cbd404..b6d54b6d6 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -734,9 +734,9 @@ public class INode221 { persistDevInterfaceOtnOduRxMsi(nodeId, name, oduIfBuilder, connection); persistDevInterfaceOtnOduExpMsi(nodeId, name, oduIfBuilder, connection); - opuPayloadType = oduIfBuilder.getOpu().getPayloadType().toString(); - opuRxPayloadType = oduIfBuilder.getOpu().getRxPayloadType().toString(); - opuExpPayloadType = oduIfBuilder.getOpu().getExpPayloadType().toString(); + opuPayloadType = oduIfBuilder.getOpu().getPayloadType(); + opuRxPayloadType = oduIfBuilder.getOpu().getRxPayloadType(); + opuExpPayloadType = oduIfBuilder.getOpu().getExpPayloadType(); opuPayloadInterface = oduIfBuilder.getOpu().getPayloadInterface(); /*persistDevInterfaceOtnOduTxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduRxMsi(nodeId,name,oduIfBuilder,connection); @@ -1386,12 +1386,12 @@ public class INode221 { for (int i = 0; i < deviceObject.get().getExternalLink().size(); i++) { ExternalLink externalLink = deviceObject.get().getExternalLink().get(i); String externalLinkName = externalLink.getExternalLinkName(); - String sourceNodeId = externalLink.getSource().getNodeId().toString(); + String sourceNodeId = externalLink.getSource().getNodeId(); String sourceCircuitPackName = externalLink.getSource().getCircuitPackName(); - String sourcePortName = externalLink.getSource().getPortName().toString(); - String destinationNodeId = externalLink.getDestination().getNodeId().toString(); + String sourcePortName = externalLink.getSource().getPortName(); + String destinationNodeId = externalLink.getDestination().getNodeId(); String destinationCircuitPackName = externalLink.getDestination().getCircuitPackName(); - String destinationPortName = externalLink.getDestination().getPortName().toString(); + String destinationPortName = externalLink.getDestination().getPortName(); Object[] parameters = {nodeId, externalLinkName, -- 2.36.6