This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 3_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 847555ee615fd515df486bf5b70f5e3a90c28bc2 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Thu Jun 8 12:24:05 2023 +0200 Upgrading Elasticsearch --- .../core/provisioning/api/utils/ConnPoolConfUtils.java | 17 ++++++++--------- .../src/test/resources/rest/SearchScript.groovy | 16 ++++++++-------- pom.xml | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/ConnPoolConfUtils.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/ConnPoolConfUtils.java index 07f929a7cd..c0ba763582 100644 --- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/ConnPoolConfUtils.java +++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/ConnPoolConfUtils.java @@ -18,6 +18,7 @@ */ package org.apache.syncope.core.provisioning.api.utils; +import java.util.Optional; import org.apache.syncope.common.lib.to.ConnPoolConfTO; import org.apache.syncope.core.persistence.api.entity.ConnPoolConf; import org.identityconnectors.common.pooling.ObjectPoolConfiguration; @@ -27,12 +28,12 @@ public final class ConnPoolConfUtils { public static ConnPoolConf getConnPoolConf(final ConnPoolConfTO cpcto, final ConnPoolConf cpc) { ObjectPoolConfiguration opc = new ObjectPoolConfiguration(); - cpc.setMaxIdle(cpcto.getMaxIdle() == null ? opc.getMaxIdle() : cpcto.getMaxIdle()); - cpc.setMaxObjects(cpcto.getMaxObjects() == null ? opc.getMaxObjects() : cpcto.getMaxObjects()); - cpc.setMaxWait(cpcto.getMaxWait() == null ? opc.getMaxWait() : cpcto.getMaxWait()); - cpc.setMinEvictableIdleTimeMillis(cpcto.getMinEvictableIdleTimeMillis() == null - ? opc.getMinEvictableIdleTimeMillis() : cpcto.getMinEvictableIdleTimeMillis()); - cpc.setMinIdle(cpcto.getMinIdle() == null ? opc.getMinIdle() : cpcto.getMinIdle()); + cpc.setMaxIdle(Optional.ofNullable(cpcto.getMaxIdle()).orElse(opc.getMaxIdle())); + cpc.setMaxObjects(Optional.ofNullable(cpcto.getMaxObjects()).orElse(opc.getMaxObjects())); + cpc.setMaxWait(Optional.ofNullable(cpcto.getMaxWait()).orElse(opc.getMaxWait())); + cpc.setMinEvictableIdleTimeMillis( + Optional.ofNullable(cpcto.getMinEvictableIdleTimeMillis()).orElse(opc.getMinEvictableIdleTimeMillis())); + cpc.setMinIdle(Optional.ofNullable(cpcto.getMinIdle()).orElse(opc.getMinIdle())); return cpc; } @@ -43,9 +44,7 @@ public final class ConnPoolConfUtils { return opc; } - public static void updateObjectPoolConfiguration( - final ObjectPoolConfiguration opc, final ConnPoolConf cpc) { - + public static void updateObjectPoolConfiguration(final ObjectPoolConfiguration opc, final ConnPoolConf cpc) { if (cpc.getMaxIdle() != null) { opc.setMaxIdle(cpc.getMaxIdle()); } diff --git a/fit/core-reference/src/test/resources/rest/SearchScript.groovy b/fit/core-reference/src/test/resources/rest/SearchScript.groovy index 063165488b..2187d78bb4 100644 --- a/fit/core-reference/src/test/resources/rest/SearchScript.groovy +++ b/fit/core-reference/src/test/resources/rest/SearchScript.groovy @@ -35,16 +35,16 @@ import org.identityconnectors.framework.common.objects.OperationOptions // // The Query map describes the filter used (via FIQL's ConditionType): // -// query = [ operation: "EQUALS", left: attribute, right: "value" ] -// query = [ operation: "GREATER_THAN", left: attribute, right: "value" ] -// query = [ operation: "GREATER_OR_EQUALS", left: attribute, right: "value" ] -// query = [ operation: "LESS_THAN", left: attribute, right: "value" ] -// query = [ operation: "LESS_OR_EQUALS", left: attribute, right: "value" ] +// query = [ conditionType: "EQUALS", left: attribute, right: "value" ] +// query = [ conditionType: "GREATER_THAN", left: attribute, right: "value" ] +// query = [ conditionType: "GREATER_OR_EQUALS", left: attribute, right: "value" ] +// query = [ conditionType: "LESS_THAN", left: attribute, right: "value" ] +// query = [ conditionType: "LESS_OR_EQUALS", left: attribute, right: "value" ] // query = null : then we assume we fetch everything // // AND and OR filter just embed a left/right couple of queries. -// query = [ operation: "AND", left: query1, right: query2 ] -// query = [ operation: "OR", left: query1, right: query2 ] +// query = [ conditionType: "AND", left: query1, right: query2 ] +// query = [ conditionType: "OR", left: query1, right: query2 ] // // Returns: A list of Maps. Each map describing one row. // !!!! Each Map must contain a '__UID__' and '__NAME__' attribute. @@ -93,7 +93,7 @@ switch (objectClass) { case "__ACCOUNT__": if (query == null || (!query.get("left").equals("__UID__") && !query.get("left").equals("key") - && !query.get("conditionType").equals("EQUALS"))) { + && !query.get("conditionType").name().equals("EQUALS"))) { webClient.path("/users"); diff --git a/pom.xml b/pom.xml index 717263eaf2..bc45080b53 100644 --- a/pom.xml +++ b/pom.xml @@ -428,7 +428,7 @@ under the License. <slf4j.version>1.7.36</slf4j.version> - <elasticsearch.version>8.8.0</elasticsearch.version> + <elasticsearch.version>8.8.1</elasticsearch.version> <log4j2.version>2.20.0</log4j2.version> <disruptor.version>3.4.4</disruptor.version>
