Remove default methods from IntentService interface.
Change-Id: Ie0ef999d7237a8e150e770a912c0fcbcd0c56adc
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
index 354db6f..0d14a38 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
@@ -16,7 +16,6 @@
package org.onosproject.net.intent;
-import java.util.Collections;
import java.util.List;
/**
@@ -83,19 +82,22 @@
*/
List<Intent> getInstallableIntents(Key intentKey);
- // TODO remove defaults
- default boolean isLocal(Key intentKey) {
- return true;
- }
+ /**
+ * Signifies whether the local node is responsible for processing the given
+ * intent key.
+ *
+ * @param intentKey intent key to check
+ * @return true if the local node is responsible for the intent key,
+ * otherwise false
+ */
+ boolean isLocal(Key intentKey);
/**
* Returns the list of intent requests pending processing.
*
* @return intents pending processing
*/
- default Iterable<Intent> getPending() {
- return Collections.emptyList();
- }
+ Iterable<Intent> getPending();
/**
* Adds the specified listener for intent events.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
index b3c30b5..3d2475b 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
@@ -211,6 +211,16 @@
}
@Override
+ public boolean isLocal(Key intentKey) {
+ return true;
+ }
+
+ @Override
+ public Iterable<Intent> getPending() {
+ return Collections.emptyList();
+ }
+
+ @Override
public void addListener(IntentListener listener) {
listeners.add(listener);
}
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java
index d600dde..d100121 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java
@@ -58,6 +58,16 @@
}
@Override
+ public boolean isLocal(Key intentKey) {
+ return false;
+ }
+
+ @Override
+ public Iterable<Intent> getPending() {
+ return null;
+ }
+
+ @Override
public void addListener(IntentListener listener) {
}