Merge "fix some sonar issues"

diff --cc pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java
Simple merge

diff --cc pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java
Simple merge

diff --cc pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java
index 692451f94f2ef85b96a472dc607506abe764052d,000f055a89779708d30954515f1915b034758d6e..f7dd74622382bd75411c43a142d49c4ff633f222
--- 1/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java
--- 2/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java
@@@ -623,10 -700,10 +624,9 @@@ public class ExtractTopoDataStoreImpl 
          Operational operational = new OperationalBuilder().setGainTarget(gainTarget).setTiltTarget(tiltTarget)
                  .setOutVoa(outVoa).build();
          Edfa edfa = new EdfaBuilder()
 -                // .setTypeVariety(typeVariety)
                  .setOperational(operational).build();
-         Elements element1 = new ElementsBuilder().setUid(uidEdfa) // Choose an
-                                                                   // ip
-                                                                   // address
+         Elements element1 = new ElementsBuilder().setUid(uidEdfa)
+                 // Choose an ip address
                  .setType(org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.Edfa.class)
                  .setMetadata(metadata1).setElementType(edfa).setTypeVariety(typeVariety).build();
          return element1;