You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/10/12 10:58:29 UTC
[syncope] branch master updated: Fixing XML (de)serilization after
Jackson upgrade
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 0743b60 Fixing XML (de)serilization after Jackson upgrade
0743b60 is described below
commit 0743b60bcd109ad2d16a1e2412d98e7099cbcaa2
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Oct 12 12:56:23 2020 +0200
Fixing XML (de)serilization after Jackson upgrade
---
common/am/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java | 2 ++
.../java/org/apache/syncope/common/lib/jackson/SyncopeXmlMapper.java | 2 ++
.../idrepo/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java | 2 ++
.../src/test/java/org/apache/syncope/common/lib/to/XMLTest.java | 2 ++
4 files changed, 8 insertions(+)
diff --git a/common/am/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java b/common/am/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java
index 25f2a2a..2431ae4 100644
--- a/common/am/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java
+++ b/common/am/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -35,6 +36,7 @@ public class XMLTest extends SerializationTest {
XML_MAPPER.configOverride(List.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
XML_MAPPER.configOverride(Set.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
XML_MAPPER.configOverride(Map.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
+ XML_MAPPER.enable(FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL);
}
@Override
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/jackson/SyncopeXmlMapper.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/jackson/SyncopeXmlMapper.java
index dcf9fec..5821e66 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/jackson/SyncopeXmlMapper.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/jackson/SyncopeXmlMapper.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import java.util.List;
@@ -43,5 +44,6 @@ public class SyncopeXmlMapper extends XmlMapper {
configOverride(List.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
configOverride(Set.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
configOverride(Map.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
+ enable(FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL);
}
}
diff --git a/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java b/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java
index 25f2a2a..2431ae4 100644
--- a/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java
+++ b/common/idrepo/lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -35,6 +36,7 @@ public class XMLTest extends SerializationTest {
XML_MAPPER.configOverride(List.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
XML_MAPPER.configOverride(Set.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
XML_MAPPER.configOverride(Map.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
+ XML_MAPPER.enable(FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL);
}
@Override
diff --git a/ext/flowable/common-lib/src/test/java/org/apache/syncope/common/lib/to/XMLTest.java b/ext/flowable/common-lib/src/test/java/org/apache/syncope/common/lib/to/XMLTest.java
index e714480..59d9d4b 100644
--- a/ext/flowable/common-lib/src/test/java/org/apache/syncope/common/lib/to/XMLTest.java
+++ b/ext/flowable/common-lib/src/test/java/org/apache/syncope/common/lib/to/XMLTest.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonSetter;
import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -35,6 +36,7 @@ public class XMLTest extends SerializationTest {
XML_MAPPER.configOverride(List.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
XML_MAPPER.configOverride(Set.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
XML_MAPPER.configOverride(Map.class).setSetterInfo(JsonSetter.Value.forValueNulls(Nulls.AS_EMPTY));
+ XML_MAPPER.enable(FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL);
}
@Override