Fixes #56 Upgrade Jackson to 1.9

Also upgrades to latest versions of spring, httpclient and slf4j
helun · Feb 5, 2012 · 0276365 · 0276365
1 parent a43e093
commit 0276365
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/org.ektorp/src/main/java/org/ektorp/impl/jackson/EktorpAnnotationIntrospector.java b/org.ektorp/src/main/java/org/ektorp/impl/jackson/EktorpAnnotationIntrospector.java
@@ -2,12 +2,16 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.codehaus.jackson.map.introspect.AnnotatedClass;
 import org.codehaus.jackson.map.introspect.AnnotatedField;
+import org.codehaus.jackson.map.introspect.AnnotatedMember;
 import org.codehaus.jackson.map.introspect.AnnotatedMethod;
 import org.codehaus.jackson.map.introspect.NopAnnotationIntrospector;
 import org.ektorp.docref.DocumentReferences;
@@ -26,6 +30,12 @@ public boolean isHandled(Annotation ann) {
 		return DocumentReferences.class == ann.annotationType();
 	}
 
+	@Override
+	public boolean hasIgnoreMarker(AnnotatedMember member) {
+		boolean b = super.hasIgnoreMarker(member); 
+		return b;
+	}
+
 	@Override
 	public boolean isIgnorableField(AnnotatedField f) {
 		return f.hasAnnotation(DocumentReferences.class);
@@ -41,6 +51,20 @@ public boolean isIgnorableMethod(AnnotatedMethod m) {
 
 		return names.contains(m.getName());
 	}
+
+    @Override
+    public String[] findPropertiesToIgnore(AnnotatedClass ac) {
+    	List<String> ignoreFields = null;
+    	for (AnnotatedField f : ac.fields()) {
+    		if (isIgnorableField(f)) {
+    			if (ignoreFields == null) {
+    				ignoreFields = new ArrayList<String>();
+    			}
+    			ignoreFields.add(f.getName());
+    		}
+    	}
+        return ignoreFields != null ? ignoreFields.toArray(new String[ignoreFields.size()]) : null;
+    }
 
 	private void initIgnorableMethods(final Class<?> clazz) {
 		final Set<String> names = new HashSet<String>();

diff --git a/org.ektorp/src/test/java/org/ektorp/impl/StdCouchDbConnectorTest.java b/org.ektorp/src/test/java/org/ektorp/impl/StdCouchDbConnectorTest.java
@@ -26,6 +26,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.annotate.JsonPropertyOrder;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.ektorp.AttachmentInputStream;
 import org.ektorp.CouchDbInstance;
@@ -678,6 +679,7 @@ public void setAge(int age) {
 
     }
 
+    @JsonPropertyOrder({"value","param"})
     static class TestRequest {
         private String param;
         private String value;

diff --git a/pom.xml b/pom.xml
@@ -39,14 +39,14 @@
 	</modules>
 
 	<properties>
-		<slf4j.version>1.6.1</slf4j.version>
+		<slf4j.version>1.6.4</slf4j.version>
 		<mockito.version>1.8.5</mockito.version>
 		<junit.version>4.8.2</junit.version>
 		<joda.time.version>1.6.2</joda.time.version>
-		<jackson.version>1.8.6</jackson.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<jackson.version>1.9.4</jackson.version>
+		<spring.version>3.0.7.RELEASE</spring.version>
 		<commons.io.version>2.0.1</commons.io.version>
-		<httpclient.version>4.1.1</httpclient.version>
+		<httpclient.version>4.1.2</httpclient.version>
 		<aspectj.version>1.6.9</aspectj.version>
 	</properties>