You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/08/10 16:54:26 UTC

incubator-usergrid git commit: Fix deserialization with InitializeApplicationIndexEvent.

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev cce5fa5f8 -> f71be8034


Fix deserialization with InitializeApplicationIndexEvent.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f71be803
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f71be803
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f71be803

Branch: refs/heads/two-dot-o-dev
Commit: f71be80346b344459e1a781a4390855959441110
Parents: cce5fa5
Author: Michael Russo <mi...@gmail.com>
Authored: Sat Aug 8 11:30:51 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Sat Aug 8 11:30:51 2015 -0700

----------------------------------------------------------------------
 .../model/InitializeApplicationIndexEvent.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f71be803/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/InitializeApplicationIndexEvent.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/InitializeApplicationIndexEvent.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/InitializeApplicationIndexEvent.java
index 68f0113..2e69c75 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/InitializeApplicationIndexEvent.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/InitializeApplicationIndexEvent.java
@@ -20,11 +20,8 @@
 package org.apache.usergrid.corepersistence.asyncevents.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import org.apache.usergrid.persistence.collection.serialization.impl.migration.EntityIdScope;
-import org.apache.usergrid.persistence.core.scope.ApplicationScope;
+import org.apache.usergrid.corepersistence.index.ReplicatedIndexLocationStrategy;
 import org.apache.usergrid.persistence.index.IndexLocationStrategy;
 
 /**
@@ -37,12 +34,20 @@ public class InitializeApplicationIndexEvent extends AsyncEvent {
     @JsonProperty
     protected IndexLocationStrategy indexLocationStrategy;
 
+    /**
+     * Do not delete!  Needed for Jackson
+     */
+    @SuppressWarnings( "unused" )
+    public InitializeApplicationIndexEvent(){
+
+    }
+
     public InitializeApplicationIndexEvent(final IndexLocationStrategy indexLocationStrategy) {
         this.indexLocationStrategy = indexLocationStrategy;
 
     }
 
-
+    @JsonDeserialize(as=ReplicatedIndexLocationStrategy.class)
     public IndexLocationStrategy getIndexLocationStrategy() {
         return indexLocationStrategy;
     }