Remove calls to deprecated public intent data constructor
Change-Id: Ic77c1d2cfb3e954bc0b7ee6a8a66d9c4b8167872
diff --git a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/VirtualIntentInstallCoordinator.java b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/VirtualIntentInstallCoordinator.java
index 4a09250..3cc61f8 100644
--- a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/VirtualIntentInstallCoordinator.java
+++ b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/VirtualIntentInstallCoordinator.java
@@ -185,12 +185,12 @@
if (toInstall.isPresent()) {
IntentData installData = toInstall.get();
log.debug("Completed installing: {}", installData.key());
- installData = new IntentData(installData, installData.installables());
+ installData = IntentData.compiled(installData, installData.installables());
installData.setState(INSTALLED);
intentStore.write(networkId, 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());
switch (uninstallData.request()) {
case INSTALL_REQ:
diff --git a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentCompiling.java b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentCompiling.java
index 639c04c..f569ff7 100644
--- a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentCompiling.java
+++ b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentCompiling.java
@@ -72,7 +72,7 @@
// removing orphaned flows and deallocating resources
return Optional.of(
new VirtualIntentWithdrawing(networkId, processor,
- new IntentData(data, stored.get().installables())));
+ IntentData.compiled(data, stored.get().installables())));
} else {
return Optional.of(new VirtualIntentFailed(data));
}
diff --git a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentWithdrawRequest.java b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentWithdrawRequest.java
index ce8dfc9..a3ae7ce 100644
--- a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentWithdrawRequest.java
+++ b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/intent/phase/VirtualIntentWithdrawRequest.java
@@ -76,6 +76,6 @@
}
return Optional.of(new VirtualIntentWithdrawing(networkId, processor,
- new IntentData(data, stored.get().installables())));
+ IntentData.compiled(data, stored.get().installables())));
}
}