홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
0a8332c5 1 parent caf0b341

Refactor: Inline method 

Change-Id: I2bfeadebd63a9e60dc9bf0f97a9390e456abc3b8
Inline Side-by-side
Showing 1 changed file with 4 additions and 7 deletions
...@@ -31,7 +31,6 @@ import org.onosproject.core.CoreService; ...@@ -31,7 +31,6 @@ import org.onosproject.core.CoreService;
31 import org.onosproject.net.AnnotationKeys; 31 import org.onosproject.net.AnnotationKeys;
32 import org.onosproject.net.CltSignalType; 32 import org.onosproject.net.CltSignalType;
33 import org.onosproject.net.ConnectPoint; 33 import org.onosproject.net.ConnectPoint;
34 -import org.onosproject.net.DeviceId;
35 import org.onosproject.net.OchPort; 34 import org.onosproject.net.OchPort;
36 import org.onosproject.net.OduCltPort; 35 import org.onosproject.net.OduCltPort;
37 import org.onosproject.net.OduSignalId; 36 import org.onosproject.net.OduSignalId;
...@@ -553,13 +552,11 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu ...@@ -553,13 +552,11 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
553 return (int) tributarySlots.stream().findFirst().get().index(); 552 return (int) tributarySlots.stream().findFirst().get().index();
554 } 553 }
555 554
556 - private boolean isTributarySlotBehaviourSupported(DeviceId deviceId) {
557 - Driver driver = driverService.getDriver(deviceId);
558 - return (driver != null && driver.hasBehaviour(TributarySlotQuery.class));
559 - }
560 -
561 private boolean isMultiplexingSupported(ConnectPoint cp) { 555 private boolean isMultiplexingSupported(ConnectPoint cp) {
562 - return isTributarySlotBehaviourSupported(cp.deviceId()) && staticPort(cp) == null; 556 + Driver driver = driverService.getDriver(cp.deviceId());
557 + return driver != null
558 + && driver.hasBehaviour(TributarySlotQuery.class)
559 + && staticPort(cp) == null;
563 } 560 }
564 561
565 /** 562 /**
......