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/06/23 03:21:00 UTC
[7/9] incubator-usergrid git commit: Updated with JSON
deserialization, added Russo's code for handing the SNS message wrapper.
Updated with JSON deserialization, added Russo's code for handing the SNS message wrapper.
Messages are not getting ack'd to the queue though, so something is not quite right with the RX pipeline.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7dc9aa0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7dc9aa0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7dc9aa0b
Branch: refs/heads/two-dot-o-dev
Commit: 7dc9aa0b784171f263e9b879d0926198fb88820c
Parents: 0a73f82
Author: Jeff West <jw...@apigee.com>
Authored: Fri Jun 19 18:40:49 2015 -0700
Committer: Jeff West <jw...@apigee.com>
Committed: Fri Jun 19 18:40:49 2015 -0700
----------------------------------------------------------------------
.../corepersistence/asyncevents/model/EdgeDeleteEvent.java | 2 ++
.../corepersistence/asyncevents/model/EdgeIndexEvent.java | 2 ++
.../corepersistence/asyncevents/model/EntityDeleteEvent.java | 2 ++
.../corepersistence/asyncevents/model/EntityIndexEvent.java | 2 ++
.../usergrid/persistence/queue/impl/SNSQueueManagerImpl.java | 4 +++-
5 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7dc9aa0b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeDeleteEvent.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeDeleteEvent.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeDeleteEvent.java
index 9cff32f..3af9818 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeDeleteEvent.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeDeleteEvent.java
@@ -19,12 +19,14 @@
package org.apache.usergrid.corepersistence.asyncevents.model;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.Edge;
/**
* Created by Jeff West on 5/25/15.
*/
+@JsonDeserialize(as = AsyncEvent.class)
public final class EdgeDeleteEvent extends AsyncEvent {
public EdgeDeleteEvent() {
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7dc9aa0b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeIndexEvent.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeIndexEvent.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeIndexEvent.java
index 145a0d4..cd0118f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeIndexEvent.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EdgeIndexEvent.java
@@ -20,6 +20,7 @@
package org.apache.usergrid.corepersistence.asyncevents.model;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.Edge;
import org.apache.usergrid.persistence.model.entity.Entity;
@@ -30,6 +31,7 @@ import java.io.Serializable;
/**
* Created by Jeff West on 5/25/15.
*/
+@JsonDeserialize(as = AsyncEvent.class)
public final class EdgeIndexEvent
extends AsyncEvent
implements Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7dc9aa0b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityDeleteEvent.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityDeleteEvent.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityDeleteEvent.java
index 186926a..606deae 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityDeleteEvent.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityDeleteEvent.java
@@ -19,6 +19,7 @@
package org.apache.usergrid.corepersistence.asyncevents.model;
+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.persistence.model.entity.Id;
@@ -26,6 +27,7 @@ import org.apache.usergrid.persistence.model.entity.Id;
/**
* Created by Jeff West on 5/25/15.
*/
+@JsonDeserialize(as = AsyncEvent.class)
public final class EntityDeleteEvent extends AsyncEvent {
public EntityDeleteEvent() {
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7dc9aa0b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityIndexEvent.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityIndexEvent.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityIndexEvent.java
index 960b995..7b79987 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityIndexEvent.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/model/EntityIndexEvent.java
@@ -19,11 +19,13 @@
package org.apache.usergrid.corepersistence.asyncevents.model;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.usergrid.persistence.collection.serialization.impl.migration.EntityIdScope;
/**
* Created by Jeff West on 5/25/15.
*/
+@JsonDeserialize(as = AsyncEvent.class)
public final class EntityIndexEvent extends AsyncEvent {
public EntityIndexEvent() {
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7dc9aa0b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
index f71e9c7..4812e55 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
@@ -27,6 +27,7 @@ import com.amazonaws.services.sns.util.Topics;
import com.amazonaws.services.sqs.AmazonSQSClient;
import com.amazonaws.services.sqs.model.*;
import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheBuilder;
@@ -312,7 +313,8 @@ public class SNSQueueManagerImpl implements QueueManager {
Object body;
try {
- body = fromString(message.getBody(), klass);
+ JsonNode bodyObj = mapper.readTree(message.getBody()).get("Message");
+ body = fromString(bodyObj.textValue(), klass);
} catch (Exception e) {
logger.error(String.format("failed to deserialize message: %s", message.getBody()), e);
throw new RuntimeException(e);