Refactor: improve null safety by using empty list instead of null
Change-Id: I443942ef82819e0c27df2c2acd45eb9106038992
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java
index 2269aa0..2a4aaeb 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java
@@ -23,6 +23,7 @@
import org.onlab.onos.net.flow.TrafficTreatment;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -61,7 +62,7 @@
Collection<NetworkResource> resources,
TrafficSelector selector,
TrafficTreatment treatment) {
- this(id, appId, resources, selector, treatment, null);
+ this(id, appId, resources, selector, treatment, Collections.emptyList());
}
/**
@@ -87,7 +88,7 @@
super(id, appId, resources);
this.selector = checkNotNull(selector);
this.treatment = checkNotNull(treatment);
- this.constraints = constraints;
+ this.constraints = checkNotNull(constraints);
}
/**
@@ -97,7 +98,7 @@
super();
this.selector = null;
this.treatment = null;
- this.constraints = null;
+ this.constraints = Collections.emptyList();
}
/**