Ensure ApplicationManager waits until features are installed/uninstalled

Change-Id: Ie86c7945d8707cac6ef869e0b28bb950744ea708

@@ -47,6 +47,7 @@ import java.io.InputStream;
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.app.ApplicationEvent.Type.APP_ACTIVATED;
 import static org.onosproject.app.ApplicationEvent.Type.APP_ACTIVATED;
@@ -83,7 +84,7 @@ public class ApplicationManager
 
 
     // Application supplied hooks for pre-activation processing.
     // Application supplied hooks for pre-activation processing.
     private final Multimap<String, Runnable> deactivateHooks = HashMultimap.create();
     private final Multimap<String, Runnable> deactivateHooks = HashMultimap.create();
-    private final Cache<ApplicationId, CountDownLatch> pendingUninstalls =
+    private final Cache<ApplicationId, CountDownLatch> pendingOperations =
             CacheBuilder.newBuilder()
             CacheBuilder.newBuilder()
                         .expireAfterWrite(DEFAULT_OPERATION_TIMEOUT_MILLIS * 2, TimeUnit.MILLISECONDS)
                         .expireAfterWrite(DEFAULT_OPERATION_TIMEOUT_MILLIS * 2, TimeUnit.MILLISECONDS)
                         .build();
                         .build();
@@ -160,15 +161,7 @@ public class ApplicationManager
     public void uninstall(ApplicationId appId) {
     public void uninstall(ApplicationId appId) {
         checkNotNull(appId, APP_ID_NULL);
         checkNotNull(appId, APP_ID_NULL);
         CountDownLatch latch = new CountDownLatch(1);
         CountDownLatch latch = new CountDownLatch(1);
-        try {
-            pendingUninstalls.put(appId, latch);
-            store.remove(appId);
-        } catch (Exception e) {
-            pendingUninstalls.invalidate(appId);
-            latch.countDown();
-            log.warn("Unable to purge application directory for {}", appId.name());
-        }
-        Uninterruptibles.awaitUninterruptibly(latch, DEFAULT_OPERATION_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        updateStoreAndWaitForNotificationHandling(appId, store::remove);
     }
     }
 
 
     @Override
     @Override
@@ -177,13 +170,13 @@ public class ApplicationManager
         if (!SecurityUtil.isAppSecured(appId)) {
         if (!SecurityUtil.isAppSecured(appId)) {
             return;
             return;
         }
         }
-        store.activate(appId);
+        updateStoreAndWaitForNotificationHandling(appId, store::activate);
     }
     }
 
 
     @Override
     @Override
     public void deactivate(ApplicationId appId) {
     public void deactivate(ApplicationId appId) {
         checkNotNull(appId, APP_ID_NULL);
         checkNotNull(appId, APP_ID_NULL);
-        store.deactivate(appId);
+        updateStoreAndWaitForNotificationHandling(appId, store::deactivate);
     }
     }
 
 
     @Override
     @Override
@@ -193,12 +186,26 @@ public class ApplicationManager
         store.setPermissions(appId, permissions);
         store.setPermissions(appId, permissions);
     }
     }
 
 
+    private void updateStoreAndWaitForNotificationHandling(ApplicationId appId,
+                                                           Consumer<ApplicationId> storeUpdateTask) {
+        CountDownLatch latch = new CountDownLatch(1);
+        try {
+            pendingOperations.put(appId, latch);
+            storeUpdateTask.accept(appId);
+        } catch (Exception e) {
+            pendingOperations.invalidate(appId);
+            latch.countDown();
+            log.warn("Failed to update store for {}", appId.name(), e);
+        }
+        Uninterruptibles.awaitUninterruptibly(latch, DEFAULT_OPERATION_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+    }
+
     private class InternalStoreDelegate implements ApplicationStoreDelegate {
     private class InternalStoreDelegate implements ApplicationStoreDelegate {
         @Override
         @Override
         public void notify(ApplicationEvent event) {
         public void notify(ApplicationEvent event) {
             ApplicationEvent.Type type = event.type();
             ApplicationEvent.Type type = event.type();
             Application app = event.subject();
             Application app = event.subject();
-            CountDownLatch latch = pendingUninstalls.getIfPresent(app.id());
+            CountDownLatch latch = pendingOperations.getIfPresent(app.id());
             try {
             try {
                 if (type == APP_ACTIVATED) {
                 if (type == APP_ACTIVATED) {
                     if (installAppFeatures(app)) {
                     if (installAppFeatures(app)) {
@@ -227,7 +234,7 @@ public class ApplicationManager
             } finally {
             } finally {
                 if (latch != null) {
                 if (latch != null) {
                     latch.countDown();
                     latch.countDown();
-                    pendingUninstalls.invalidate(app.id());
+                    pendingOperations.invalidate(app.id());
                 }
                 }
             }
             }
         }
         }