Remove IntentStore access in IntentUpdate subclasses
Change-Id: I923c62f1d34dc2c911323f11990de5c9788bf655
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/InstallRequest.java b/core/net/src/main/java/org/onosproject/net/intent/impl/InstallRequest.java
index c22cd35..52e8bc1 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/InstallRequest.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/InstallRequest.java
@@ -27,16 +27,16 @@
// TODO: define an interface and use it, instead of IntentManager
private final IntentManager intentManager;
private final IntentData pending;
+ private final Optional<IntentData> current;
- InstallRequest(IntentManager intentManager, IntentData intentData) {
+ InstallRequest(IntentManager intentManager, IntentData intentData, Optional<IntentData> current) {
this.intentManager = checkNotNull(intentManager);
this.pending = checkNotNull(intentData);
+ this.current = checkNotNull(current);
}
@Override
public Optional<IntentUpdate> execute() {
- //FIXME... store hack
- IntentData current = intentManager.store.getIntentData(pending.key());
- return Optional.of(new Compiling(intentManager, pending, current));
+ return Optional.of(new Compiling(intentManager, pending, current.orElse(null)));
}
}