From d94643c217b6b93eb6c539c60b00fe0cf68272b7 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sat, 9 Nov 2013 15:24:56 -0800 Subject: Refactored TrainingResource to use the Provider interface. Playlists are now generated from a default playlist and regularly merged with the default playlist to get updates. Also adding the Question tests that got left out of a previous commit. --- src/com/p4square/grow/provider/JsonEncodedProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/com/p4square/grow/provider/JsonEncodedProvider.java') diff --git a/src/com/p4square/grow/provider/JsonEncodedProvider.java b/src/com/p4square/grow/provider/JsonEncodedProvider.java index 605b18c..655b531 100644 --- a/src/com/p4square/grow/provider/JsonEncodedProvider.java +++ b/src/com/p4square/grow/provider/JsonEncodedProvider.java @@ -6,9 +6,9 @@ package com.p4square.grow.provider; import java.io.IOException; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; /** * Provider provides a simple interface for loading and persisting @@ -19,9 +19,9 @@ import org.codehaus.jackson.map.SerializationConfig; public abstract class JsonEncodedProvider implements Provider { public static final ObjectMapper MAPPER = new ObjectMapper(); static { - MAPPER.configure(SerializationConfig.Feature.WRITE_ENUMS_USING_TO_STRING, true); - MAPPER.configure(DeserializationConfig.Feature.READ_ENUMS_USING_TO_STRING, true); - MAPPER.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); + MAPPER.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); + MAPPER.configure(DeserializationFeature.READ_ENUMS_USING_TO_STRING, true); + MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } private final Class mClazz; -- cgit v1.2.3