Fixed couple of GossipIntentStore bugs.

 * Register Collections.emptyList() in Kryo (some intents contain this)
 * Other stores set INSTALL_REQ state implicitly when a CREATE_INTENT
   batchwrite is received, so we should do this too. 

Change-Id: I19167ab0d3c7b98c32d5af9198843ff33b7c8a23

@@ -48,6 +48,7 @@ import org.slf4j.Logger;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Set;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -108,6 +109,7 @@ public class GossipIntentStore
                     .nextId(DistributedStoreSerializers.STORE_CUSTOM_BEGIN)
                     .nextId(DistributedStoreSerializers.STORE_CUSTOM_BEGIN)
                     .register(InternalIntentEvent.class)
                     .register(InternalIntentEvent.class)
                     .register(InternalSetInstallablesEvent.class)
                     .register(InternalSetInstallablesEvent.class)
+                    .register(Collections.emptyList().getClass())
                     //.register(InternalIntentAntiEntropyEvent.class)
                     //.register(InternalIntentAntiEntropyEvent.class)
                     //.register(IntentAntiEntropyAdvertisement.class)
                     //.register(IntentAntiEntropyAdvertisement.class)
                     .build();
                     .build();
@@ -247,6 +249,8 @@ public class GossipIntentStore
         List<IntentEvent> events = Lists.newArrayList();
         List<IntentEvent> events = Lists.newArrayList();
         List<BatchWrite.Operation> failed = new ArrayList<>();
         List<BatchWrite.Operation> failed = new ArrayList<>();
 
 
+        Timestamp timestamp = null;
+
         for (BatchWrite.Operation op : batch.operations()) {
         for (BatchWrite.Operation op : batch.operations()) {
             switch (op.type()) {
             switch (op.type()) {
             case CREATE_INTENT:
             case CREATE_INTENT:
@@ -254,9 +258,12 @@ public class GossipIntentStore
                               "CREATE_INTENT takes 1 argument. %s", op);
                               "CREATE_INTENT takes 1 argument. %s", op);
                 Intent intent = op.arg(0);
                 Intent intent = op.arg(0);
 
 
-                events.add(createIntentInternal(intent));
-                notifyPeers(new InternalIntentEvent(
-                        intent.id(), intent, INSTALL_REQ, null));
+                timestamp = intentClockService.getTimestamp(intent.id());
+                if (createIntentInternal(intent)) {
+                    events.add(setStateInternal(intent.id(), INSTALL_REQ, timestamp));
+                    notifyPeers(new InternalIntentEvent(intent.id(), intent,
+                                                        INSTALL_REQ, timestamp));
+                }
 
 
                 break;
                 break;
             case REMOVE_INTENT:
             case REMOVE_INTENT:
@@ -272,8 +279,7 @@ public class GossipIntentStore
                 intent = op.arg(0);
                 intent = op.arg(0);
                 IntentState newState = op.arg(1);
                 IntentState newState = op.arg(1);
 
 
-                Timestamp timestamp = intentClockService.getTimestamp(
-                        intent.id());
+                timestamp = intentClockService.getTimestamp(intent.id());
                 IntentEvent externalEvent = setStateInternal(intent.id(), newState, timestamp);
                 IntentEvent externalEvent = setStateInternal(intent.id(), newState, timestamp);
                 events.add(externalEvent);
                 events.add(externalEvent);
                 notifyPeers(new InternalIntentEvent(intent.id(), null, newState, timestamp));
                 notifyPeers(new InternalIntentEvent(intent.id(), null, newState, timestamp));
@@ -285,11 +291,11 @@ public class GossipIntentStore
                 intentId = op.arg(0);
                 intentId = op.arg(0);
                 List<Intent> installableIntents = op.arg(1);
                 List<Intent> installableIntents = op.arg(1);
 
 
-                Timestamp timestamp1 = intentClockService.getTimestamp(intentId);
+                timestamp = intentClockService.getTimestamp(intentId);
                 setInstallableIntentsInternal(
                 setInstallableIntentsInternal(
-                        intentId, installableIntents, timestamp1);
+                        intentId, installableIntents, timestamp);
 
 
-                notifyPeers(new InternalSetInstallablesEvent(intentId, installableIntents, timestamp1));
+                notifyPeers(new InternalSetInstallablesEvent(intentId, installableIntents, timestamp));
 
 
                 break;
                 break;
             case REMOVE_INSTALLED:
             case REMOVE_INSTALLED:
@@ -309,15 +315,15 @@ public class GossipIntentStore
         return failed;
         return failed;
     }
     }
 
 
-    private IntentEvent createIntentInternal(Intent intent) {
+    private boolean createIntentInternal(Intent intent) {
         Intent oldValue = intents.putIfAbsent(intent.id(), intent);
         Intent oldValue = intents.putIfAbsent(intent.id(), intent);
         if (oldValue == null) {
         if (oldValue == null) {
-            return IntentEvent.getEvent(INSTALL_REQ, intent);
+            return true;
         }
         }
 
 
         log.warn("Intent ID {} already in store, throwing new update away",
         log.warn("Intent ID {} already in store, throwing new update away",
                  intent.id());
                  intent.id());
-        return null;
+        return false;
     }
     }
 
 
     private void notifyPeers(InternalIntentEvent event) {
     private void notifyPeers(InternalIntentEvent event) {
@@ -380,8 +386,8 @@ public class GossipIntentStore
                 try {
                 try {
                     switch (state) {
                     switch (state) {
                     case INSTALL_REQ:
                     case INSTALL_REQ:
-                        notifyDelegateIfNotNull(createIntentInternal(intent));
-                        break;
+                        createIntentInternal(intent);
+                        // Fallthrough to setStateInternal for INSTALL_REQ
                     default:
                     default:
                         notifyDelegateIfNotNull(setStateInternal(intentId, state, timestamp));
                         notifyDelegateIfNotNull(setStateInternal(intentId, state, timestamp));
                         break;
                         break;