fix DM_CONVERT_CASE SpotBugs issues in portmapping

and get rid of the related @SuppressFBWarning
by using the default Locale with toUpperCase methods

JIRA: TRNSPRTPCE-356
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I05f1f7c173c1ed12ea2aa6bc8ba4bf5844acd0e0

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 70e9e98d97ec0597cb71d3db8dec45af86b2a3f6..a214d5fdb6a34ff8166535604a9cf39fe2de0bb2 100644 (file)
--- 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,13 +9,13 @@
 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;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -702,7 +702,6 @@ public class PortMappingVersion121 {
 
     // some LOG messages are too long
     @SuppressWarnings("checkstyle:linelength")
-    @SuppressFBWarnings("DM_CONVERT_CASE")
     private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List<Mapping> portMapList) {
         // Creating mapping data for degree TTP's
         List<Degree> degrees = getDegrees(nodeId, deviceInfo);
@@ -800,15 +799,21 @@ public class PortMappingVersion121 {
                                 && port1.getPartnerPort().getPortName().equals(port2.getPortName())
                                 && port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
                                 && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) {
-                            String logicalConnectionPoint1 = new StringBuilder("DEG").append(cpMapEntry.getKey())
-                                .append("-TTP-").append(port1.getPortDirection().getName().toUpperCase()).toString();
+                            String logicalConnectionPoint1 = new StringBuilder("DEG")
+                                .append(cpMapEntry.getKey())
+                                .append("-TTP-")
+                                .append(port1.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+                                .toString();
                             LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
                                 connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
                                 port1.getPortName(), logicalConnectionPoint1);
                             portMapList.add(createMappingObject(nodeId, port1, connectionPortMap
                                 .get(cpMapEntry.getKey()).get(0).getCircuitPackName(), logicalConnectionPoint1));
-                            String logicalConnectionPoint2 = new StringBuilder("DEG").append(cpMapEntry.getKey())
-                                .append("-TTP-").append(port2.getPortDirection().getName().toUpperCase()).toString();
+                            String logicalConnectionPoint2 = new StringBuilder("DEG")
+                                .append(cpMapEntry.getKey())
+                                .append("-TTP-")
+                                .append(port2.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+                                .toString();
                             LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
                                 connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(),
                                 port2.getPortName(), logicalConnectionPoint2);

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 9117440b9cfcee6e9b9c4b4d6642773fc6c6f57e..3a099db768d67d611e41016a971d21e1668a0e0b 100644 (file)
--- 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,13 +9,13 @@
 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;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -1003,7 +1003,6 @@ public class PortMappingVersion221 {
 
     //some LOG messages are too long
     @SuppressWarnings("checkstyle:linelength")
-    @SuppressFBWarnings("DM_CONVERT_CASE")
     private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List<Mapping> portMapList) {
         // Creating mapping data for degree TTP's
         List<Degree> degrees = getDegrees(nodeId, deviceInfo);
@@ -1098,15 +1097,21 @@ public class PortMappingVersion221 {
                                 && port1.getPartnerPort().getPortName().equals(port2.getPortName())
                                 && port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
                                 && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) {
-                            String logicalConnectionPoint1 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-")
-                                .append(port1.getPortDirection().getName().toUpperCase()).toString();
+                            String logicalConnectionPoint1 = new StringBuilder("DEG")
+                                .append(cpMapEntry.getKey())
+                                .append("-TTP-")
+                                .append(port1.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+                                .toString();
                             LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
                                 connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port1.getPortName(),
                                 logicalConnectionPoint1);
                             portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(cpMapEntry.getKey()).get(0)
                                 .getCircuitPackName(), logicalConnectionPoint1));
-                            String logicalConnectionPoint2 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-")
-                                .append(port2.getPortDirection().getName().toUpperCase()).toString();
+                            String logicalConnectionPoint2 = new StringBuilder("DEG")
+                                .append(cpMapEntry.getKey())
+                                .append("-TTP-")
+                                .append(port2.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+                                .toString();
                             LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
                                 connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), port2.getPortName(),
                                 logicalConnectionPoint2);

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 9eb0cf9f6048c41db228e857129f8638794782d1..362d67e55151f1b2fcc87228fd2a36fe7809bfad 100644 (file)
--- 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,13 +9,13 @@
 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;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -1036,7 +1036,6 @@ public class PortMappingVersion710 {
 
     //some LOG messages are too long
     @SuppressWarnings("checkstyle:linelength")
-    @SuppressFBWarnings("DM_CONVERT_CASE")
     private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List<Mapping> portMapList) {
         // Creating mapping data for degree TTP's
         List<Degree> degrees = getDegrees(nodeId, deviceInfo);
@@ -1131,15 +1130,21 @@ public class PortMappingVersion710 {
                                 && port1.getPartnerPort().getPortName().equals(port2.getPortName())
                                 && port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
                                 && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) {
-                            String logicalConnectionPoint1 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-")
-                                .append(port1.getPortDirection().getName().toUpperCase()).toString();
+                            String logicalConnectionPoint1 = new StringBuilder("DEG")
+                                .append(cpMapEntry.getKey())
+                                .append("-TTP-")
+                                .append(port1.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+                                .toString();
                             LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
                                 connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), port1.getPortName(),
                                 logicalConnectionPoint1);
                             portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(cpMapEntry.getKey()).get(0)
                                 .getCircuitPackName(), logicalConnectionPoint1));
-                            String logicalConnectionPoint2 = new StringBuilder("DEG").append(cpMapEntry.getKey()).append("-TTP-")
-                                .append(port2.getPortDirection().getName().toUpperCase()).toString();
+                            String logicalConnectionPoint2 = new StringBuilder("DEG")
+                                .append(cpMapEntry.getKey())
+                                .append("-TTP-")
+                                .append(port2.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+                                .toString();
                             LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
                                 connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(), port2.getPortName(),
                                 logicalConnectionPoint2);