Repository: syncope Updated Branches: refs/heads/master 65f19aaf5 -> 496aeb439
Upgrading Elasticsearch Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/496aeb43 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/496aeb43 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/496aeb43 Branch: refs/heads/master Commit: 496aeb439e1b8501db02a9ca25880af9951b340b Parents: 65f19aa Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Dec 20 17:04:45 2017 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Dec 20 17:04:45 2017 +0100 ---------------------------------------------------------------------- .../client/ElasticsearchClientFactoryBean.java | 11 ++++++++--- pom.xml | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/496aeb43/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientFactoryBean.java ---------------------------------------------------------------------- diff --git a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientFactoryBean.java b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientFactoryBean.java index dbba1d8..0d78f7d 100644 --- a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientFactoryBean.java +++ b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchClientFactoryBean.java @@ -32,13 +32,13 @@ import org.springframework.beans.factory.FactoryBean; */ public class ElasticsearchClientFactoryBean implements FactoryBean<Client>, DisposableBean { - private Map<String, Object> settings; + private Map<String, String> settings; private Map<String, Integer> addresses; private Client client; - public void setSettings(final Map<String, Object> settings) { + public void setSettings(final Map<String, String> settings) { this.settings = settings; } @@ -50,7 +50,12 @@ public class ElasticsearchClientFactoryBean implements FactoryBean<Client>, Disp public Client getObject() throws Exception { synchronized (this) { if (client == null) { - PreBuiltTransportClient tClient = new PreBuiltTransportClient(Settings.builder().put(settings).build()); + Settings.Builder builder = Settings.builder(); + settings.entrySet().forEach(entry -> { + builder.put(entry.getKey(), entry.getValue()); + }); + + PreBuiltTransportClient tClient = new PreBuiltTransportClient(builder.build()); for (Map.Entry<String, Integer> entry : addresses.entrySet()) { tClient.addTransportAddress( http://git-wip-us.apache.org/repos/asf/syncope/blob/496aeb43/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dd9672a..10c1033 100644 --- a/pom.xml +++ b/pom.xml @@ -391,7 +391,7 @@ under the License. <slf4j.version>1.7.25</slf4j.version> <opensaml.version>3.3.0</opensaml.version> - <elasticsearch.version>6.0.1</elasticsearch.version> + <elasticsearch.version>6.1.1</elasticsearch.version> <log4j.version>2.10.0</log4j.version> <disruptor.version>3.3.7</disruptor.version> @@ -2232,7 +2232,7 @@ under the License. <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link> <link>http://www.flowable.org/docs/javadocs/</link> <link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/3.3.0/apidocs/</link> - <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/6.0.1/</link> + <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/6.1.1/</link> </links> </configuration> <reportSets>
