commit 03406a4702d7957be03dbf78195a46c86e812d27
author Brian O'Connor <bocon@onlab.us> Tue Feb 03 17:28:57 2015 -0800
committer Brian O'Connor <bocon@onlab.us> Fri Feb 13 14:07:52 2015 -0800
tree eab4d091ab9a9c409e901a4a7823ddb1189c8d56
parent b499b3594df3f72b3aa3b24a7bb737d8d423afe7

IntentStore interface changes

Change-Id: Ifa8728fb4c7edcc6d58a5e071f7252493ab2a578

apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java

diff --git a/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java b/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
index 10ac5a3..20a6165 100644
--- a/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
+++ b/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
@@ -57,7 +57,6 @@
 import org.onosproject.net.intent.HostToHostIntent;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentBatchService;
-import org.onosproject.net.intent.IntentOperations;
 import org.onosproject.net.intent.IntentService;
 import org.slf4j.Logger;
 
@@ -315,7 +314,7 @@
                     shutdownAndAwaitTermination(installWorker);
                 }
             }
-            //if everyting is good proceed.
+            //if everything is good proceed.
             if (!installWorker.isShutdown()) {
                 installWorker.execute(this);
             }
@@ -350,23 +349,19 @@
         }
 
         private void installIntents(List<HostPair> toInstall) {
-            IntentOperations.Builder builder = IntentOperations.builder(appId);
             for (HostPair pair : toInstall) {
                 installed.add(pair);
                 uninstalledOrWithdrawn.remove(pair);
-                builder.addSubmitOperation(pair.h2hIntent());
+                intentService.submit(pair.h2hIntent());
             }
-            intentBatchService.addIntentOperations(builder.build());
         }
 
         private void uninstallIntents(Collection<HostPair> toRemove) {
-            IntentOperations.Builder builder = IntentOperations.builder(appId);
             for (HostPair pair : toRemove) {
                 installed.remove(pair);
                 uninstalledOrWithdrawn.add(pair);
-                builder.addWithdrawOperation(pair.h2hIntent().id());
+                intentService.withdraw(pair.h2hIntent());
             }
-            intentBatchService.addIntentOperations(builder.build());
         }
 
         /**
@@ -375,11 +370,9 @@
         private void cleanUp() {
             List<HostPair> allPairs = Lists.newArrayList(installed);
             allPairs.addAll(uninstalledOrWithdrawn);
-            IntentOperations.Builder builder = IntentOperations.builder(appId);
             for (HostPair pair : allPairs) {
-                builder.addWithdrawOperation(pair.h2hIntent().id());
+                intentService.withdraw(pair.h2hIntent());
             }
-            intentBatchService.addIntentOperations(builder.build());
         }