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 09:44:13 UTC
[syncope] 03/03: Upgrading Jackson and Wicket
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
commit 7590750aa2cd3f3998e9342f25bf20c9ca8e69aa
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Oct 12 11:43:24 2020 +0200
Upgrading Jackson and Wicket
---
.../main/java/org/apache/syncope/core/logic/ConfParamLogic.java | 7 +------
.../keymaster/cxf/client/SelfKeymasterInternalConfParamOps.java | 8 +-------
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 15 deletions(-)
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 12c59ef..d16985b 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,7 +18,6 @@
*/
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;
@@ -51,11 +50,7 @@ public class ConfParamLogic extends AbstractTransactionalLogic<EntityTO> {
public Map<String, Object> list() {
Map<String, Object> params = new TreeMap<>();
confParamDAO.findAll().forEach(param -> {
- try {
- params.put(param.getKey(), MAPPER.treeToValue(param.getValue(), Object.class));
- } catch (JsonProcessingException e) {
- LOG.error("While processing {}'s value", param.getKey(), e);
- }
+ params.put(param.getKey(), MAPPER.treeToValue(param.getValue(), Object.class));
});
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 3d46cae..1a5dae0 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,7 +20,6 @@ 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;
@@ -64,12 +63,7 @@ public class SelfKeymasterInternalConfParamOps implements ConfParamOps {
return defaultValue;
}
- try {
- return MAPPER.treeToValue(valueNode, reference);
- } catch (IOException e) {
- LOG.error("Could not deserialize {}", valueNode, e);
- return defaultValue;
- }
+ return MAPPER.treeToValue(valueNode, reference);
}
@Override
diff --git a/pom.xml b/pom.xml
index c25c3dd..f88ad40 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.11.3</jackson.version>
+ <jackson.version>2.12.0-rc1</jackson.version>
<spring.version>5.2.9.RELEASE</spring.version>
<spring-security.version>5.4.1</spring-security.version>
@@ -471,7 +471,7 @@ under the License.
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
- <wicket.version>9.0.0</wicket.version>
+ <wicket.version>9.1.0</wicket.version>
<wicket-jqueryui.version>9.0.0</wicket-jqueryui.version>
<wicket-bootstrap.version>5.0.1</wicket-bootstrap.version>
<wicket-spring-boot.version>3.0.4</wicket-spring-boot.version>