Skip to content

Upgrade ES client to latest version #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 23, 2021
Merged

Upgrade ES client to latest version #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e907ae6
Upgrade ES client to latest version
Jun 23, 2021
460abac
fix pom
Jun 23, 2021
4e62757
Remove werror flag that is failing build
Jun 23, 2021
f3b4417
Add werror back to pom
Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</scm>

<properties>
<es.version>7.0.1</es.version>
<es.version>7.9.3</es.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>2.28.2</mockito.version>
<gson.version>2.8.6</gson.version>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/confluent/connect/elasticsearch/ElasticsearchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
import org.elasticsearch.client.indices.GetMappingsRequest;
import org.elasticsearch.client.indices.GetMappingsResponse;
import org.elasticsearch.client.indices.PutMappingRequest;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.unit.TimeValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -229,7 +229,7 @@ public void flush() {
* @return true if a mapping exists, false if it does not
*/
public boolean hasMapping(String index) {
MappingMetaData mapping = mapping(index);
MappingMetadata mapping = mapping(index);
return mapping != null && mapping.sourceAsMap() != null && !mapping.sourceAsMap().isEmpty();
}

Expand Down Expand Up @@ -470,9 +470,9 @@ private boolean isFailed() {
* Gets the mapping for an index.
*
* @param index the index to fetch the mapping for
* @return the MappingMetaData for the index
* @return the MappingMetadata for the index
*/
private MappingMetaData mapping(String index) {
private MappingMetadata mapping(String index) {
GetMappingsRequest request = new GetMappingsRequest().indices(index);
GetMappingsResponse response = callWithRetries(
"get mapping for index " + index,
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/confluent/connect/elasticsearch/helper/ElasticsearchHelperClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.elasticsearch.client.security.RefreshPolicy;
import org.elasticsearch.client.security.user.User;
import org.elasticsearch.client.security.user.privileges.Role;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.search.SearchHits;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -68,7 +68,7 @@ public long getDocCount(String index) throws IOException {
return client.count(request, RequestOptions.DEFAULT).getCount();
}

public MappingMetaData getMapping(String index) throws IOException {
public MappingMetadata getMapping(String index) throws IOException {
GetMappingsRequest request = new GetMappingsRequest().indices(index);
GetMappingsResponse response = client.indices().getMapping(request, RequestOptions.DEFAULT);
return response.mappings().get(index);
Expand Down