From 347589a78ba6db05bb4fe62ad92a0b73e4a57c3e Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Fri, 23 May 2014 22:40:39 -0700 Subject: Adding dynamo support. --- src/com/p4square/grow/provider/DelegateCollectionProvider.java | 4 ++-- src/com/p4square/grow/provider/JsonEncodedProvider.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src/com/p4square/grow/provider') diff --git a/src/com/p4square/grow/provider/DelegateCollectionProvider.java b/src/com/p4square/grow/provider/DelegateCollectionProvider.java index e17af87..cf697ba 100644 --- a/src/com/p4square/grow/provider/DelegateCollectionProvider.java +++ b/src/com/p4square/grow/provider/DelegateCollectionProvider.java @@ -5,7 +5,7 @@ package com.p4square.grow.provider; import java.io.IOException; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -31,7 +31,7 @@ public abstract class DelegateCollectionProvider public Map query(C collection, int limit) throws IOException { Map delegateResult = mProvider.query(makeCollectionKey(collection), limit); - Map result = new HashMap<>(); + Map result = new LinkedHashMap<>(); for (Map.Entry entry : delegateResult.entrySet()) { result.put(unmakeKey(entry.getKey()), entry.getValue()); } diff --git a/src/com/p4square/grow/provider/JsonEncodedProvider.java b/src/com/p4square/grow/provider/JsonEncodedProvider.java index 7651443..500f761 100644 --- a/src/com/p4square/grow/provider/JsonEncodedProvider.java +++ b/src/com/p4square/grow/provider/JsonEncodedProvider.java @@ -46,6 +46,10 @@ public abstract class JsonEncodedProvider { * @throws IOException if the object cannot be encoded. */ protected String encode(V obj) throws IOException { + if (mClazz == String.class) { + return (String) obj; + } + return MAPPER.writeValueAsString(obj); } @@ -61,6 +65,10 @@ public abstract class JsonEncodedProvider { return null; } + if (mClazz == String.class) { + return (V) blob; + } + V obj; if (mClazz != null) { obj = MAPPER.readValue(blob, mClazz); -- cgit v1.2.3