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 b2e67ab Upgrading Elasticsearch
b2e67ab is described below
commit b2e67ab00c20ce71229382cdadc0520a5a9b91c6
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Apr 15 10:53:56 2019 +0200
Upgrading Elasticsearch
---
.../syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
index a99ed24..f6dccee 100644
---
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
+++
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
@@ -148,7 +148,7 @@ public class ElasticsearchAnySearchDAO extends
AbstractAnySearchDAO {
protected int doCount(final Set<String> adminRealms, final SearchCond
cond, final AnyTypeKind kind) {
SearchRequest request = searchRequest(adminRealms, cond, kind, 0, 0,
Collections.emptyList());
try {
- return (int) client.search(request,
RequestOptions.DEFAULT).getHits().getTotalHits();
+ return (int) client.search(request,
RequestOptions.DEFAULT).getHits().getTotalHits().value;
} catch (IOException e) {
LOG.error("Search error", e);
return 0;
diff --git a/pom.xml b/pom.xml
index 4a8983b..082bb4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -416,7 +416,7 @@ under the License.
<slf4j.version>1.7.26</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>6.7.1</elasticsearch.version>
+ <elasticsearch.version>7.0.0</elasticsearch.version>
<apacheds.version>2.0.0.AM25</apacheds.version>
<apachedirapi.version>2.0.0.AM2</apachedirapi.version>
@@ -2477,7 +2477,7 @@ under the License.
<link>https://docs.spring.io/spring-security/site/docs/current/api/</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://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/6.7.1/index.html</link>
+
<link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/7.0.0/index.html</link>
<link>http://docs.swagger.io/swagger-core/v2.0.7/apidocs/</link>
</links>
</configuration>
