Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Technical debt - Fix PCE sonar issues
[transportpce.git]
/
pce
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
pce
/
graph
/
InAlgoPathValidator.java
diff --git
a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/InAlgoPathValidator.java
b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/InAlgoPathValidator.java
index 92ffaea23da8a9e5fe3cbe6f8a818ce1fadefea5..c915a2772d15ce48cde8f57940148abe5f314d7a 100644
(file)
--- a/
pce/src/main/java/org/opendaylight/transportpce/pce/graph/InAlgoPathValidator.java
+++ b/
pce/src/main/java/org/opendaylight/transportpce/pce/graph/InAlgoPathValidator.java
@@
-11,13
+11,13
@@
package org.opendaylight.transportpce.pce.graph;
import org.jgrapht.GraphPath;
import org.jgrapht.alg.shortestpath.PathValidator;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
import org.jgrapht.GraphPath;
import org.jgrapht.alg.shortestpath.PathValidator;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
-//import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InAlgoPathValidator implements PathValidator<String, PceGraphEdge> {
/* Logging. */
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InAlgoPathValidator implements PathValidator<String, PceGraphEdge> {
/* Logging. */
- private static final Logger LOG = LoggerFactory.getLogger(PceGraph.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InAlgoPathValidator.class);
+ private static final String IN_CHECK_PATH_DROPPED_MSG = "in checkPath dropped {} {} ";
public InAlgoPathValidator() {
super();
public InAlgoPathValidator() {
super();
@@
-32,42
+32,41
@@
public class InAlgoPathValidator implements PathValidator<String, PceGraphEdge>
LOG.debug("InAlgoPathValidator: partialPath size: {} prev edge {} new edge {}",
size, edge.link().getlinkType(), partialPath.getEdgeList().get(size - 1).link().getlinkType());
LOG.debug("InAlgoPathValidator: partialPath size: {} prev edge {} new edge {}",
size, edge.link().getlinkType(), partialPath.getEdgeList().get(size - 1).link().getlinkType());
- if ((!checkTurn(partialPath.getEdgeList().get(size - 1).link().getlinkType(), edge.link().getlinkType()))) {
- return false;
- } else {
- return true;
- }
+ return (checkTurn(partialPath.getEdgeList().get(size - 1).link().getlinkType(), edge.link().getlinkType()));
}
}
+ @SuppressWarnings("java:S1541")
+ //sonar issue The Cyclomatic Complexity of this method "checkTurn" is 13 which is greater than 10 authorized.
+ //here we have clear conditional, so for the moment no need to manage this issue
private boolean checkTurn(OpenroadmLinkType prevType, OpenroadmLinkType nextType) {
if (nextType == OpenroadmLinkType.ADDLINK && prevType != OpenroadmLinkType.XPONDEROUTPUT) {
private boolean checkTurn(OpenroadmLinkType prevType, OpenroadmLinkType nextType) {
if (nextType == OpenroadmLinkType.ADDLINK && prevType != OpenroadmLinkType.XPONDEROUTPUT) {
- LOG.debug(
"in checkPath dropped {} {} "
, prevType, nextType);
+ LOG.debug(
IN_CHECK_PATH_DROPPED_MSG
, prevType, nextType);
return false;
}
if (nextType == OpenroadmLinkType.EXPRESSLINK && prevType != OpenroadmLinkType.ROADMTOROADM) {
return false;
}
if (nextType == OpenroadmLinkType.EXPRESSLINK && prevType != OpenroadmLinkType.ROADMTOROADM) {
- LOG.debug(
"in checkPath dropped {} {} "
, prevType, nextType);
+ LOG.debug(
IN_CHECK_PATH_DROPPED_MSG
, prevType, nextType);
return false;
}
if (nextType == OpenroadmLinkType.DROPLINK && prevType != OpenroadmLinkType.ROADMTOROADM) {
return false;
}
if (nextType == OpenroadmLinkType.DROPLINK && prevType != OpenroadmLinkType.ROADMTOROADM) {
- LOG.debug(
"in checkPath dropped {} {} "
, prevType, nextType);
+ LOG.debug(
IN_CHECK_PATH_DROPPED_MSG
, prevType, nextType);
return false;
}
if (nextType == OpenroadmLinkType.XPONDERINPUT && prevType != OpenroadmLinkType.DROPLINK) {
return false;
}
if (nextType == OpenroadmLinkType.XPONDERINPUT && prevType != OpenroadmLinkType.DROPLINK) {
- LOG.debug(
"in checkPath dropped {} {} "
, prevType, nextType);
+ LOG.debug(
IN_CHECK_PATH_DROPPED_MSG
, prevType, nextType);
return false;
}
if (prevType == OpenroadmLinkType.EXPRESSLINK && nextType != OpenroadmLinkType.ROADMTOROADM) {
return false;
}
if (prevType == OpenroadmLinkType.EXPRESSLINK && nextType != OpenroadmLinkType.ROADMTOROADM) {
- LOG.debug(
"in checkPath dropped {} {} "
, prevType, nextType);
+ LOG.debug(
IN_CHECK_PATH_DROPPED_MSG
, prevType, nextType);
return false;
}
if (prevType == OpenroadmLinkType.ADDLINK && nextType != OpenroadmLinkType.ROADMTOROADM) {
return false;
}
if (prevType == OpenroadmLinkType.ADDLINK && nextType != OpenroadmLinkType.ROADMTOROADM) {
- LOG.debug(
"in checkPath dropped {} {} "
, prevType, nextType);
+ LOG.debug(
IN_CHECK_PATH_DROPPED_MSG
, prevType, nextType);
return false;
}
return false;
}