Refactor: Improve null safety and simplify branch conditioin
Change-Id: I0b8fdf34dcdd1914175ab21f7542d8e85cea7047
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java
index 8a31900..d66e849 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java
@@ -15,6 +15,7 @@
*/
package org.onlab.onos.net.intent.impl;
+import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
@@ -30,6 +31,7 @@
import org.onlab.onos.net.topology.PathService;
import org.onlab.onos.net.topology.TopologyEdge;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -113,12 +115,16 @@
* @param constraints path constraints
*/
ConstraintBasedLinkWeight(List<Constraint> constraints) {
- this.constraints = constraints;
+ if (constraints == null) {
+ this.constraints = Collections.emptyList();
+ } else {
+ this.constraints = ImmutableList.copyOf(constraints);
+ }
}
@Override
public double weight(TopologyEdge edge) {
- if (constraints == null || !constraints.iterator().hasNext()) {
+ if (!constraints.iterator().hasNext()) {
return 1.0;
}