Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-11 - Upgrading Jackson to the last stable release

Browse Source
This commit is contained in:
Michael Nitschinger
2013-06-03 13:41:59 +02:00
committed by Oliver Gierke
parent 407adf96df
commit afab31ff2f
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
View File

@@ -20,10 +20,10 @@ package org.springframework.data.couchbase.core.convert;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.ObjectMapper;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;

4
src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java
View File

@@ -19,8 +19,8 @@ package org.springframework.data.couchbase.core.mapping;
import java.util.HashMap;
import java.util.Map;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.data.mapping.model.MappingException;
/**

4
src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java
View File

@@ -139,8 +139,8 @@ public class CouchbaseTemplateTest {
template.save(complex);
String expected = "{\"info1\":{\"foo\":true,\"bar\":false},\"votes\":[],"
+ "\"firstnames\":[\"Michael\",\"Thomas\"],\"info2\":{}}";
String expected = "{\"firstnames\":[\"Michael\",\"Thomas\"],\"info2\":{}," +
"\"info1\":{\"foo\":true,\"bar\":false},\"votes\":[]}";
assertEquals(expected, client.get(id));
ComplexPerson response = template.findById(id, ComplexPerson.class);