commit 4fe6b238d13aba337352c309c89e86e74620737a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Jun 07 14:40:08 2016 -0700
committer Sho Shimizu <sho.shimizu@gmail.com> Wed Jun 08 17:56:42 2016 +0000
tree c954b2f710329d4f254e4fe954020f5fda661ee1
parent 34847b7fb917d0e26aff5f7452f25ce3bce4e0cc

Cosmetics

Change-Id: I46c79068f9de3451483b63e8963143ab283cf53b

core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java
index 0f3b43c..540a98f 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java
@@ -84,9 +84,7 @@
 
     @Override
     public DiscreteResources difference(DiscreteResources other) {
-        Set<DiscreteResource> diff = Sets.difference(values(), other.values());
-
-        return of(parent, diff);
+        return of(parent, Sets.difference(values(), other.values()));
     }
 
     @Override

core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
index 94e3c62..b8c8b2b 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
@@ -58,7 +58,7 @@
 
     @Override
     public DiscreteResources difference(DiscreteResources other) {
-        return new GenericDiscreteResources(Sets.difference(this.values, other.values()));
+        return of(Sets.difference(this.values(), other.values()));
     }
 
     @Override

core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java
index ceb115d..31c6488 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java
@@ -65,7 +65,7 @@
 
     @Override
     public DiscreteResources difference(DiscreteResources other) {
-        return of(Sets.difference(values(), other.values()));
+        return of(Sets.difference(this.values(), other.values()));
     }
 
     @Override