Skip to content

Update to Jackson 2.9.x #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlar310 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Jackson 2.9.x #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
768328f
Update jackson.version to 2.9.7
larsenqec Dec 11, 2018
7555b7f
Make properties-to-ignore processing compatible with Jackson 2.9.x
larsenqec Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions org.ektorp/src/main/java/org/ektorp/impl/jackson/EktorpAnnotationIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.ektorp.util.Predicate;
import org.ektorp.util.ReflectionUtils;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
import com.fasterxml.jackson.databind.introspect.AnnotatedField;
Expand Down Expand Up @@ -46,15 +47,37 @@ public boolean isIgnorableMethod(AnnotatedMethod m) {
return names.contains(m.getName());
}

// deprecated as of Jackson 2.6 and not called at all by 2.7
@Override
public String[] findPropertiesToIgnore(Annotated ac) {
if(ac instanceof AnnotatedClass){
return findPropertiesToIgnore((AnnotatedClass) ac);
}
return super.findPropertiesToIgnore(ac);
}

public String[] findPropertiesToIgnore(AnnotatedClass ac) {

// deprecated as of Jackson 2.8 and not called at all by 2.9
@Override
public String[] findPropertiesToIgnore(Annotated ac, boolean forSerialization) {
if(ac instanceof AnnotatedClass){
return findPropertiesToIgnore((AnnotatedClass) ac);
}
return super.findPropertiesToIgnore(ac, forSerialization);
}

@Override // since Jackson 2.9
public JsonIgnoreProperties.Value findPropertyIgnorals(Annotated ac)
{
if(ac instanceof AnnotatedClass){
String[] ignoredFields = findPropertiesToIgnore((AnnotatedClass) ac);
if (ignoredFields != null) {
return JsonIgnoreProperties.Value.forIgnoredProperties(ignoredFields);
}
}
return super.findPropertyIgnorals(ac);
}

public String[] findPropertiesToIgnore(AnnotatedClass ac) {
List<String> ignoreFields = null;
for (AnnotatedField f : ac.fields()) {
if (isIgnorableField(f)) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<mockito.version>1.8.5</mockito.version>
<junit.version>4.8.2</junit.version>
<joda.time.version>2.3</joda.time.version>
<jackson.version>2.6.7</jackson.version>
<jackson.version>2.9.7</jackson.version>
<spring.version>3.1.1.RELEASE</spring.version>
<commons.io.version>2.0.1</commons.io.version>
<httpclient.version>4.3</httpclient.version>
Expand Down