Refactor: Inline method

Change-Id: Ic48aaed07f80156801e0136e9d34ec824a9219d6

Refactor: Inline method
Change-Id: Ic48aaed07f80156801e0136e9d34ec824a9219d6
Sho SHIMIZU · Gerrit Code Review
Commit 47001d19527b6f32ef50b5753241e7a856981cbb 47001d19 1 parent 18070574
Showing 1 changed file with 2 additions and 13 deletions
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
View file @47001d1
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
View file @47001d1
@@ -289,18 +289,6 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
         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 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
                 continue;
             }
 
-             if (!isAllowed(circuitIntent, connIntent)) {
+             if (!(isAllowed(circuitIntent.getSrc(), connIntent.getSrc()) &&
+                     isAllowed(circuitIntent.getDst(), connIntent.getDst()))) {
                 continue;
             }