diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
index d047883..403d8a2 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
@@ -45,7 +45,6 @@
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentState;
 import org.onosproject.net.intent.Key;
-import org.onosproject.net.resource.link.LinkResourceAllocations;
 import org.onosproject.store.trivial.SimpleIntentStore;
 
 import java.util.Collection;
@@ -165,16 +164,14 @@
 
     private static class TestIntentCompiler implements IntentCompiler<MockIntent> {
         @Override
-        public List<Intent> compile(MockIntent intent, List<Intent> installable,
-                                    Set<LinkResourceAllocations> resources) {
+        public List<Intent> compile(MockIntent intent, List<Intent> installable) {
             return Lists.newArrayList(new MockInstallableIntent());
         }
     }
 
     private static class TestIntentCompilerMultipleFlows implements IntentCompiler<MockIntent> {
         @Override
-        public List<Intent> compile(MockIntent intent, List<Intent> installable,
-                                    Set<LinkResourceAllocations> resources) {
+        public List<Intent> compile(MockIntent intent, List<Intent> installable) {
 
             return IntStream.rangeClosed(1, 5)
                             .mapToObj(mock -> (new MockInstallableIntent()))
@@ -185,8 +182,7 @@
 
     private static class TestIntentCompilerError implements IntentCompiler<MockIntent> {
         @Override
-        public List<Intent> compile(MockIntent intent, List<Intent> installable,
-                                    Set<LinkResourceAllocations> resources) {
+        public List<Intent> compile(MockIntent intent, List<Intent> installable) {
             throw new IntentCompilationException("Compilation always fails");
         }
     }
