Refactoring of IntentId based APIs
- getIntent
- getIntentState
- getInstallableIntents
Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/DistributedIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/DistributedIntentStore.java
index ef3b803..0d8c02a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/DistributedIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/DistributedIntentStore.java
@@ -40,6 +40,7 @@
import org.onosproject.net.intent.IntentState;
import org.onosproject.net.intent.IntentStore;
import org.onosproject.net.intent.IntentStoreDelegate;
+import org.onosproject.net.intent.Key;
import org.onosproject.store.AbstractStore;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.serializers.KryoSerializer;
@@ -202,6 +203,10 @@
}
@Override
+ public Intent getIntent(Key intentKey) {
+ return null;
+ }
+
public Intent getIntent(IntentId intentId) {
Context timer = startTimer(getIntentTimer);
try {
@@ -212,7 +217,10 @@
}
@Override
- public IntentState getIntentState(IntentId id) {
+ public IntentState getIntentState(Key key) {
+ // TODO: either implement this or remove the class
+ return IntentState.FAILED;
+ /*
Context timer = startTimer(getIntentStateTimer);
try {
final IntentState localState = transientStates.get(id);
@@ -223,6 +231,7 @@
} finally {
stopTimer(timer);
}
+ */
}
private void verify(boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
@@ -236,13 +245,17 @@
}
@Override
- public List<Intent> getInstallableIntents(IntentId intentId) {
+ public List<Intent> getInstallableIntents(Key intentKey) {
+ // TODO: implement this or delete class
+ return null;
+ /*
Context timer = startTimer(getInstallableIntentsTimer);
try {
return installable.get(intentId);
} finally {
stopTimer(timer);
}
+ */
}
protected String strIntentId(IntentId key) {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index f3917c9..051a01c 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -137,18 +137,29 @@
}
@Override
+ public Intent getIntent(Key intentKey) {
+ // TODO: Implement this
+ return null;
+ }
+
+
public Intent getIntent(IntentId intentId) {
return intents.get(intentId);
}
@Override
- public IntentState getIntentState(IntentId intentId) {
- return intentStates.get(intentId);
+ public IntentState getIntentState(Key intentKey) {
+ // TODO: implement this
+ return IntentState.FAILED;
}
@Override
- public List<Intent> getInstallableIntents(IntentId intentId) {
+ public List<Intent> getInstallableIntents(Key intentKey) {
+ // TODO: implement this or delete class
+ return null;
+ /*
return installables.get(intentId);
+ */
}
@Override
@@ -225,11 +236,6 @@
}
@Override
- public Intent getIntent(Key key) {
- return null; // TODO
- }
-
- @Override
public IntentData getIntentData(Key key) {
return null; // TODO
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentStore.java
index 2e82e5c..8e91d61 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentStore.java
@@ -46,6 +46,7 @@
import org.onosproject.net.intent.IntentState;
import org.onosproject.net.intent.IntentStore;
import org.onosproject.net.intent.IntentStoreDelegate;
+import org.onosproject.net.intent.Key;
import org.onosproject.store.hz.AbstractHazelcastStore;
import org.onosproject.store.hz.SMap;
import org.onosproject.store.serializers.KryoNamespaces;
@@ -209,6 +210,11 @@
}
@Override
+ public Intent getIntent(Key intentKey) {
+ return null;
+ }
+
+
public Intent getIntent(IntentId intentId) {
Context timer = startTimer(getIntentTimer);
try {
@@ -227,7 +233,10 @@
}
@Override
- public IntentState getIntentState(IntentId id) {
+ public IntentState getIntentState(Key key) {
+ // TODO: either implement this or remove this class
+ return IntentState.FAILED;
+ /*
Context timer = startTimer(getIntentStateTimer);
try {
final IntentState localState = transientStates.get(id);
@@ -238,6 +247,7 @@
} finally {
stopTimer(timer);
}
+ */
}
private void verify(boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
@@ -251,13 +261,18 @@
}
@Override
- public List<Intent> getInstallableIntents(IntentId intentId) {
+ public List<Intent> getInstallableIntents(Key intentKey) {
+ // TODO: implement this or delete class
+ return null;
+
+ /*
Context timer = startTimer(getInstallableIntentsTimer);
try {
return installable.get(intentId);
} finally {
stopTimer(timer);
}
+ */
}
@Override
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/SimpleIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/SimpleIntentStore.java
index f3ecb48..0d9f26e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/SimpleIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/SimpleIntentStore.java
@@ -25,7 +25,6 @@
import org.onosproject.net.intent.Intent;
import org.onosproject.net.intent.IntentData;
import org.onosproject.net.intent.IntentEvent;
-import org.onosproject.net.intent.IntentId;
import org.onosproject.net.intent.IntentState;
import org.onosproject.net.intent.IntentStore;
import org.onosproject.net.intent.IntentStoreDelegate;
@@ -35,7 +34,6 @@
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -77,38 +75,23 @@
}
@Override
- public Intent getIntent(IntentId intentId) {
- for (IntentData data : current.values()) {
- if (Objects.equals(data.intent().id(), intentId)) {
- return data.intent();
- }
- }
- return null;
+ public IntentState getIntentState(Key intentKey) {
+ IntentData data = current.get(intentKey);
+ return (data != null) ? data.state() : null;
}
@Override
- public IntentState getIntentState(IntentId intentId) {
- for (IntentData data : current.values()) {
- if (Objects.equals(data.intent().id(), intentId)) {
- return data.state();
- }
- }
+ public List<Intent> getInstallableIntents(Key intentKey) {
+ // TODO: implement this or delete class
return null;
- }
-
- @Override
- public List<Intent> getInstallableIntents(IntentId intentId) {
+ /*
for (IntentData data : current.values()) {
if (Objects.equals(data.intent().id(), intentId)) {
return data.installables();
}
}
return null;
- }
-
- @Override
- public IntentData getIntentData(Key key) {
- return current.get(key);
+ */
}
/*