commit 57efbb25e752dc518105f9cb77f0bc66d198a190
author Andrea Campanella <andrea@onlab.us> Thu Feb 11 14:21:41 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 12 00:24:43 2016 +0000
tree 26ce486ec49212f9b5bf1641ec9b60d4b457dcef
parent 5c5ddcdcae3bb92e5d2fab1ce5e4516e440bfadf

Refactoring ID creation for netconf and REST

Change-Id: I4165ad53e19c86d9d9b304d09e24dcfeec2b9ddf

protocols/rest/api/src/main/java/org/onosproject/protocol/rest/DefaultRestSBDevice.java

diff --git a/protocols/rest/api/src/main/java/org/onosproject/protocol/rest/DefaultRestSBDevice.java b/protocols/rest/api/src/main/java/org/onosproject/protocol/rest/DefaultRestSBDevice.java
index aa1b959..57da2e5 100644
--- a/protocols/rest/api/src/main/java/org/onosproject/protocol/rest/DefaultRestSBDevice.java
+++ b/protocols/rest/api/src/main/java/org/onosproject/protocol/rest/DefaultRestSBDevice.java
@@ -22,6 +22,8 @@
 import org.onlab.packet.IpAddress;
 import org.onosproject.net.DeviceId;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Objects;
 
 /**
@@ -74,7 +76,13 @@
 
     @Override
     public DeviceId deviceId() {
-        return DeviceId.deviceId(REST + COLON + ip + COLON + port);
+        try {
+            return DeviceId.deviceId(new URI(REST, ip + COLON + port, null));
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Cannot create deviceID " +
+                                                       REST + COLON + ip +
+                                                       COLON + port, e);
+        }
     }
 
     @Override