commit 0a8332c5a2a89452bb60cb601115a442f64be932
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 29 13:54:08 2016 -0800
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Mar 01 08:54:34 2016 -0800
tree 8bb87a9cc37cdaac773ebaf7fec6f247e6306405
parent caf0b341fc353eb094f863a7edf0f2dafc4db4b2

Refactor: Inline method

Change-Id: I2bfeadebd63a9e60dc9bf0f97a9390e456abc3b8

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
index 45711a4..29ba5fb 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
@@ -31,7 +31,6 @@
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.CltSignalType;
 import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
 import org.onosproject.net.OchPort;
 import org.onosproject.net.OduCltPort;
 import org.onosproject.net.OduSignalId;
@@ -553,13 +552,11 @@
         return (int) tributarySlots.stream().findFirst().get().index();
     }
 
-    private boolean isTributarySlotBehaviourSupported(DeviceId deviceId) {
-        Driver driver = driverService.getDriver(deviceId);
-        return (driver != null && driver.hasBehaviour(TributarySlotQuery.class));
-    }
-
     private boolean isMultiplexingSupported(ConnectPoint cp) {
-        return isTributarySlotBehaviourSupported(cp.deviceId()) && staticPort(cp) == null;
+        Driver driver = driverService.getDriver(cp.deviceId());
+        return driver != null
+                && driver.hasBehaviour(TributarySlotQuery.class)
+                && staticPort(cp) == null;
     }
 
     /**