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 778aac912c Fixing usage of deprecated methods
778aac912c is described below
commit 778aac912ce2348972b90c6691416aab4932ca08
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri May 23 09:07:08 2025 +0200
Fixing usage of deprecated methods
---
.../syncope/client/console/rest/LoggerConfRestClient.java | 5 +----
.../client/zookeeper/ZookeeperTestContentLoader.java | 11 ++++-------
.../persistence/common/content/KeymasterConfParamLoader.java | 4 +---
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
index b767c1b22d..b8dd3c03f6 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/LoggerConfRestClient.java
@@ -25,7 +25,6 @@ import jakarta.ws.rs.core.Response;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -79,9 +78,7 @@ public class LoggerConfRestClient implements RestClient,
LoggerConfOp {
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
JsonNode node = MAPPER.readTree((InputStream)
response.getEntity());
if (node.has("loggers")) {
- for (Iterator<Map.Entry<String, JsonNode>> itor =
node.get("loggers").fields(); itor.hasNext();) {
- Map.Entry<String, JsonNode> entry = itor.next();
-
+ for (Map.Entry<String, JsonNode> entry :
node.get("loggers").properties()) {
LoggerConf loggerConf = new LoggerConf();
loggerConf.setKey(entry.getKey());
if (entry.getValue().has("effectiveLevel")) {
diff --git
a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperTestContentLoader.java
b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperTestContentLoader.java
index 307ebeb7be..36ef717682 100644
---
a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperTestContentLoader.java
+++
b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperTestContentLoader.java
@@ -20,8 +20,8 @@ package org.apache.syncope.common.keymaster.client.zookeeper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.json.JsonMapper;
-import java.util.Iterator;
import java.util.Map;
+import java.util.Optional;
import org.apache.syncope.common.keymaster.client.api.ConfParamOps;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,12 +36,9 @@ public class ZookeeperTestContentLoader implements
InitializingBean {
@Override
public void afterPropertiesSet() throws Exception {
JsonNode content =
MAPPER.readTree(getClass().getResourceAsStream("/testKeymasterConfParams.json"));
- for (Iterator<Map.Entry<String, JsonNode>> itor = content.fields();
itor.hasNext();) {
- Map.Entry<String, JsonNode> param = itor.next();
- Object value = MAPPER.treeToValue(param.getValue(), Object.class);
- if (value != null) {
- confParamOps.set(ZookeeperConfParamOpsTest.DOMAIN,
param.getKey(), value);
- }
+ for (Map.Entry<String, JsonNode> param : content.properties()) {
+ Optional.ofNullable(MAPPER.treeToValue(param.getValue(),
Object.class)).
+ ifPresent(value ->
confParamOps.set(ZookeeperConfParamOpsTest.DOMAIN, param.getKey(), value));
}
}
}
diff --git
a/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/content/KeymasterConfParamLoader.java
b/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/content/KeymasterConfParamLoader.java
index e9b27d250c..3de128e41d 100644
---
a/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/content/KeymasterConfParamLoader.java
+++
b/core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/content/KeymasterConfParamLoader.java
@@ -21,7 +21,6 @@ package org.apache.syncope.core.persistence.common.content;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.json.JsonMapper;
import java.io.InputStream;
-import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import org.apache.syncope.common.keymaster.client.api.ConfParamOps;
@@ -76,8 +75,7 @@ public class KeymasterConfParamLoader implements
ConfParamLoader {
getBean(domain + "KeymasterConfParamsJSON",
InputStream.class)) {
JsonNode content = MAPPER.readTree(contentJSON);
- for (Iterator<Map.Entry<String, JsonNode>> itor =
content.fields(); itor.hasNext();) {
- Map.Entry<String, JsonNode> param = itor.next();
+ for (Map.Entry<String, JsonNode> param :
content.properties()) {
Optional.ofNullable(MAPPER.treeToValue(param.getValue(), Object.class)).
ifPresent(value ->
confParamOps.set(domain, param.getKey(), value));
}
