remove extra resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f1bac23e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f1bac23e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f1bac23e Branch: refs/heads/USERGRID-614 Commit: f1bac23ef82145c9e2b88fe26bc891aa1efd3c62 Parents: 8a37850 Author: Shawn Feldman <[email protected]> Authored: Thu May 7 09:02:52 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Thu May 7 09:02:52 2015 -0600 ---------------------------------------------------------------------- .../usergrid/persistence/index/impl/EntityIndexMapUtils.java | 5 ++++- .../apache/usergrid/persistence/index/impl/EntityIndexTest.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1bac23e/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexMapUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexMapUtils.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexMapUtils.java index 869aeac..d053462 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexMapUtils.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexMapUtils.java @@ -57,7 +57,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; */ class EntityIndexMapUtils { - static ObjectMapper objectMapper = new ObjectMapper( ); public static Entity fromMap( Map<String, Object> item ) { return fromMap( null, item ); @@ -138,6 +137,8 @@ class EntityIndexMapUtils { byte[] valueSerialized; try { + ObjectMapper objectMapper = new ObjectMapper( ); + valueSerialized = objectMapper.writeValueAsBytes( value ); } catch ( JsonProcessingException e ) { @@ -257,6 +258,8 @@ class EntityIndexMapUtils { byte[] serilizedObj = byteBuffer.array(); Object o; try { + ObjectMapper objectMapper = new ObjectMapper( ); + o = objectMapper.readValue( serilizedObj, ba.getClassinfo() ); } catch ( IOException e ) { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1bac23e/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java index c9240fe..df0c701 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java @@ -395,7 +395,7 @@ public class EntityIndexTest extends BaseIT { assertEquals( 1, candidateResults.size() ); EntityIndexBatch batch = entityIndex.createBatch(); - batch.deindex( searchEdge, entity ).execute().toBlocking().last(); + batch.deindex( searchEdge, entity ); batch.execute().toBlocking().last(); ei.refreshAsync().toBlocking().first();
