Refactor: Make method simpler

Change-Id: I28cabf5c5a381a8e2e6695aea7ad5000146111a3

@@ -194,7 +194,8 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
         }
         }
 
 
         // Check if both devices support multiplexing (usage of TributarySlots)
         // Check if both devices support multiplexing (usage of TributarySlots)
-        boolean multiplexingSupported = isMultiplexingSupported(intent.getSrc(), intent.getDst());
+        boolean multiplexingSupported = isMultiplexingSupported(intent.getSrc())
+                && isMultiplexingSupported(intent.getDst());
 
 
         // slots are used only for devices supporting multiplexing
         // slots are used only for devices supporting multiplexing
         Set<TributarySlot> slots = Collections.emptySet();
         Set<TributarySlot> slots = Collections.emptySet();
@@ -557,11 +558,8 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
         return (driver != null && driver.hasBehaviour(TributarySlotQuery.class));
         return (driver != null && driver.hasBehaviour(TributarySlotQuery.class));
     }
     }
 
 
-    private boolean isMultiplexingSupported(ConnectPoint src, ConnectPoint dst) {
-        return isTributarySlotBehaviourSupported(src.deviceId())
-                && isTributarySlotBehaviourSupported(dst.deviceId())
-                && staticPort(src) == null
-                && staticPort(dst) == null;
+    private boolean isMultiplexingSupported(ConnectPoint cp) {
+        return isTributarySlotBehaviourSupported(cp.deviceId()) && staticPort(cp) == null;
     }
     }
 
 
     /**
     /**