From f87e6b2c57c7c994e223708ab5625310a35200fc Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Tue, 29 Aug 2023 16:18:40 +0200 Subject: [PATCH] Declare SuppressFBWarnings in imports Improve code readability JIRA: TRNSPRTPCE-755 Signed-off-by: Gilles Thouenon Change-Id: Ic2ff74f5b9948126a2be87764652f757871112cc --- .../common/catalog/PenaltiesComparator.java | 3 ++- .../common/mapping/PortMappingVersion121.java | 3 ++- .../common/mapping/PortMappingVersion221.java | 3 ++- .../common/mapping/PortMappingVersion710.java | 3 ++- .../common/mapping/SortPort121ByName.java | 3 ++- .../common/mapping/SortPort221ByName.java | 3 ++- .../common/mapping/SortPort710ByName.java | 3 ++- .../common/network/RequestProcessor.java | 3 ++- .../OpenRoadmInterfaceException.java | 4 +++- .../transportpce/inventory/INode.java | 3 ++- .../transportpce/inventory/INode121.java | 3 ++- .../transportpce/inventory/INode221.java | 3 ++- .../tpce/exception/TechnicalException.java | 4 +++- .../transportpce/pce/SortPortsByName.java | 3 ++- .../pce/gnpy/utils/AToZComparator.java | 3 ++- .../pce/gnpy/utils/ZToAComparator.java | 3 ++- .../transportpce/pce/graph/PceGraphEdge.java | 3 ++- .../pce/networkanalyzer/PceLink.java | 3 ++- .../renderer/ModelMappingUtils.java | 3 ++- .../DeviceRendererServiceImpl.java | 3 ++- .../RendererServiceOperationsImpl.java | 23 ++++++++++--------- .../servicehandler/ModelMappingUtils.java | 3 ++- 22 files changed, 56 insertions(+), 32 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/catalog/PenaltiesComparator.java b/common/src/main/java/org/opendaylight/transportpce/common/catalog/PenaltiesComparator.java index 55f805d02..52c917a89 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/catalog/PenaltiesComparator.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/catalog/PenaltiesComparator.java @@ -7,12 +7,13 @@ */ package org.opendaylight.transportpce.common.catalog; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; import org.opendaylight.yang.gen.v1.http.org.openroadm.operational.mode.catalog.rev211210.operational.mode.transponder.parameters.Penalties; @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class PenaltiesComparator implements Comparator, Serializable { 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 37016acb0..fe9d0ff06 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; @@ -421,7 +422,7 @@ public class PortMappingVersion121 { return null; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "SLF4J_UNKNOWN_ARRAY", justification = "False positive") private Map getDegreesMap(String deviceId, Info ordmInfo) { 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 2c0386d3a..a1e24eaab 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; @@ -574,7 +575,7 @@ public class PortMappingVersion221 { return null; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "SLF4J_UNKNOWN_ARRAY", justification = "False positive") private Map getDegreesMap(String deviceId, Info ordmInfo) { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 46b1047bb..607701f7c 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.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.Collection; import java.util.Collections; @@ -654,7 +655,7 @@ public class PortMappingVersion710 { return mcCapabilityProfiles; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "SLF4J_UNKNOWN_ARRAY", justification = "False positive") private Map getDegreesMap(String deviceId, Info ordmInfo) { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java index 21166d099..76b0d8d97 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort121ByName.java @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.common.mapping; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port; @@ -19,7 +20,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port; * */ @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class SortPort121ByName implements Comparator, Serializable { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java index de16646ff..565d98000 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort221ByName.java @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.common.mapping; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.Port; @@ -19,7 +20,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.Port; * */ @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class SortPort221ByName implements Comparator, Serializable { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort710ByName.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort710ByName.java index 82fae03f9..b9f8a8841 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort710ByName.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/SortPort710ByName.java @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.common.mapping; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.Port; @@ -18,7 +19,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.Port; * */ @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class SortPort710ByName implements Comparator, Serializable { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java b/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java index d3a61a69b..8a4780ca1 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/network/RequestProcessor.java @@ -11,6 +11,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -28,7 +29,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(value = "UL_UNRELEASED_LOCK_EXCEPTION_PATH", +@SuppressFBWarnings(value = "UL_UNRELEASED_LOCK_EXCEPTION_PATH", justification = "This appears to be doing exactly the right thing with the finally-clause to release the lock") public class RequestProcessor { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfaceException.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfaceException.java index 6f77b5654..2f476fcdd 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfaceException.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfaceException.java @@ -8,8 +8,10 @@ package org.opendaylight.transportpce.common.openroadminterfaces; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class OpenRoadmInterfaceException extends Exception { diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java index 368f40203..e1fd3cfe9 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode.java @@ -8,6 +8,7 @@ package org.opendaylight.transportpce.inventory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -16,7 +17,7 @@ import javax.sql.DataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", justification = "TODO review the SQL statement generation process") public class INode { 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 bce48a2da..def34d0e9 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -13,6 +13,7 @@ import static org.opendaylight.transportpce.inventory.utils.StringUtils.getCurre import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareDashString; import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareEmptyString; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -83,7 +84,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", justification = "TODO review the SQL statement generation process") public class INode121 { 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 5827dc25a..f42261759 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -12,6 +12,7 @@ import static org.opendaylight.transportpce.inventory.utils.StringUtils.getCurre import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareDashString; import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareEmptyString; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -79,7 +80,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", justification = "TODO review the SQL statement generation process") public class INode221 { diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/exception/TechnicalException.java b/lighty/src/main/java/io/lighty/controllers/tpce/exception/TechnicalException.java index 44aa827ec..29391fdf2 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/exception/TechnicalException.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/exception/TechnicalException.java @@ -7,7 +7,9 @@ */ package io.lighty.controllers.tpce.exception; -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class TechnicalException extends RuntimeException { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/SortPortsByName.java b/pce/src/main/java/org/opendaylight/transportpce/pce/SortPortsByName.java index a793e6d58..c04aec4ad 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/SortPortsByName.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/SortPortsByName.java @@ -7,6 +7,7 @@ */ package org.opendaylight.transportpce.pce; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; @@ -17,7 +18,7 @@ import java.util.Comparator; * */ @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class SortPortsByName implements Comparator, Serializable { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/AToZComparator.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/AToZComparator.java index 419a4e804..262b7cc19 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/AToZComparator.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/AToZComparator.java @@ -8,12 +8,13 @@ package org.opendaylight.transportpce.pce.gnpy.utils; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.atoz.direction.AToZ; @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class AToZComparator implements Comparator, Serializable { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/ZToAComparator.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/ZToAComparator.java index 836dfeed6..e946ce9f4 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/ZToAComparator.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/utils/ZToAComparator.java @@ -8,12 +8,13 @@ package org.opendaylight.transportpce.pce.gnpy.utils; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Comparator; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.ztoa.direction.ZToA; @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class ZToAComparator implements Comparator, Serializable { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraphEdge.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraphEdge.java index 6983d3f18..e5a4f251f 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraphEdge.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraphEdge.java @@ -7,11 +7,12 @@ */ package org.opendaylight.transportpce.pce.graph; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.jgrapht.graph.DefaultWeightedEdge; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class PceGraphEdge extends DefaultWeightedEdge { 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 408c6c822..96fc226e0 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 @@ -8,6 +8,7 @@ package org.opendaylight.transportpce.pce.networkanalyzer; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -32,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings("serial") -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( +@SuppressFBWarnings( value = "SE_NO_SERIALVERSIONID", justification = "https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID") public class PceLink implements Serializable { 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 746a64a94..317a184d8 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -8,6 +8,7 @@ package org.opendaylight.transportpce.renderer; import com.google.common.util.concurrent.ListenableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashSet; @@ -390,7 +391,7 @@ public final class ModelMappingUtils { } } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = {"NP_LOAD_OF_KNOWN_NULL_VALUE","RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"}, justification = "loop when value is not always null - " + "TODO: check if something exists in Java lib") diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index 5cc550c06..032c47410 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -640,7 +641,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "SLF4J_FORMAT_SHOULD_BE_CONST", justification = "Log messages content needs to be formatted before" + "since they are used in the returned object") 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 486b32112..4108679e7 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 @@ -11,6 +11,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -273,7 +274,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations }); } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private Uint32 getServiceRate(ServiceImplementationRequestInput input) { @@ -317,7 +318,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations .get(serviceName); } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private ServicePowerTurndownOutput olmPowerTurndown(ServicePathInputData servicePathInputData) @@ -330,7 +331,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations .getResult(); } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private Optional deviceRendering( @@ -415,7 +416,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations return renderingResults; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private List otnDeviceRendering( @@ -473,7 +474,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations return otnRenderingResults; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private void olmPowerSetup( @@ -540,7 +541,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations powerSetupInputZtoA)); } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private boolean isServiceActivated(String nodeId, String tpId) { @@ -623,7 +624,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations return result <= threshold; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private boolean manageServicePathCreation(ServiceImplementationRequestInput input, String serviceType, @@ -703,7 +704,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations return true; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private boolean manageServicePathDeletion(String serviceName, PathDescription pathDescription, String serviceType) @@ -780,7 +781,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations return true; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private boolean manageOtnServicePathCreation( @@ -836,7 +837,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations return true; } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "call in call() method") private boolean manageOtnServicePathDeletion( diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java index 59d9f9c51..67051bc8c 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtils.java @@ -9,6 +9,7 @@ package org.opendaylight.transportpce.servicehandler; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListenableFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.Map; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestOutput; @@ -660,7 +661,7 @@ public final class ModelMappingUtils { } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "PZLA_PREFER_ZERO_LENGTH_ARRAYS", justification = "not relevant to return and zero length array as we need real pos") public static int[] findTheLongestSubstring(String s1, String s2) { -- 2.36.6