From d6570206ef947fa3b667a5039311f8091a2d4570 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 18 Jun 2019 10:33:26 +0200 Subject: [PATCH] fix some sonar issues JIRA: TRNSPRTPCE-133 Change-Id: Idd9ff2a296c5e9c066d3bdfcb149a9f1fffa5d22 Signed-off-by: guillaume.lambert --- .../device/DeviceTransactionManagerImpl.java | 7 ++--- .../transportpce/pce/PceLink.java | 27 ++++++++++++------- .../transportpce/pce/PceResult.java | 5 ++-- .../transportpce/pce/PceSendingPceRPCs.java | 3 ++- .../pce/gnpy/ExtractTopoDataStoreImpl.java | 10 +++---- 5 files changed, 32 insertions(+), 20 deletions(-) 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 ca0e91976..160e0e147 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 @@ -48,13 +48,14 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager { private static final int NUMBER_OF_THREADS = 4; private static final long GET_DATA_SUBMIT_TIMEOUT = 3000; private static final TimeUnit GET_DATA_SUBMIT_TIME_UNIT = TimeUnit.MILLISECONDS; + private static final TimeUnit MAX_DURATION_TO_SUBMIT_TIMEUNIT = TimeUnit.MILLISECONDS; private final MountPointService mountPointService; private final ScheduledExecutorService checkingExecutor; private final ListeningExecutorService listeningExecutor; private final ConcurrentMap deviceLocks; - private final long maxDurationToSubmitTransaction; // TODO set reasonable value in blueprint - private final TimeUnit maxDurationToSubmitTransactionTimeUnit = TimeUnit.MILLISECONDS; + // TODO set reasonable value in blueprint for maxDurationToSubmitTransaction + private final long maxDurationToSubmitTransaction; public DeviceTransactionManagerImpl(MountPointService mountPointService, long maxDurationToSubmitTransaction) { this.mountPointService = mountPointService; @@ -66,7 +67,7 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager { @Override public Future> getDeviceTransaction(String deviceId) { - return getDeviceTransaction(deviceId, maxDurationToSubmitTransaction, maxDurationToSubmitTransactionTimeUnit); + return getDeviceTransaction(deviceId, maxDurationToSubmitTransaction, MAX_DURATION_TO_SUBMIT_TIMEUNIT); } @Override diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java index 2fb29265b..44e3fad45 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java @@ -135,14 +135,22 @@ public class PceLink { @SuppressWarnings("checkstyle:VariableDeclarationUsageDistance") public double retrieveOSNR() { - double sum = 0; // sum of 1 over the span OSNRs (linear units) - double linkOsnrDb; // link OSNR, in dB - double linkOsnrLu; // link OSNR, in dB - double spanOsnrDb; // span OSNR, in dB - double spanOsnrLu; // span OSNR, in linear units - double ampNoise = 5.5; // default amplifier noise value, in dB - double loss; // fiber span measured loss, in dB - double power; // launch power, in dB + // sum of 1 over the span OSNRs (linear units) + double sum = 0; + // link OSNR, in dB + double linkOsnrDb; + // link OSNR, in dB + double linkOsnrLu; + // span OSNR, in dB + double spanOsnrDb; + // span OSNR, in linear units + double spanOsnrLu; + // default amplifier noise value, in dB + double ampNoise = 5.5; + // fiber span measured loss, in dB + double loss; + // launch power, in dB + double power; double constantA = 38.97293; double constantB = 0.72782; double constantC = -0.532331; @@ -151,7 +159,8 @@ public class PceLink { double lowerBoundOSNR = 0.1; if (omsAttributesSpan == null) { - return 0L; // indicates no data or N/A + // indicates no data or N/A + return 0L; } loss = omsAttributesSpan.getSpanlossCurrent().getValue().doubleValue(); switch (omsAttributesSpan.getLinkConcatenation().get(0).getFiberType()) { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java index 3a340616b..b7119d898 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java @@ -21,7 +21,8 @@ public class PceResult { private boolean calcStatus = false; private String responseCode = ResponseCodes.RESPONSE_FAILED; private long resultWavelength = -1; - private long rate = -1; // for now it is constant returned as received from A-end + // for now it is constant returned as received from A-end + private long rate = -1; public enum LocalCause { NONE, TOO_HIGH_LATENCY, NO_PATH_EXISTS, INT_PROBLEM; @@ -48,7 +49,7 @@ public class PceResult { this.calcMessage = "No path available"; break; default: - LOG.error("setRC: RespondeCodes unknown");//requires sl4j but not imported + LOG.error("setRC: RespondeCodes unknown"); } } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java index bada4cb4b..bd1afea07 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java @@ -76,7 +76,8 @@ public class PceSendingPceRPCs { public void cancelResourceReserve() { LOG.info("Wait for 10s til beginning the PCE cancelResourceReserve request"); try { - Thread.sleep(10000); // sleep for 10s + // sleep for 10s + Thread.sleep(10000); } catch (InterruptedException e) { LOG.error(e.toString()); } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java index 31417baf8..000f055a8 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ExtractTopoDataStoreImpl.java @@ -331,12 +331,13 @@ public class ExtractTopoDataStoreImpl { double connOut = 0; String typeVariety = "SSMF"; - double length = 0; //convert to kilometer + double length = 0; // Compute the length of the link List linkConcatenationList = span.getLinkConcatenation(); for (LinkConcatenation linkConcatenation : linkConcatenationList) { double srlgLength = linkConcatenation.getSRLGLength(); - length += srlgLength / convertKmM; //convert to kilometer + //convert to kilometer + length += srlgLength / convertKmM; } Elements element1 = addElementsFiber(2, 0, "RLD", "Lannion_CAS", @@ -701,9 +702,8 @@ public class ExtractTopoDataStoreImpl { 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; -- 2.36.6