From 38da8caec743f447c641ce0f414c242a5ece363b Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 13 Feb 2020 17:00:09 +0100 Subject: [PATCH] Fix some SpotBugs issues JIRA: TRNSPRTPCE-198 Signed-off-by: guillaume.lambert Change-Id: I14e7ef94a94036af7e5fb2725f9116c52dc23476 --- .../common/DataStoreContextImpl.java | 2 +- .../AbstractDataObjectConverter.java | 4 +-- .../converter/JSONDataObjectConverter.java | 4 +-- .../converter/XMLDataObjectConverter.java | 10 +++---- .../common/crossconnect/CrossConnectImpl.java | 4 +-- .../crossconnect/CrossConnectImpl121.java | 6 ++--- .../crossconnect/CrossConnectImpl221.java | 5 ++-- .../common/device/DeviceTransaction.java | 2 +- .../device/DeviceTransactionManagerImpl.java | 6 ++--- .../common/fixedflex/FixedFlexImpl.java | 26 +++++++++---------- .../common/mapping/PortMappingVersion121.java | 12 +++++---- .../common/mapping/PortMappingVersion221.java | 12 +++++---- .../OpenRoadmInterfacesImpl.java | 2 +- .../OpenRoadmInterfacesImpl221.java | 8 +++--- .../networkmodel/NetConfTopologyListener.java | 5 ++-- .../networkmodel/R2RLinkDiscovery.java | 2 +- .../listeners/AlarmNotificationListener.java | 2 +- .../AlarmNotificationListener221.java | 2 +- .../util/OpenRoadmOtnTopology.java | 2 +- .../networkmodel/util/OpenRoadmTopology.java | 2 +- .../networkmodel/util/TopologyUtils.java | 2 +- .../transportpce/olm/power/PowerMgmtImpl.java | 8 +++--- .../olm/power/PowerMgmtVersion121.java | 2 +- .../olm/power/PowerMgmtVersion221.java | 2 +- .../olm/service/OlmPowerServiceImpl.java | 8 +++--- .../pce/constraints/PceConstraintsCalc.java | 4 +-- .../transportpce/pce/gnpy/GnpyResult.java | 10 +++---- .../pce/gnpy/GnpyServiceImpl.java | 10 +++---- .../transportpce/pce/gnpy/GnpyTopoImpl.java | 7 +++-- .../gnpy/ServiceDataStoreOperationsImpl.java | 1 + .../pce/networkanalyzer/PceCalculation.java | 1 + .../pce/networkanalyzer/PceLink.java | 2 +- .../pce/networkanalyzer/PceOpticalNode.java | 4 +-- .../service/PathComputationServiceImpl.java | 2 +- .../renderer/ModelMappingUtils.java | 4 +-- .../RendererServiceOperationsImpl.java | 6 ++--- .../tasks/OlmPowerSetupRollbackTask.java | 2 +- .../rpcs/TransportPCEServicePathRPCImpl.java | 4 +-- .../stub/StubPceServiceOperations.java | 2 +- .../stub/StubRendererServiceOperations.java | 2 +- .../transportpce/tapi/utils/TapiUtils.java | 4 +-- .../CreateConnectivityServiceValidation.java | 2 +- 42 files changed, 107 insertions(+), 100 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java index 56f6099d5..6335ed85b 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java @@ -150,7 +150,7 @@ public class DataStoreContextImpl implements DataStoreContext { return store; } - private final class SchemaContextHolder implements DOMSchemaService, SchemaContextProvider { + private static final class SchemaContextHolder implements DOMSchemaService, SchemaContextProvider { private final SchemaContext schemaContext; private final ListenerRegistry listeners; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java b/common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java index 924dad513..3a003b011 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java @@ -7,7 +7,7 @@ */ package org.opendaylight.transportpce.common.converter; -import com.google.common.base.Preconditions; +//import com.google.common.base.Preconditions; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; @@ -75,7 +75,7 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter public Optional getDataObject( @Nonnull NormalizedNode normalizedNode, @Nonnull QName rootNode) { - Preconditions.checkNotNull(normalizedNode); + //Preconditions.checkNotNull(normalizedNode); if (normalizedNode instanceof ContainerNode) { YangInstanceIdentifier.PathArgument directChildIdentifier = YangInstanceIdentifier.of(rootNode).getLastPathArgument(); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java b/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java index 74a6a1c64..9ee941961 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java @@ -81,7 +81,7 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter { JsonReader reader = new JsonReader(new InputStreamReader(inputStream, "UTF-8")); return parseInputJSON(reader); } catch (IOException e) { - LOG.warn(e.getMessage(), e); + LOG.warn("IOException {}",e.getMessage()); return Optional.empty(); } } @@ -140,7 +140,7 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter { getSchemaContext())) { jsonParser.parse(reader); } catch (IOException e) { - LOG.warn("An error {} occured during parsing Json input stream", e.getMessage(), e); + LOG.warn("An error occured during parsing Json input stream", e); return Optional.empty(); } return Optional.ofNullable(result.getResult()); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java b/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java index a83fa3787..afcccda9a 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java @@ -100,7 +100,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputStream); return parseInputXML(reader); } catch (XMLStreamException e) { - LOG.warn(e.getMessage(), e); + LOG.warn("XMLStreamException: {}", e.getMessage()); return Optional.empty(); } } @@ -111,7 +111,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputReader); return parseInputXML(reader, parentSchema); } catch (XMLStreamException e) { - LOG.warn(e.getMessage(), e); + LOG.warn("XMLStreamException: {}", e.getMessage()); return Optional.empty(); } } @@ -129,7 +129,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputReader); return parseInputXML(reader); } catch (XMLStreamException e) { - LOG.warn(e.getMessage(), e); + LOG.warn("XMLStreamException: {}", e.getMessage()); return Optional.empty(); } } @@ -195,7 +195,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { XmlParserStream xmlParser = XmlParserStream.create(streamWriter, getSchemaContext(), parentSchemaNode)) { xmlParser.parse(reader); } catch (XMLStreamException | URISyntaxException | IOException | SAXException e) { - LOG.warn("An error {} occured during parsing XML input stream", e.getMessage(), e); + LOG.warn("An error occured during parsing XML input stream", e); return Optional.empty(); } return Optional.ofNullable(result.getResult()); @@ -234,7 +234,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter { factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); xmlStreamWriter = factory.createXMLStreamWriter(backingWriter); } catch (XMLStreamException | FactoryConfigurationError e) { - LOG.error("Error [{}] while creating XML writer", e.getMessage(), e); + LOG.error("Error while creating XML writer: ", e); throw new IllegalStateException(e); } return xmlStreamWriter; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java index 463dabd94..8ec33c505 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java @@ -47,7 +47,7 @@ public class CrossConnectImpl implements CrossConnect { else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) { return crossConnectImpl221.getCrossConnect(nodeId,connectionNumber); } - return null; + return Optional.empty(); } @@ -63,7 +63,7 @@ public class CrossConnectImpl implements CrossConnect { return crossConnectImpl221.postCrossConnect(nodeId, waveNumber, srcTp, destTp); } LOG.info("Device Version not found"); - return null; + return Optional.empty(); } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java index 99843bd08..83133b16e 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java @@ -91,7 +91,7 @@ public class CrossConnectImpl121 { LOG.info("Roadm-connection successfully created: {}-{}-{}", srcTp, destTp, waveNumber); return Optional.of(connectionNumber); } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to post {}. Exception: {}", rdmConnBldr.build(), e); + LOG.warn("Failed to post {}. Exception: ", rdmConnBldr.build(), e); } return Optional.empty(); } @@ -193,8 +193,8 @@ public class CrossConnectImpl121 { Optional rdmConnOpt = getCrossConnect(deviceId, connectionNumber); if (rdmConnOpt.isPresent()) { - RoadmConnectionsBuilder rdmConnBldr = new RoadmConnectionsBuilder(rdmConnOpt.get()); - rdmConnBldr.setOpticalControlMode(OpticalControlMode.class.cast(mode)); + RoadmConnectionsBuilder rdmConnBldr = new RoadmConnectionsBuilder(rdmConnOpt.get()) + .setOpticalControlMode(OpticalControlMode.class.cast(mode)); if (powerValue != null) { rdmConnBldr.setTargetOutputPower(new PowerDBm(powerValue)); } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java index 6e189c443..bbe54cea8 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java @@ -98,7 +98,7 @@ public class CrossConnectImpl221 { LOG.info("Roadm-connection successfully created: {}-{}-{}", srcTp, destTp, waveNumber); return Optional.of(connectionNumber); } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to post {}. Exception: {}", rdmConnBldr.build(), e); + LOG.warn("Failed to post {}. Exception: ", rdmConnBldr.build(), e); } return Optional.empty(); } @@ -109,8 +109,7 @@ public class CrossConnectImpl221 { Optional xc = getCrossConnect(deviceId, connectionName); //Check if cross connect exists before delete if (xc.isPresent()) { - String name = xc.get().getSource().getSrcIf(); - name.replace("nmc", "mc"); + String name = xc.get().getSource().getSrcIf().replace("nmc", "mc"); interfList.add(xc.get().getSource().getSrcIf()); interfList.add(xc.get().getDestination().getDstIf()); interfList.add(xc.get().getSource().getSrcIf().replace("nmc", "mc")); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java index b968d7973..e4232ff53 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransaction.java @@ -122,7 +122,7 @@ public class DeviceTransaction { future.addCallback(new FutureCallback() { @Override public void onSuccess(@Nullable CommitInfo result) { - LOG.debug("Transaction with lock {} successfully committed:", deviceLock, result); + LOG.debug("Transaction with lock {} successfully committed: {}", deviceLock, result); afterClose(); } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java index 9cf559571..6f424f511 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java @@ -106,9 +106,9 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager { LOG.debug("Timeout to submit transaction run out! Transaction was {} submitted or canceled.", deviceTx.wasSubmittedOrCancelled().get() ? "" : "not"); if (!deviceTx.wasSubmittedOrCancelled().get()) { - LOG.error(String.format("Transaction for node %s was not submitted or canceled after %s" - + " milliseconds! Cancelling transaction!", deviceId, - timeoutToSubmit)); + LOG.error( + "Transaction for node {} not submitted/canceled after {} ms. Cancelling transaction.", + deviceId, timeoutToSubmit); deviceTx.cancel(); } } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java index 9b4e3b145..0059747ea 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java @@ -16,10 +16,10 @@ public final class FixedFlexImpl implements FixedFlexInterface { private double wavelength; // wavelengthSpacing is in GHz float wavelengthSpacing = 50; - // beginWavelength is in nm: f or F is appended to treat it explicitly as simple float (and not double float) - final float beginWavelength = 1528.77f; + // BEGIN_WAVELENGTH is in nm: f or F is appended to treat it explicitly as simple float (and not double float) + static final float BEGIN_WAVELENGTH = 1528.77f; // java double is double float - d or D is appended to treat it explicitly as double float - final double precision = 10000d; + static final double PRECISION = 10000d; public FixedFlexImpl(Long index, double centreFrequency, double start, double stop, double wavelength) { this.index = index; @@ -40,13 +40,13 @@ public final class FixedFlexImpl implements FixedFlexInterface { public FixedFlexImpl(long wlIndex) { this.centerFrequency = 196.1 - (wlIndex - 1) * wavelengthSpacing / 1000; // Truncate the value to the two decimal places - this.centerFrequency = Math.round(this.centerFrequency * precision) / precision; + this.centerFrequency = Math.round(this.centerFrequency * PRECISION) / PRECISION; this.start = this.centerFrequency - (wavelengthSpacing / 2) / 1000; - this.start = Math.round(this.start * precision) / precision; + this.start = Math.round(this.start * PRECISION) / PRECISION; this.stop = this.centerFrequency + (wavelengthSpacing / 2) / 1000; - this.stop = Math.round(this.stop * precision) / precision; - this.wavelength = beginWavelength + ((wlIndex - 1) * 0.40); - this.wavelength = Math.round(this.wavelength * precision) / precision; + this.stop = Math.round(this.stop * PRECISION) / PRECISION; + this.wavelength = BEGIN_WAVELENGTH + ((wlIndex - 1) * 0.40); + this.wavelength = Math.round(this.wavelength * PRECISION) / PRECISION; } @Override @@ -59,13 +59,13 @@ public final class FixedFlexImpl implements FixedFlexInterface { long mappedWL = 61 - wlIndex; FixedFlexImpl fixedFlex = new FixedFlexImpl(); fixedFlex.centerFrequency = 193.1 + (50.0 / 1000.0) * mappedWL; - fixedFlex.centerFrequency = Math.round(fixedFlex.centerFrequency * precision) / precision; - fixedFlex.wavelength = beginWavelength + ((wlIndex - 1) * 0.40); - fixedFlex.wavelength = Math.round(fixedFlex.wavelength * precision) / precision; + fixedFlex.centerFrequency = Math.round(fixedFlex.centerFrequency * PRECISION) / PRECISION; + fixedFlex.wavelength = BEGIN_WAVELENGTH + ((wlIndex - 1) * 0.40); + fixedFlex.wavelength = Math.round(fixedFlex.wavelength * PRECISION) / PRECISION; fixedFlex.start = 193.1 + (50.0 * mappedWL - 25) / 1000.0; - fixedFlex.start = Math.round(fixedFlex.start * precision) / precision; + fixedFlex.start = Math.round(fixedFlex.start * PRECISION) / PRECISION; fixedFlex.stop = 193.1 + (50.0 * mappedWL + 25) / 1000.0; - fixedFlex.stop = Math.round(fixedFlex.stop * precision) / precision; + fixedFlex.stop = Math.round(fixedFlex.stop * PRECISION) / PRECISION; fixedFlex.index = wlIndex; return fixedFlex; } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index 81e9d7c2f..2d3a1bb39 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.common.mapping; import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -483,7 +484,7 @@ public class PortMappingVersion121 { degrees.add(ordmDegreeObject.get()); } } - LOG.info("Device {} has {} degree", degrees.size()); + LOG.info("Device {} has {} degree", deviceId, degrees.size()); return degrees; } @@ -608,7 +609,7 @@ public class PortMappingVersion121 { interfaceName = interfaceList.get(circuitPackName); } return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(new Long(degreeNumber)).setInterfaceName(interfaceName).build(); + .setDegreeNumber(Long.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); } private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName, @@ -673,6 +674,7 @@ public class PortMappingVersion121 { // some LOG messages are too long @SuppressWarnings("checkstyle:linelength") + @SuppressFBWarnings("DM_CONVERT_CASE") private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for degree TTP's List degrees = getDegrees(nodeId, deviceInfo); @@ -752,7 +754,7 @@ public class PortMappingVersion121 { && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue() && port1.getPartnerPort() != null && port2.getPartnerPort() != null && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) && port2.getPartnerPort().getPortName().equals(port1.getPortName())) || @@ -762,9 +764,9 @@ public class PortMappingVersion121 { && Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue() && port1.getPartnerPort() != null && port2.getPartnerPort() != null && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) - && port2.getPartnerPort().getPortName().equals(port1.getPortName().toString()))) { + && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) { String logicalConnectionPoint1 = new StringBuilder("DEG").append(k).append("-TTP-") .append(port1.getPortDirection().getName().toUpperCase()).toString(); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 1cc524d23..b867c390d 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.common.mapping; import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -624,7 +625,7 @@ public class PortMappingVersion221 { degrees.add(ordmDegreeObject.get()); } } - LOG.info("Device {} has {} degree", degrees.size()); + LOG.info("Device {} has {} degree", deviceId, degrees.size()); return degrees; } @@ -748,7 +749,7 @@ public class PortMappingVersion221 { interfaceName = interfaceList.get(circuitPackName); } return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(new Long(degreeNumber)).setInterfaceName(interfaceName).build(); + .setDegreeNumber(Long.valueOf(degreeNumber)).setInterfaceName(interfaceName).build(); } private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName, @@ -819,6 +820,7 @@ public class PortMappingVersion221 { //some LOG messages are too long @SuppressWarnings("checkstyle:linelength") + @SuppressFBWarnings("DM_CONVERT_CASE") private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for degree TTP's List degrees = getDegrees(nodeId, deviceInfo); @@ -899,7 +901,7 @@ public class PortMappingVersion221 { && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue() && port1.getPartnerPort() != null && port2.getPartnerPort() != null && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) && port2.getPartnerPort().getPortName().equals(port1.getPortName())) || @@ -909,9 +911,9 @@ public class PortMappingVersion221 { && Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue() && port1.getPartnerPort() != null && port2.getPartnerPort() != null && port1.getPartnerPort().getCircuitPackName().equals(cp2Name) - && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString()) + && port1.getPartnerPort().getPortName().equals(port2.getPortName()) && port2.getPartnerPort().getCircuitPackName().equals(cp1Name) - && port2.getPartnerPort().getPortName().equals(port1.getPortName().toString()))) { + && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) { String logicalConnectionPoint1 = new StringBuilder("DEG").append(k).append("-TTP-") .append(port1.getPortDirection().getName().toUpperCase()).toString(); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java index 539f95c3c..7684df1e1 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java @@ -67,7 +67,7 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { LOG.info("getInterface for 2.2.1 device {}", nodeId); return (Optional) openRoadmInterfacesImpl221.getInterface(nodeId,interfaceName); } - return null; + return Optional.empty(); } @Override diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java index dab2a4322..3c8c95a1a 100755 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java @@ -198,13 +198,13 @@ public class OpenRoadmInterfacesImpl221 { CircuitPacksBuilder cpBldr = new CircuitPacksBuilder(cp); boolean change = false; if (activate) { - if (cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().getName() - .equals(States.NotReservedInuse)) { + if (cpBldr.getEquipmentState() != null + && !cpBldr.getEquipmentState().getName().equals(States.NotReservedInuse)) { cpBldr.setEquipmentState(States.NotReservedInuse); change = true; } - } else if ((cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().getName() - .equals(States.NotReservedAvailable))) { + } else if ((cpBldr.getEquipmentState() != null + && !cpBldr.getEquipmentState().getName().equals(States.NotReservedAvailable))) { cpBldr.setEquipmentState(States.NotReservedAvailable); change = true; } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java index 43100375d..88382548d 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.transportpce.networkmodel; +//import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +//even with @SuppressFBwarnings generate a checkstyles error... import java.util.Collection; import java.util.Collections; import java.util.List; @@ -14,9 +16,7 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; - import javax.annotation.Nonnull; - import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; @@ -213,6 +213,7 @@ public class NetConfTopologyListener implements DataTreeChangeListener { } @Override + //@SuppressFBwarnings("SF_SWITCH_FALLTHROUGH") public void onDataTreeChanged(@Nonnull Collection> changes) { LOG.info("onDataTreeChanged"); for (DataTreeModification change : changes) { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java index 9df796210..4826a145b 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -296,7 +296,7 @@ public class R2RLinkDiscovery { } return TopologyUtils.deleteLink(nodeId.getValue() + "-" + srcDegId.toString(), destNodeId.getValue() + "-" + destDegId.toString(), - srcTpTx.toString(), destTpRx.toString(),networkTransactionService) + srcTpTx.toString(), destTpRx.toString(), networkTransactionService) && TopologyUtils.deleteLink(destNodeId.getValue() + "-" + destDegId.toString(), nodeId.getValue() + "-" + srcDegId.toString(), destTpTx, srcTpRx, networkTransactionService); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java index 87b159bca..ee71be736 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java @@ -67,7 +67,7 @@ public class AlarmNotificationListener implements OrgOpenroadmAlarmListener { } } } catch (InterruptedException | ExecutionException ex) { - LOG.warn("Exception thrown while reading Logical Connection Point value from {} {}", ex); + LOG.warn("Exception thrown while reading Logical Connection Point value: ", ex); } StringBuilder sb = new StringBuilder(notification.getResource().getDevice().getNodeId()).append(PIPE); sb.append(buildCause(notification.getProbableCause())); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java index 8f6f3ce2c..98cabb96e 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener221.java @@ -68,7 +68,7 @@ public class AlarmNotificationListener221 implements OrgOpenroadmAlarmListener { } } } catch (InterruptedException | ExecutionException ex) { - LOG.warn("Exception thrown while reading Logical Connection Point value from {} {}", ex); + LOG.warn("Exception thrown while reading Logical Connection Point value", ex); } StringBuilder sb = new StringBuilder(notification.getResource().getDevice().getNodeId().getValue()) .append(PIPE); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java index 9702247bb..785a872d2 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java @@ -314,7 +314,7 @@ public final class OpenRoadmOtnTopology { } else if (OpenroadmTpType.XPONDERNETWORK.equals(tpType)) { nbTps = node.getNbTpNetwork(); } else { - LOG.warn("Wrong tp-type {}, cannot create tp {}", tpType.getName()); + LOG.warn("Wrong tp-type {}, cannot create tp {}", tpType, tpType.getName()); } for (int i = 1; i <= nbTps; i++) { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java index 10910d76a..05c15e13d 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java @@ -465,7 +465,7 @@ public final class OpenRoadmTopology { LOG.info("deleting link for {}-{}", srcNode, dstNode); LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp); if (deleteLinkLinkId(linkId, networkTransactionService)) { - LOG.debug("Link Id {} updated to have admin state down"); + LOG.debug("Link Id {} updated to have admin state down", linkId); return true; } else { LOG.debug("Link Id not found for Source {} and Dest {}", srcNode, dstNode); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java index 179f64193..2d0014394 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java @@ -72,7 +72,7 @@ public final class TopologyUtils { LOG.info("deleting link for {}-{}", srcNode, dstNode); LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp); if (deleteLinkLinkId(linkId, networkTransactionService)) { - LOG.debug("Link Id {} updated to have admin state down"); + LOG.debug("Link Id {} updated to have admin state down", linkId); return true; } else { LOG.debug("Link Id not found for Source {} and Dest {}", srcNode, dstNode); diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java index ba3b5b2ca..e8fc629d9 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java @@ -8,6 +8,7 @@ package org.opendaylight.transportpce.olm.power; +//import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -58,6 +59,7 @@ public class PowerMgmtImpl implements PowerMgmt { * @return true/false based on status of operation. */ //TODO Need to Case Optical Power mode/NodeType in case of 2.2 devices + //@SuppressFBwarnings("DM_CONVERT_CASE") public Boolean setPower(ServicePowerSetupInput input) { LOG.info("Olm-setPower initiated"); for (int i = 0; i < input.getNodes().size(); i++) { @@ -261,7 +263,7 @@ public class PowerMgmtImpl implements PowerMgmt { OpticalControlMode.Power, powerValue, connectionNumber); LOG.info("Success Value is {}", setXconnPowerSuccessVal); if (setXconnPowerSuccessVal) { - LOG.info("Roadm-connection: {} updated "); + LOG.info("Roadm-connection: {} updated ", connectionNumber); //The value recommended by the white paper is 20 seconds and not 60. //TODO - commented code because one vendor is not supporting //GainLoss with target-output-power @@ -274,7 +276,7 @@ public class PowerMgmtImpl implements PowerMgmt { return false; } } catch (InterruptedException e) { - LOG.error("Olm-setPower wait failed {}", e); + LOG.error("Olm-setPower wait failed :", e); return false; } } @@ -336,7 +338,7 @@ public class PowerMgmtImpl implements PowerMgmt { } } catch (InterruptedException e) { // TODO Auto-generated catch block - LOG.error("Olm-powerTurnDown wait failed {}",e); + LOG.error("Olm-powerTurnDown wait failed: ",e); return false; } } diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java index 0cf590e43..86de6863b 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion121.java @@ -188,7 +188,7 @@ public final class PowerMgmtVersion121 { LOG.info("Transponder Power update is committed"); return true; } catch (InterruptedException | ExecutionException e) { - LOG.error("Setting transponder power failed {}", e); + LOG.error("Setting transponder power failed: ", e); return false; } diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java index f7e530bb0..f202dbc82 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtVersion221.java @@ -189,7 +189,7 @@ public final class PowerMgmtVersion221 { LOG.info("Transponder Power update is committed"); return true; } catch (InterruptedException | ExecutionException e) { - LOG.error("Setting transponder power failed {}", e); + LOG.error("Setting transponder power failed: ", e); } return false; } diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index b306eee2a..15a37d94e 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -490,7 +490,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { } } catch (OpenRoadmInterfaceException e) { // TODO Auto-generated catch block - LOG.error("OpenRoadmInterfaceException occured {}",e); + LOG.error("OpenRoadmInterfaceException occured: ",e); } /**catch (InterruptedException e) { // TODO Auto-generated catch block } catch (ExecutionException e) { @@ -517,9 +517,9 @@ public class OlmPowerServiceImpl implements OlmPowerService { LOG.info("Executing GetLinkSpanLoss"); BigDecimal spanLoss = new BigDecimal(0); for (RoadmLinks link : roadmLinks) { - String sourceNodeId = link.getSrcNodeId().toString(); + String sourceNodeId = link.getSrcNodeId(); String sourceTpId = link.getSrcTpId(); - String destNodeId = link.getDestNodeId().toString(); + String destNodeId = link.getDestNodeId(); String destTpId = link.getDestTpid(); OtsPmHolder srcOtsPmHoler = getPmMeasurements(sourceNodeId, sourceTpId, "OpticalPowerOutput"); OtsPmHolder destOtsPmHoler = getPmMeasurements(destNodeId, destTpId, "OpticalPowerInput"); @@ -550,7 +550,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { try (ReadTransaction readOnlyTransaction = this.dataBroker.newReadOnlyTransaction()) { realNode = readOnlyTransaction.read(LogicalDatastoreType.CONFIGURATION, mappedNodeII).get(); } catch (InterruptedException | ExecutionException e) { - LOG.error(e.getMessage(), e); + LOG.error("Error on getRealNodeId {} :", mappedNodeId, e); throw new IllegalStateException(e); } if (!realNode.isPresent() || (realNode.get().getSupportingNode() == null)) { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java index 94b27b01e..f8c2ecb6a 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java @@ -262,7 +262,7 @@ public class PceConstraintsCalc { } break; default: - LOG.info("in readDiversity unsupported divercity type", rt); + LOG.info("in readDiversity unsupported divercity type {}", rt); } } else { @@ -289,7 +289,7 @@ public class PceConstraintsCalc { return true; }).map(aToZ -> { Node node = ((Node) aToZ.getResource().getResource()); - return node.getNodeId().toString(); + return node.getNodeId(); }).collect(Collectors.toList()); } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java index 89adaec01..3c498da3d 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java @@ -8,7 +8,7 @@ package org.opendaylight.transportpce.pce.gnpy; -import com.google.common.base.Preconditions; +//import com.google.common.base.Preconditions; import com.google.gson.stream.JsonReader; import java.io.ByteArrayInputStream; @@ -274,11 +274,11 @@ public class GnpyResult { public Optional getDataObject(@Nonnull NormalizedNode normalizedNode, @Nonnull QName rootNode, BindingNormalizedNodeSerializer codecRegistry) { if (normalizedNode != null) { - LOG.debug("GNPy: The codecRegistry is ", codecRegistry.toString()); + LOG.debug("GNPy: The codecRegistry is {}", codecRegistry.toString()); } else { LOG.warn("GNPy: The codecRegistry is null"); } - Preconditions.checkNotNull(normalizedNode); + //Preconditions.checkNotNull(normalizedNode); if (normalizedNode instanceof ContainerNode) { YangInstanceIdentifier.PathArgument directChildIdentifier = YangInstanceIdentifier.of(rootNode) .getLastPathArgument(); @@ -288,10 +288,10 @@ public class GnpyResult { throw new IllegalStateException(String.format("Could not get the direct child of %s", rootNode)); } normalizedNode = directChild.get(); - LOG.debug("GNPy: the normalized node is ", normalizedNode.getNodeType()); + LOG.debug("GNPy: the normalized node is {}", normalizedNode.getNodeType()); } YangInstanceIdentifier rootNodeYangInstanceIdentifier = YangInstanceIdentifier.of(rootNode); - LOG.debug("GNPy: the root Node Yang Instance Identifier is ", rootNodeYangInstanceIdentifier.toString()); + LOG.debug("GNPy: the root Node Yang Instance Identifier is {}", rootNodeYangInstanceIdentifier.toString()); Map.Entry bindingNodeEntry = codecRegistry.fromNormalizedNode(rootNodeYangInstanceIdentifier, normalizedNode); if (bindingNodeEntry == null) { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java index 060895b34..d32ab4214 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java @@ -261,7 +261,7 @@ public class GnpyServiceImpl { } for (Elements element : this.elements) { - if (element.getUid().contains(ipAddress.getIpv4Address().getValue().toString())) { + if (element.getUid().contains(ipAddress.getIpv4Address().getValue())) { if ((this.currentNodeIpAddress == null) || (this.currentNodeIpAddress != ipAddress)) { this.currentNodeIpAddress = ipAddress; RouteObjectIncludeExclude routeObjectIncludeExclude = addRouteObjectIncludeExclude(ipAddress, 1); @@ -280,7 +280,7 @@ public class GnpyServiceImpl { //Add a link to the route object private void addLinkToRouteObject(String linkId) throws GnpyException { if (linkId == null) { - throw new GnpyException(String.format("In GnpyServiceImpl: the linkId %s does not exist",linkId)); + throw new GnpyException(String.format("In GnpyServiceImpl: the linkId does not exist")); } //Only the ROADM-to-ROADM link are included in the route object if (!mapLinkFiber.containsKey(linkId)) { @@ -308,7 +308,7 @@ public class GnpyServiceImpl { TeTpId teTpId = new TeTpId(teTpValue); NumUnnumHop numUnnumHop = new org.opendaylight.yang.gen.v1.gnpy.path.rev190502.explicit.route.hop.type.num .unnum.hop.NumUnnumHopBuilder() - .setNodeId(teNodeId.getIpv4Address().getValue().toString()) + .setNodeId(teNodeId.getIpv4Address().getValue()) .setLinkTpId(teTpId.getUint32().toString()) .setHopType(TeHopType.STRICT).build(); Type type1 = new NumUnnumHopBuilder().setNumUnnumHop(numUnnumHop).build(); @@ -348,8 +348,8 @@ public class GnpyServiceImpl { .setDisjointness(new TePathDisjointness(true, true, false)) .setRequestIdNumber(requestIdNumber).build(); List synchro = new ArrayList<>(); - Synchronization synchronization1 = new SynchronizationBuilder().setSynchronizationId(new Long(0)).setSvec(svec) - .build(); + Synchronization synchronization1 = new SynchronizationBuilder().setSynchronizationId(Long.valueOf(0)) + .setSvec(svec).build(); synchro.add(synchronization1); return (synchro); } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java index f0f55dca7..5560ea7dd 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java @@ -190,15 +190,14 @@ public class GnpyTopoImpl { if (commonNetworkNode1.getNodeType().getName().equals("ROADM")) { if (!nodesList.contains(nodeRef)) { Elements element = createElementsRoadm(LATITUDE, LONGITUTE, nodeRef, - openRoadmNetNode1.getShelf(),TARGET_PCH_OUT_DB, ipAddress.getIpv4Address().getValue() - .toString()); + openRoadmNetNode1.getShelf(),TARGET_PCH_OUT_DB, ipAddress.getIpv4Address().getValue()); this.elements.add(element); nodesList.add(nodeRef); } } else if (commonNetworkNode1.getNodeType().getName().equals("XPONDER")) { if (!nodesList.contains(nodeRef)) { Elements element = createElementsTransceiver(LATITUDE, LONGITUTE, nodeRef, - openRoadmNetNode1.getShelf(),ipAddress.getIpv4Address().getValue().toString()); + openRoadmNetNode1.getShelf(),ipAddress.getIpv4Address().getValue()); this.elements.add(element); nodesList.add(nodeRef); trxList.add(nodeRef); @@ -309,7 +308,7 @@ public class GnpyTopoImpl { Elements element = createElementsEdfa(LATITUDE, LONGITUTE, REGION, CITY, ila.getGain().getValue(), ila.getTilt().getValue(), ila.getOutVoaAtt().getValue(), "std_medium_gain", - ipEdfa.getIpv4Address().getValue().toString()); + ipEdfa.getIpv4Address().getValue()); this.elements.add(element); return ipEdfa; } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java index 5342387af..b282b7d37 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.pce.gnpy; import com.google.common.base.Function; +//false positive in SpotBug -> cannot be used with FluentIterable... import com.google.common.collect.FluentIterable; import java.io.BufferedWriter; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java index f0a8e67a4..c6158756f 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java @@ -471,6 +471,7 @@ public class PceCalculation { Node1 node1 = node.augmentation(Node1.class); if (node1 == null) { LOG.error("getNodeType: no Node1 (type) Augmentation for node: [{}]. Node is ignored", node.getNodeId()); + return false; } OpenroadmNodeType nodeType = node1.getNodeType(); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java index 0a2159484..92b483d65 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java @@ -129,7 +129,7 @@ public class PceLink { for (int i = 0; i < this.omsAttributesSpan.getLinkConcatenation().size(); i++) { //Length is expressed in meter and latency is expressed in ms according to OpenROADM MSA tmp += this.omsAttributesSpan.getLinkConcatenation().get(i).getSRLGLength() / CELERITY; - LOG.info("In PceLink: The latency of link {} == {}",link.getLinkId(),tmplatency); + LOG.info("In PceLink: The latency of link {} == {}",link.getLinkId(),tmp); } tmplatency = (long) Math.ceil(tmp); } catch (NullPointerException e) { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java index e8b70cc3e..e9273e1d2 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java @@ -111,7 +111,7 @@ public class PceOpticalNode implements PceNode { LOG.info("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType()); } else { - LOG.warn("initSrgTpList: SRG-PP tp = {} found is busy !!"); + LOG.warn("initSrgTpList: SRG-PP tp = {} found is busy !!", tp.getTpId().getValue()); } break; default: @@ -245,7 +245,7 @@ public class PceOpticalNode implements PceNode { OpenroadmTpType srgType = null; OpenroadmTpType cpType = this.availableSrgCp.get(tp); if (cpType == null) { - LOG.error("getRdmSrgClient: tp {} not existed in SRG CPterminationPoint list"); + LOG.error("getRdmSrgClient: tp {} not existed in SRG CPterminationPoint list", tp); return null; } switch (cpType) { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java index 1b4e0589d..ae7c81bf3 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImpl.java @@ -88,7 +88,7 @@ public class PathComputationServiceImpl implements PathComputationService { try { notificationPublishService.putNotification(this.notification); } catch (InterruptedException e) { - LOG.info("notification offer rejected : ", e.getMessage()); + LOG.info("notification offer rejected: ", e); } } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java index 61c3113b7..c01d79609 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -90,7 +90,7 @@ public final class ModelMappingUtils { ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder() .setServiceName(serviceName) .setOperation(ServicePathInput.Operation.Create) - .setWaveNumber(new Long(pathDescription.getAToZDirection().getAToZWavelengthNumber())) + .setWaveNumber(Long.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber())) .setNodes(nodeLists.getList()); return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists); } @@ -101,7 +101,7 @@ public final class ModelMappingUtils { ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder() .setOperation(ServicePathInput.Operation.Create) .setServiceName(serviceName) - .setWaveNumber(new Long(pathDescription.getZToADirection().getZToAWavelengthNumber())) + .setWaveNumber(Long.valueOf(pathDescription.getZToADirection().getZToAWavelengthNumber())) .setNodes(nodeLists.getList()); return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index 2bd6d995f..bee4d90eb 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -104,14 +104,14 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations try { notificationPublishService.putNotification(this.notification); } catch (InterruptedException e) { - LOG.info("notification offer rejected : ", e.getMessage()); + LOG.info("notification offer rejected: ", e); } } @Override public ListenableFuture serviceImplementation(ServiceImplementationRequestInput input) { - LOG.info("Calling service impl request {} {}", input.getServiceName()); + LOG.info("Calling service impl request {}", input.getServiceName()); return executor.submit(new Callable() { @Override @@ -202,7 +202,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations @Override public ListenableFuture serviceDelete(ServiceDeleteInput input) { String serviceName = input.getServiceName(); - LOG.info("Calling service delete request {} {}", input.getServiceName()); + LOG.info("Calling service delete request {}", input.getServiceName()); return executor.submit(new Callable() { @Override diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java index 165dc8810..58f3d1f4d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java @@ -52,7 +52,7 @@ public class OlmPowerSetupRollbackTask extends RollbackTask { if (FAILED.equals(powerTurndownResult.getResult().getResult())) { LOG.warn("Olmp power setup rollback for {} was not successful!", this.getId()); } else { - LOG.info("Olm power setup rollback for {} was successful."); + LOG.info("Olm power setup rollback for {} was successful.", this.getId()); } return null; } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java index dce7d7178..aa36fc506 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java @@ -35,7 +35,7 @@ public class TransportPCEServicePathRPCImpl implements TransportpceRendererServi @Override public ListenableFuture> serviceDelete(ServiceDeleteInput input) { String serviceName = input.getServiceName(); - LOG.info("Calling RPC service delete request {} {}", serviceName); + LOG.info("Calling RPC service delete request {}", serviceName); ServiceDeleteOutput output = null; try { output = this.rendererServiceOperations.serviceDelete(input).get(); @@ -49,7 +49,7 @@ public class TransportPCEServicePathRPCImpl implements TransportpceRendererServi public ListenableFuture> serviceImplementationRequest( ServiceImplementationRequestInput input) { String serviceName = input.getServiceName(); - LOG.info("Calling RPC service impl request {} {}", serviceName); + LOG.info("Calling RPC service impl request {}", serviceName); ServiceImplementationRequestOutput output = null; try { output = this.rendererServiceOperations.serviceImplementation(input).get(); diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java index 4ca93795b..be863a49e 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubPceServiceOperations.java @@ -57,7 +57,7 @@ public class StubPceServiceOperations implements PathComputationService { LOG.info("putting notification : {}", notif); notificationPublishService.putNotification(notif); } catch (InterruptedException e) { - LOG.info("notification offer rejected : ", e.getMessage()); + LOG.info("notification offer rejected: ", e); } } diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java index 38c1d4c1e..a3a0ca075 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/stub/StubRendererServiceOperations.java @@ -71,7 +71,7 @@ public class StubRendererServiceOperations implements RendererServiceOperations LOG.info("putting notification : {}", notif); notificationPublishService.putNotification(notif); } catch (InterruptedException e) { - LOG.info("notification offer rejected : ", e.getMessage()); + LOG.info("notification offer rejected: ", e); } } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiUtils.java index 4256b8e25..501b5c4a1 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiUtils.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiUtils.java @@ -54,7 +54,7 @@ public final class TapiUtils { String txPortName, String rxPortDeviceName, String rxPortName) { ServiceAEnd serviceAEnd = new ServiceAEndBuilder().setClli(clli).setNodeId(new NodeIdType(nodeid)).setOpticType( OpticTypes.Gray).setServiceFormat( - ServiceFormat.Ethernet).setServiceRate(new Long(100)) + ServiceFormat.Ethernet).setServiceRate(Long.valueOf(100)) .setTxDirection( new TxDirectionBuilder() .setPort(new PortBuilder().setPortDeviceName(txPortDeviceName).setPortName(txPortName) @@ -76,7 +76,7 @@ public final class TapiUtils { String txPortName, String rxPortDeviceName, String rxPortName) { ServiceZEnd serviceZEnd = new ServiceZEndBuilder().setClli(clli).setNodeId(new NodeIdType(nodeid)).setOpticType( OpticTypes.Gray).setServiceFormat( - ServiceFormat.Ethernet).setServiceRate(new Long(100)) + ServiceFormat.Ethernet).setServiceRate(Long.valueOf(100)) .setTxDirection( new TxDirectionBuilder() .setPort(new PortBuilder().setPortDeviceName(txPortDeviceName).setPortName(txPortName) diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java index aba87de6e..ec3bce4a9 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java @@ -75,7 +75,7 @@ public final class CreateConnectivityServiceValidation { } catch (NullPointerException e) { LOG.error("one of input parameter is null ", e); - OperationResult.failed("one of input parameter is null."); + return OperationResult.failed("one of input parameter is null."); } return OperationResult.ok("Validation successful."); } -- 2.36.6