Refactor: Inline method
Change-Id: Ic48aaed07f80156801e0136e9d34ec824a9219d6
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 dfd6a0b..29fdb24 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
@@ -289,18 +289,6 @@
return mapping.size() < maxCapacity;
}
- private boolean isAllowed(OpticalCircuitIntent circuitIntent, OpticalConnectivityIntent connIntent) {
- if (!isAllowed(circuitIntent.getSrc(), connIntent.getSrc())) {
- return false;
- }
-
- if (!isAllowed(circuitIntent.getDst(), connIntent.getDst())) {
- return false;
- }
-
- return true;
- }
-
private boolean isAllowed(ConnectPoint circuitCp, ConnectPoint connectivityCp) {
ConnectPoint srcStaticPort = staticPort(circuitCp);
if (srcStaticPort != null) {
@@ -338,7 +326,8 @@
continue;
}
- if (!isAllowed(circuitIntent, connIntent)) {
+ if (!(isAllowed(circuitIntent.getSrc(), connIntent.getSrc()) &&
+ isAllowed(circuitIntent.getDst(), connIntent.getDst()))) {
continue;
}