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/15 05:04:41 UTC
[syncope] branch master updated: Reverting Jackson upgrade to RC
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 ec22504 Reverting Jackson upgrade to RC
ec22504 is described below
commit ec2250451eabc0e8a91edd06e10f5ca8b550ef0e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Oct 15 06:24:24 2020 +0200
Reverting Jackson upgrade to RC
This reverts commit 0743b60bcd109ad2d16a1e2412d98e7099cbcaa2.
---
.../lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java | 2 --
.../org/apache/syncope/common/lib/jackson/SyncopeXmlMapper.java | 2 --
.../lib/src/test/java/org/apache/syncope/common/lib/XMLTest.java | 2 --
.../src/test/java/org/apache/syncope/common/lib/to/XMLTest.java | 2 --
.../main/java/org/apache/syncope/core/logic/ConfParamLogic.java | 7 ++++++-
.../keymaster/cxf/client/SelfKeymasterInternalConfParamOps.java | 8 +++++++-
pom.xml | 8 +-------
7 files changed, 14 insertions(+), 17 deletions(-)
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 2431ae4..25f2a2a 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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 5821e66..dcf9fec 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,7 +22,6 @@ 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;
@@ -44,6 +43,5 @@ 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 2431ae4..25f2a2a 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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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 59d9d4b..e714480 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,7 +22,6 @@ 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;
@@ -36,7 +35,6 @@ 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/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/ConfParamLogic.java b/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/ConfParamLogic.java
index d16985b..12c59ef 100644
--- a/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/ConfParamLogic.java
+++ b/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/ConfParamLogic.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.logic;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.lang.reflect.Method;
@@ -50,7 +51,11 @@ public class ConfParamLogic extends AbstractTransactionalLogic<EntityTO> {
public Map<String, Object> list() {
Map<String, Object> params = new TreeMap<>();
confParamDAO.findAll().forEach(param -> {
- params.put(param.getKey(), MAPPER.treeToValue(param.getValue(), Object.class));
+ try {
+ params.put(param.getKey(), MAPPER.treeToValue(param.getValue(), Object.class));
+ } catch (JsonProcessingException e) {
+ LOG.error("While processing {}'s value", param.getKey(), e);
+ }
});
return params;
}
diff --git a/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/client/SelfKeymasterInternalConfParamOps.java b/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/client/SelfKeymasterInternalConfParamOps.java
index 1a5dae0..3d46cae 100644
--- a/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/client/SelfKeymasterInternalConfParamOps.java
+++ b/ext/self-keymaster/rest-cxf/src/main/java/org/apache/syncope/ext/self/keymaster/cxf/client/SelfKeymasterInternalConfParamOps.java
@@ -20,6 +20,7 @@ package org.apache.syncope.ext.self.keymaster.cxf.client;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
import org.apache.syncope.common.keymaster.client.api.ConfParamOps;
@@ -63,7 +64,12 @@ public class SelfKeymasterInternalConfParamOps implements ConfParamOps {
return defaultValue;
}
- return MAPPER.treeToValue(valueNode, reference);
+ try {
+ return MAPPER.treeToValue(valueNode, reference);
+ } catch (IOException e) {
+ LOG.error("Could not deserialize {}", valueNode, e);
+ return defaultValue;
+ }
}
@Override
diff --git a/pom.xml b/pom.xml
index 3cb514c..88cb422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,7 @@ under the License.
<cxf.version>3.4.0</cxf.version>
<bouncycastle.version>1.66</bouncycastle.version>
- <jackson.version>2.12.0-rc1</jackson.version>
+ <jackson.version>2.11.3</jackson.version>
<spring.version>5.2.9.RELEASE</spring.version>
<spring-security.version>5.4.1</spring-security.version>
@@ -805,12 +805,6 @@ under the License.
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>