commit 7dac8a4bd60ec04bcb15373abf0ffe3b0a14065d
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Jan 27 12:04:39 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Jan 27 21:35:06 2016 +0000
tree e1709901401064a72bd610e98e5d25b81df9bf5c
parent 42ac51f3408591684b7027d943e0aad4bb514f16

Change the return type of ResourceId#parent()

Change-Id: Ice8c46f4dca02cfc24f85a6758a8536872b4c262

core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java

diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java b/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java
index 19a9162..03b634b 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableList;
 
 import java.util.Objects;
+import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -72,14 +73,14 @@
     }
 
     @Override
-    DiscreteResourceId parent() {
+    public Optional<DiscreteResourceId> parent() {
         if (components.size() == 0) {
-            return null;
+            return Optional.empty();
         }
         if (components.size() == 1) {
-            return ROOT;
+            return Optional.of(ROOT);
         } else {
-            return new DiscreteResourceId(components.subList(0, components.size() - 1));
+            return Optional.of(new DiscreteResourceId(components.subList(0, components.size() - 1)));
         }
     }