From 762c1bb9717c94f73e56a9df6b3b2d48e249fd8b Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Fri, 19 Feb 2016 12:54:31 -0800 Subject: [PATCH] Fixing broken build; breaking OpticalCircuitIntentCompiler in the process though. Change-Id: Ice66be4bb23b90d2466ba1d029f29b5d7df0cfa4 --- .../impl/compiler/OpticalCircuitIntentCompiler.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 603cda5443..7698a74c11 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 @@ -15,6 +15,7 @@ */ package org.onosproject.net.intent.impl.compiler; +import com.google.common.collect.ImmutableSet; import org.apache.commons.lang3.tuple.Pair; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -643,10 +644,12 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler findTributarySlotsOnCp(ConnectPoint cp) { - return resourceService.getAvailableResources(Resources.discrete(cp.deviceId(), cp.port()).id()) - .stream() - .filter(x -> x.last() instanceof TributarySlot) - .map(x -> (TributarySlot) x.last()) - .collect(Collectors.toSet()); + return ImmutableSet.of(); // temporary fix for build + // FIXME: below changes break the build due to conflicting changes on Resource, which obsoleted Resource#last() +// return resourceService.getAvailableResources(Resources.discrete(cp.deviceId(), cp.port()).id()) +// .stream() +// .filter(x -> x.last() instanceof TributarySlot) +// .map(x -> (TributarySlot) x.last()) +// .collect(Collectors.toSet()); } }