This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 58b1bbb027 Upgrading Elasticsearch (keeping RestHighLevelClient)
58b1bbb027 is described below
commit 58b1bbb0270ef9bc8ebe8c3f2cb9cf8914cf1810
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Sat May 7 12:26:49 2022 +0200
Upgrading Elasticsearch (keeping RestHighLevelClient)
---
ext/elasticsearch/client-elasticsearch/pom.xml | 17 --------------
.../client/ElasticsearchClientFactoryBean.java | 16 +++++++------
.../client/ElasticsearchIndexManager.java | 10 ++++-----
.../elasticsearch/client/ElasticsearchUtils.java | 5 +++--
.../jpa/dao/ElasticsearchAnySearchDAO.java | 4 ++--
.../java/job/ElasticsearchReindex.java | 6 ++---
pom.xml | 26 +---------------------
7 files changed, 23 insertions(+), 61 deletions(-)
diff --git a/ext/elasticsearch/client-elasticsearch/pom.xml
b/ext/elasticsearch/client-elasticsearch/pom.xml
index 22d65201aa..d1945a98a7 100644
--- a/ext/elasticsearch/client-elasticsearch/pom.xml
+++ b/ext/elasticsearch/client-elasticsearch/pom.xml
@@ -48,23 +48,6 @@ under the License.
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-smile</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </dependency>
</dependencies>
<build>
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 39246a931b..df68c6ea85 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
@@ -31,14 +31,16 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.message.BasicHeader;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
/**
- * Spring {@link FactoryBean} for getting the Elasticsearch's {@link
RestHighLevelClient} singleton instance.
+ * Spring {@link FactoryBean} for getting the Elasticsearch's
+ * {@link org.elasticsearch.client.RestHighLevelClient} singleton instance.
*/
-public class ElasticsearchClientFactoryBean implements
FactoryBean<RestHighLevelClient>, DisposableBean {
+@SuppressWarnings("deprecation")
+public class ElasticsearchClientFactoryBean
+ implements FactoryBean<org.elasticsearch.client.RestHighLevelClient>,
DisposableBean {
private final List<HttpHost> hosts;
@@ -52,7 +54,7 @@ public class ElasticsearchClientFactoryBean implements
FactoryBean<RestHighLevel
private String apiKeySecret;
- private RestHighLevelClient client;
+ private org.elasticsearch.client.RestHighLevelClient client;
public ElasticsearchClientFactoryBean(final List<HttpHost> hosts) {
this.hosts = hosts;
@@ -91,7 +93,7 @@ public class ElasticsearchClientFactoryBean implements
FactoryBean<RestHighLevel
}
@Override
- public RestHighLevelClient getObject() throws Exception {
+ public org.elasticsearch.client.RestHighLevelClient getObject() throws
Exception {
synchronized (this) {
if (client == null) {
RestClientBuilder restClient =
RestClient.builder(hosts.toArray(new HttpHost[0]));
@@ -109,7 +111,7 @@ public class ElasticsearchClientFactoryBean implements
FactoryBean<RestHighLevel
restClient.setDefaultHeaders(
new Header[] { new
BasicHeader(HttpHeaders.AUTHORIZATION, "ApiKey " + apiKeyAuth) });
}
- client = new RestHighLevelClient(restClient);
+ client = new
org.elasticsearch.client.RestHighLevelClient(restClient);
}
}
return client;
@@ -117,7 +119,7 @@ public class ElasticsearchClientFactoryBean implements
FactoryBean<RestHighLevel
@Override
public Class<?> getObjectType() {
- return RestHighLevelClient.class;
+ return org.elasticsearch.client.RestHighLevelClient.class;
}
@Override
diff --git
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
index b313dca022..284831ff1e 100644
---
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
+++
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
@@ -36,12 +36,11 @@ import
org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.indices.CreateIndexRequest;
import org.elasticsearch.client.indices.CreateIndexResponse;
import org.elasticsearch.client.indices.GetIndexRequest;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.event.TransactionalEventListener;
@@ -49,16 +48,17 @@ import
org.springframework.transaction.event.TransactionalEventListener;
/**
* Listen to any create / update and delete in order to keep the Elasticsearch
indexes consistent.
*/
+@SuppressWarnings("deprecation")
public class ElasticsearchIndexManager {
private static final Logger LOG =
LoggerFactory.getLogger(ElasticsearchIndexManager.class);
- protected final RestHighLevelClient client;
+ protected final org.elasticsearch.client.RestHighLevelClient client;
protected final ElasticsearchUtils elasticsearchUtils;
public ElasticsearchIndexManager(
- final RestHighLevelClient client,
+ final org.elasticsearch.client.RestHighLevelClient client,
final ElasticsearchUtils elasticsearchUtils) {
this.client = client;
diff --git
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
index a411ec1990..3a030cc096 100644
---
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
+++
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
@@ -36,14 +36,15 @@ import
org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.spring.security.AuthContextUtils;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
* Utility methods for usage with Elasticsearch.
*/
+@SuppressWarnings("deprecation")
public class ElasticsearchUtils {
public static String getContextDomainName(final String domain, final
AnyTypeKind kind) {
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 c11bb4d2bd..6843a02bd8 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
@@ -63,7 +63,6 @@ import
org.apache.syncope.ext.elasticsearch.client.ElasticsearchUtils;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.core.CountRequest;
import org.elasticsearch.index.query.DisMaxQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
@@ -78,6 +77,7 @@ import org.springframework.beans.factory.annotation.Autowired;
/**
* Search engine implementation for users, groups and any objects, based on
Elasticsearch.
*/
+@SuppressWarnings("deprecation")
public class ElasticsearchAnySearchDAO extends AbstractAnySearchDAO {
protected static final char[] ELASTICSEARCH_REGEX_CHARS = new char[] {
@@ -96,7 +96,7 @@ public class ElasticsearchAnySearchDAO extends
AbstractAnySearchDAO {
}
@Autowired
- protected RestHighLevelClient client;
+ protected org.elasticsearch.client.RestHighLevelClient client;
@Autowired
protected ElasticsearchUtils elasticsearchUtils;
diff --git
a/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
b/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
index edc9dbc144..c2e691e101 100644
---
a/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
+++
b/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
@@ -31,8 +31,7 @@ import
org.apache.syncope.ext.elasticsearch.client.ElasticsearchUtils;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentBuilder;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +39,11 @@ import
org.springframework.beans.factory.annotation.Autowired;
/**
* Remove and rebuild all Elasticsearch indexes with information from existing
users, groups and any objects.
*/
+@SuppressWarnings("deprecation")
public class ElasticsearchReindex extends AbstractSchedTaskJobDelegate {
@Autowired
- protected RestHighLevelClient client;
+ protected org.elasticsearch.client.RestHighLevelClient client;
@Autowired
protected ElasticsearchIndexManager indexManager;
diff --git a/pom.xml b/pom.xml
index 708f820fa9..4f7a86ed68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,7 +433,7 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>7.15.2</elasticsearch.version>
+ <elasticsearch.version>7.16.3</elasticsearch.version>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apachedirapi.version>2.0.0</apachedirapi.version>
@@ -805,30 +805,6 @@ under the License.
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>${elasticsearch.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-dataformat-smile</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
</dependency>
<dependency>
