o Including state in both badge and badge progress.

o Removing count from badge, inserting one badge per badge received.

1 files changed, 3 insertions, 23 deletions

diff --git a/src/main/java/io/trygvis/esper/testing/web/MyObjectMapper.java b/src/main/java/io/trygvis/esper/testing/web/MyObjectMapper.java
index bfbd6eb..c684010 100755
--- a/src/main/java/io/trygvis/esper/testing/web/MyObjectMapper.java
+++ b/src/main/java/io/trygvis/esper/testing/web/MyObjectMapper.java
@@ -1,37 +1,17 @@
 package io.trygvis.esper.testing.web;
 
-import io.trygvis.esper.testing.*;
-import org.codehaus.jackson.*;
 import org.codehaus.jackson.map.*;
-import org.codehaus.jackson.map.module.*;
 
-import java.io.*;
 import javax.ws.rs.ext.*;
 
 public class MyObjectMapper implements ContextResolver<ObjectMapper> {
-    private ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
 
-    public MyObjectMapper() throws Exception {
-        objectMapper = new ObjectMapper();
-        SimpleModule module = new SimpleModule("wat", Version.unknownVersion());
-        module.addDeserializer(Uuid.class, new UuidDeserializer());
-        module.addSerializer(Uuid.class, new UuidSerializer());
-        objectMapper.registerModule(module);
+    public MyObjectMapper(ObjectMapper objectMapper) throws Exception {
+        this.objectMapper = objectMapper;
     }
 
     public ObjectMapper getContext(Class<?> type) {
         return objectMapper;
     }
-
-    private static class UuidDeserializer extends JsonDeserializer<Uuid> {
-        public Uuid deserialize(JsonParser jp, DeserializationContext context) throws IOException {
-            return Uuid.fromString(jp.getText());
-        }
-    }
-
-    private static class UuidSerializer extends JsonSerializer<Uuid> {
-        public void serialize(Uuid value, JsonGenerator generator, SerializerProvider provider) throws IOException {
-            generator.writeString(value.toStringBase64());
-        }
-    }
 }