commit 5bb99a401581bc140f89d01275e9dd923ce41481
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Thu Mar 19 16:52:15 2015 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Apr 09 06:08:29 2015 +0000
tree 2e06cd88956d455d01c96ce3a10c3de57bbfcc68
parent 4313d10f471f525eca6d69fe708653a2af667834

Add support to decode Device, Port, Link JSON.

- Device, Port, Link can now be encoded and decoded back to Java Object,
  which will be Object#equals to the original.
- Modified DeviceServiceAdapter to be null-safe when possible
- Modified JSON assertion/matcher not to check for exact number of attributes

Change-Id: I7cf02e2254cf17f6265fb15847912519e564b14f

core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java

diff --git a/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
index ccd4a6d..422d062 100644
--- a/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
@@ -17,12 +17,14 @@
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
+
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.MastershipRole;
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -36,7 +38,7 @@
 
     @Override
     public Iterable<Device> getDevices() {
-        return null;
+        return Collections.emptyList();
     }
 
     @Override
@@ -58,12 +60,12 @@
 
     @Override
     public MastershipRole getRole(DeviceId deviceId) {
-        return null;
+        return MastershipRole.NONE;
     }
 
     @Override
     public List<Port> getPorts(DeviceId deviceId) {
-        return null;
+        return Collections.emptyList();
     }
 
     @Override