commit cbd1b39f584019da9ce26a501eb91cf075ab2902
author Jon Hall <jhall@ciena.com> Wed Jan 18 20:15:44 2017 -0800
committer Ray Milkey <ray@onlab.us> Thu Jan 19 20:24:18 2017 +0000
tree 59a29576180e3242864c1f157e74c82f32487396
parent 1745e5abbd4cf908579d79af77c3095970095d10

Sonar fixes

Rule: Use isEmpty() to check whether the collection is empty or not.

Change-Id: Ib5ab56b2263623b297db56c5cac2c2ee80e12725

utils/misc/src/main/java/org/onlab/graph/KShortestPathsSearch.java

diff --git a/utils/misc/src/main/java/org/onlab/graph/KShortestPathsSearch.java b/utils/misc/src/main/java/org/onlab/graph/KShortestPathsSearch.java
index 09735b4..c07b00a 100644
--- a/utils/misc/src/main/java/org/onlab/graph/KShortestPathsSearch.java
+++ b/utils/misc/src/main/java/org/onlab/graph/KShortestPathsSearch.java
@@ -58,7 +58,7 @@
         DijkstraGraphSearch<V, E> dijkstraSearch = new DijkstraGraphSearch<>();
         Set<Path<V, E>> dijkstraResults = dijkstraSearch.search(originalGraph, src, dst, modifiedWeighter, 1).paths();
         //Checks if the dst was reachable
-        if (dijkstraResults.size() == 0) {
+        if (dijkstraResults.isEmpty()) {
             log.warn("No path was found.");
             return result;
         }
@@ -84,7 +84,7 @@
                 }
 
                 dijkstraResults = dijkstraSearch.search(originalGraph, spurNode, dst, modifiedWeighter, 1).paths();
-                if (dijkstraResults.size() != 0) {
+                if (!dijkstraResults.isEmpty()) {
                     Path<V, E> spurPath = dijkstraResults.iterator().next();
                     List<E> totalPath = new ArrayList<>(rootPathEdgeList);
                     spurPath.edges().forEach(e -> totalPath.add(e));

utils/misc/src/main/java/org/onlab/graph/SrlgGraphSearch.java

diff --git a/utils/misc/src/main/java/org/onlab/graph/SrlgGraphSearch.java b/utils/misc/src/main/java/org/onlab/graph/SrlgGraphSearch.java
index e90b9f0..5ac35a0 100644
--- a/utils/misc/src/main/java/org/onlab/graph/SrlgGraphSearch.java
+++ b/utils/misc/src/main/java/org/onlab/graph/SrlgGraphSearch.java
@@ -184,7 +184,7 @@
         public double fitness() {
             Set<Path<V, E>> paths1 = findShortestPathFromSubset(subset).paths();
             Set<Path<V, E>> paths2 = findShortestPathFromSubset(not).paths();
-            if (paths1.size() == 0 || paths2.size() == 0) {
+            if (paths1.isEmpty() || paths2.isEmpty()) {
                 return INF;
             }
             return paths1.iterator().next().cost() + paths2.iterator().next().cost();

utils/misc/src/main/java/org/onlab/graph/SuurballeGraphSearch.java

diff --git a/utils/misc/src/main/java/org/onlab/graph/SuurballeGraphSearch.java b/utils/misc/src/main/java/org/onlab/graph/SuurballeGraphSearch.java
index f3d0e62..f517d5a 100644
--- a/utils/misc/src/main/java/org/onlab/graph/SuurballeGraphSearch.java
+++ b/utils/misc/src/main/java/org/onlab/graph/SuurballeGraphSearch.java
@@ -56,7 +56,7 @@
 
         //choose an arbitrary shortest path to run Suurballe on
         Path<V, E> shortPath = null;
-        if (firstDijkstraS.paths().size() == 0) {
+        if (firstDijkstraS.paths().isEmpty()) {
             return firstDijkstraS;
         }
 
@@ -88,7 +88,7 @@
                     .search(gt, src, dst, modified, ALL_PATHS);
 
             Path<V, E> residualShortPath = null;
-            if (secondDijkstra.paths().size() == 0) {
+            if (secondDijkstra.paths().isEmpty()) {
                 result.dpps.add(new DisjointPathPair<>(shortPath, null));
                 continue;
             }