commit f503a62372ffa55150936628689d1435109ffccb
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed May 25 11:12:23 2016 -0700
committer Sho Shimizu <sho.shimizu@gmail.com> Tue May 31 20:04:16 2016 +0000
tree 43d8d7cb60cd82400f77ff2755394c95e4ea5f01
parent 65de9619e77095b53549013cf901385ad6df54d1

Rename NonEncodableDiscreteResources to GenericDiscreteResources

Change-Id: Ib610895b3e2251af1ae5b1cae2b9b8f378a8d920
(cherry picked from commit 18b27e2b73b8e6f9e97997e381a73051f41797f6)

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 1b4ded4..7b15a0a 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
@@ -33,7 +33,7 @@
  * and those that can't encoded as integer.
  */
 final class UnifiedDiscreteResources implements DiscreteResources {
-    private final DiscreteResources nonEncodables;
+    private final DiscreteResources generics;
     private final DiscreteResources encodables;
     private static final Codecs CODECS = Codecs.getInstance();
 
@@ -45,13 +45,13 @@
         Map<Boolean, Set<DiscreteResource>> partitioned = resources.stream()
                 .collect(Collectors.partitioningBy(CODECS::isEncodable, Collectors.toCollection(LinkedHashSet::new)));
         return new UnifiedDiscreteResources(
-                NonEncodableDiscreteResources.of(partitioned.get(false)),
+                GenericDiscreteResources.of(partitioned.get(false)),
                 EncodableDiscreteResources.of(partitioned.get(true))
         );
     }
 
-    private UnifiedDiscreteResources(DiscreteResources nonEncodables, DiscreteResources encodables) {
-        this.nonEncodables = nonEncodables;
+    private UnifiedDiscreteResources(DiscreteResources generics, DiscreteResources encodables) {
+        this.generics = generics;
         this.encodables = encodables;
     }
 
@@ -61,7 +61,7 @@
             return encodables.lookup(id);
         }
 
-        return nonEncodables.lookup(id);
+        return generics.lookup(id);
     }
 
     @Override
@@ -71,14 +71,14 @@
 
     @Override
     public boolean isEmpty() {
-        return nonEncodables.isEmpty() && encodables.isEmpty();
+        return generics.isEmpty() && encodables.isEmpty();
     }
 
     @Override
     public boolean containsAny(List<DiscreteResource> other) {
         Map<Boolean, List<DiscreteResource>> partitioned = other.stream()
                 .collect(Collectors.partitioningBy(CODECS::isEncodable));
-        return nonEncodables.containsAny(partitioned.get(false)) || encodables.containsAny(partitioned.get(true));
+        return generics.containsAny(partitioned.get(false)) || encodables.containsAny(partitioned.get(true));
     }
 
     @Override
@@ -93,7 +93,7 @@
 
     @Override
     public Set<DiscreteResource> values() {
-        return Stream.concat(encodables.values().stream(), nonEncodables.values().stream())
+        return Stream.concat(encodables.values().stream(), generics.values().stream())
                 .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 }