Remove calls to deprecated public intent data constructor
Change-Id: Ic77c1d2cfb3e954bc0b7ee6a8a66d9c4b8167872
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/InstallCoordinator.java b/core/net/src/main/java/org/onosproject/net/intent/impl/InstallCoordinator.java
index 6539ddc..d12b239 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/InstallCoordinator.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/InstallCoordinator.java
@@ -181,12 +181,12 @@
log.debug("Completed installing: {}:{}",
installData.key(),
installData.intent().id());
- installData = new IntentData(installData, installData.installables());
+ installData = IntentData.compiled(installData, installData.installables());
installData.setState(INSTALLED);
intentStore.write(installData);
} else if (toUninstall.isPresent()) {
IntentData uninstallData = toUninstall.get();
- uninstallData = new IntentData(uninstallData, Collections.emptyList());
+ uninstallData = IntentData.compiled(uninstallData, Collections.emptyList());
log.debug("Completed withdrawing: {}:{}",
uninstallData.key(),
uninstallData.intent().id());
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/phase/Compiling.java b/core/net/src/main/java/org/onosproject/net/intent/impl/phase/Compiling.java
index ce722f8..9eb3106 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/phase/Compiling.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/phase/Compiling.java
@@ -62,7 +62,7 @@
log.warn("Unable to compile intent {} due to:", data.intent(), e.getMessage());
if (stored.filter(x -> !x.installables().isEmpty()).isPresent()) {
// removing orphaned flows and deallocating resources
- return Optional.of(new Withdrawing(processor, new IntentData(data, stored.get().installables())));
+ return Optional.of(new Withdrawing(processor, IntentData.compiled(data, stored.get().installables())));
} else {
return Optional.of(new Failed(data));
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/phase/WithdrawRequest.java b/core/net/src/main/java/org/onosproject/net/intent/impl/phase/WithdrawRequest.java
index 3327ef4..7e55a74 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/phase/WithdrawRequest.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/phase/WithdrawRequest.java
@@ -70,6 +70,6 @@
}
}
- return Optional.of(new Withdrawing(processor, new IntentData(data, stored.get().installables())));
+ return Optional.of(new Withdrawing(processor, IntentData.compiled(data, stored.get().installables())));
}
}