Fixing broken build; breaking OpticalCircuitIntentCompiler in the process though.
Change-Id: Ice66be4bb23b90d2466ba1d029f29b5d7df0cfa4
Showing
1 changed file
with
8 additions
and
5 deletions
... | @@ -15,6 +15,7 @@ | ... | @@ -15,6 +15,7 @@ |
15 | */ | 15 | */ |
16 | package org.onosproject.net.intent.impl.compiler; | 16 | package org.onosproject.net.intent.impl.compiler; |
17 | 17 | ||
18 | +import com.google.common.collect.ImmutableSet; | ||
18 | import org.apache.commons.lang3.tuple.Pair; | 19 | import org.apache.commons.lang3.tuple.Pair; |
19 | import org.apache.felix.scr.annotations.Activate; | 20 | import org.apache.felix.scr.annotations.Activate; |
20 | import org.apache.felix.scr.annotations.Component; | 21 | import org.apache.felix.scr.annotations.Component; |
... | @@ -643,10 +644,12 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu | ... | @@ -643,10 +644,12 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu |
643 | * @return set of TributarySlots available on the connect point | 644 | * @return set of TributarySlots available on the connect point |
644 | */ | 645 | */ |
645 | Set<TributarySlot> findTributarySlotsOnCp(ConnectPoint cp) { | 646 | Set<TributarySlot> findTributarySlotsOnCp(ConnectPoint cp) { |
646 | - return resourceService.getAvailableResources(Resources.discrete(cp.deviceId(), cp.port()).id()) | 647 | + return ImmutableSet.of(); // temporary fix for build |
647 | - .stream() | 648 | + // FIXME: below changes break the build due to conflicting changes on Resource, which obsoleted Resource#last() |
648 | - .filter(x -> x.last() instanceof TributarySlot) | 649 | +// return resourceService.getAvailableResources(Resources.discrete(cp.deviceId(), cp.port()).id()) |
649 | - .map(x -> (TributarySlot) x.last()) | 650 | +// .stream() |
650 | - .collect(Collectors.toSet()); | 651 | +// .filter(x -> x.last() instanceof TributarySlot) |
652 | +// .map(x -> (TributarySlot) x.last()) | ||
653 | +// .collect(Collectors.toSet()); | ||
651 | } | 654 | } |
652 | } | 655 | } | ... | ... |
-
Please register or login to post a comment