Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-28 14:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-25 migrated to jackson v2.2.3

Browse Source
This commit is contained in:
Artur Konczak 2013-11-10 19:58:57 +00:00
parent 655ccb0cec
commit 47c82a8f96
3 changed files with 152 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@ -25,7 +25,7 @@
<commonscollections>3.2.1</commonscollections> <commonscollections>3.2.1</commonscollections>
<commonslang>2.6</commonslang> <commonslang>2.6</commonslang>
<elasticsearch>0.90.6</elasticsearch> <elasticsearch>0.90.6</elasticsearch>
<jackson>1.9.2</jackson> <jackson>2.2.3</jackson>
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons> <springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
</properties> </properties>
@ -94,8 +94,13 @@
<!-- Jackson JSON Mapper --> <!-- Jackson JSON Mapper -->
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson}</version> <version>${jackson}</version>
</dependency> </dependency>

7
src/main/java/org/springframework/data/elasticsearch/core/DefaultEntityMapper.java
View File

@ -1,7 +1,7 @@
package org.springframework.data.elasticsearch.core; package org.springframework.data.elasticsearch.core;
import org.codehaus.jackson.map.DeserializationConfig; import com.fasterxml.jackson.databind.DeserializationFeature;
import org.codehaus.jackson.map.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException; import java.io.IOException;
@ -9,6 +9,7 @@ import java.io.IOException;
* DocumentMapper using jackson * DocumentMapper using jackson
* *
* @author Artur Konczak * @author Artur Konczak
* @author Petar Tahchiev
*/ */
public class DefaultEntityMapper implements EntityMapper { public class DefaultEntityMapper implements EntityMapper {
@ -16,7 +17,7 @@ public class DefaultEntityMapper implements EntityMapper {
public DefaultEntityMapper() { public DefaultEntityMapper() {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
} }
@Override @Override

2
template.mf
View File

@ -10,7 +10,7 @@ Import-Template:
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional, org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional,
org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}", org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}", com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.0.0)}", org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.0.0)}",
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}", org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}", org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",