From c4ae4d589634b7ec65c49d0bd994b3b5b3ba7003 Mon Sep 17 00:00:00 2001 From: Sho SHIMIZU Date: Fri, 19 Feb 2016 15:15:31 -0800 Subject: [PATCH] Catch up with the latest API to fix the build error in #7156 Change-Id: Ia51be04f9f5ed5381e524a405944bf3a67f0c034 --- .../impl/compiler/OpticalCircuitIntentCompiler.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 7698a74c11..d9bf5d5269 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,7 +15,6 @@ */ 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; @@ -644,12 +643,8 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler findTributarySlotsOnCp(ConnectPoint cp) { - 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()); + return resourceService.getAvailableResourceValues( + Resources.discrete(cp.deviceId(), cp.port()).id(), + TributarySlot.class); } }