commit 7b32697856a8dfdd96457424c36421c90907e8f4
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Feb 09 15:53:39 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 10 21:36:33 2016 +0000
tree 6bbf2a7f246bd6b279fd70d30456596fdde47f37
parent 69420fe49cec9ba4d0f1f641dc616c5f7332a9ae

Simplify method names by removing redundancy

Change-Id: I36df7e23792f7004dfae823a8700f6c887ea1efd

core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java

diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
index 0c94ab5..3ff3706 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
@@ -127,25 +127,25 @@
     }
 
     private void registerDeviceResource(Device device) {
-        executor.submit(() -> adminService.registerResources(Resources.discrete(device.id()).resource()));
+        executor.submit(() -> adminService.register(Resources.discrete(device.id()).resource()));
     }
 
     private void unregisterDeviceResource(Device device) {
         executor.submit(() -> {
             DiscreteResource devResource = Resources.discrete(device.id()).resource();
             List<Resource> allResources = getDescendantResources(devResource);
-            adminService.unregisterResources(Lists.transform(allResources, Resource::id));
+            adminService.unregister(Lists.transform(allResources, Resource::id));
         });
     }
 
     private void registerPortResource(Device device, Port port) {
         Resource portPath = Resources.discrete(device.id(), port.number()).resource();
         executor.submit(() -> {
-            adminService.registerResources(portPath);
+            adminService.register(portPath);
 
             queryBandwidth(device.id(), port.number())
                 .map(bw -> portPath.child(Bandwidth.class, bw.bps()))
-                .map(adminService::registerResources)
+                .map(adminService::register)
                 .ifPresent(success -> {
                    if (!success) {
                        log.error("Failed to register Bandwidth for {}", portPath.id());
@@ -155,33 +155,33 @@
             // for VLAN IDs
             Set<VlanId> vlans = queryVlanIds(device.id(), port.number());
             if (!vlans.isEmpty()) {
-                adminService.registerResources(vlans.stream()
-                                               .map(portPath::child)
-                                               .collect(Collectors.toList()));
+                adminService.register(vlans.stream()
+                        .map(portPath::child)
+                        .collect(Collectors.toList()));
             }
 
             // for MPLS labels
             Set<MplsLabel> mplsLabels = queryMplsLabels(device.id(), port.number());
             if (!mplsLabels.isEmpty()) {
-                adminService.registerResources(mplsLabels.stream()
-                                               .map(portPath::child)
-                                               .collect(Collectors.toList()));
+                adminService.register(mplsLabels.stream()
+                        .map(portPath::child)
+                        .collect(Collectors.toList()));
             }
 
             // for Lambdas
             Set<OchSignal> lambdas = queryLambdas(device.id(), port.number());
             if (!lambdas.isEmpty()) {
-                adminService.registerResources(lambdas.stream()
-                                               .map(portPath::child)
-                                               .collect(Collectors.toList()));
+                adminService.register(lambdas.stream()
+                        .map(portPath::child)
+                        .collect(Collectors.toList()));
             }
 
             // for Tributary slots
             Set<TributarySlot> tSlots = queryTributarySlots(device.id(), port.number());
             if (!tSlots.isEmpty()) {
-                adminService.registerResources(tSlots.stream()
-                                               .map(portPath::child)
-                                               .collect(Collectors.toList()));
+                adminService.register(tSlots.stream()
+                        .map(portPath::child)
+                        .collect(Collectors.toList()));
             }
         });
     }
@@ -190,7 +190,7 @@
         executor.submit(() -> {
             DiscreteResource portResource = Resources.discrete(device.id(), port.number()).resource();
             List<Resource> allResources = getDescendantResources(portResource);
-            adminService.unregisterResources(Lists.transform(allResources, Resource::id));
+            adminService.unregister(Lists.transform(allResources, Resource::id));
         });
     }