-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Add enrich transport client support #46002
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/client/EnrichClient.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
| package org.elasticsearch.xpack.core.enrich.client; | ||
|
|
||
| import org.elasticsearch.action.ActionFuture; | ||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.support.PlainActionFuture; | ||
| import org.elasticsearch.action.support.master.AcknowledgedResponse; | ||
| import org.elasticsearch.client.ElasticsearchClient; | ||
| import org.elasticsearch.xpack.core.enrich.action.DeleteEnrichPolicyAction; | ||
| import org.elasticsearch.xpack.core.enrich.action.ExecuteEnrichPolicyAction; | ||
| import org.elasticsearch.xpack.core.enrich.action.GetEnrichPolicyAction; | ||
| import org.elasticsearch.xpack.core.enrich.action.PutEnrichPolicyAction; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class EnrichClient { | ||
|
|
||
| private final ElasticsearchClient client; | ||
|
|
||
| public EnrichClient(ElasticsearchClient client) { | ||
| this.client = Objects.requireNonNull(client, "client"); | ||
| } | ||
|
|
||
| public void deleteEnrichPolicy( | ||
| final DeleteEnrichPolicyAction.Request request, | ||
| final ActionListener<AcknowledgedResponse> listener) { | ||
| client.execute(DeleteEnrichPolicyAction.INSTANCE, request, listener); | ||
| } | ||
|
|
||
| public ActionFuture<AcknowledgedResponse> deleteEnrichPolicy(final DeleteEnrichPolicyAction.Request request) { | ||
| final PlainActionFuture<AcknowledgedResponse> listener = PlainActionFuture.newFuture(); | ||
| client.execute(DeleteEnrichPolicyAction.INSTANCE, request, listener); | ||
| return listener; | ||
| } | ||
|
|
||
| public void executeEnrichPolicy( | ||
| final ExecuteEnrichPolicyAction.Request request, | ||
| final ActionListener<AcknowledgedResponse> listener) { | ||
| client.execute(ExecuteEnrichPolicyAction.INSTANCE, request, listener); | ||
| } | ||
|
|
||
| public ActionFuture<AcknowledgedResponse> executeEnrichPolicy(final ExecuteEnrichPolicyAction.Request request) { | ||
| final PlainActionFuture<AcknowledgedResponse> listener = PlainActionFuture.newFuture(); | ||
| client.execute(ExecuteEnrichPolicyAction.INSTANCE, request, listener); | ||
| return listener; | ||
| } | ||
|
|
||
| public void getEnrichPolicy( | ||
| final GetEnrichPolicyAction.Request request, | ||
| final ActionListener<GetEnrichPolicyAction.Response> listener) { | ||
| client.execute(GetEnrichPolicyAction.INSTANCE, request, listener); | ||
| } | ||
|
|
||
| public ActionFuture<GetEnrichPolicyAction.Response> getEnrichPolicy(final GetEnrichPolicyAction.Request request) { | ||
| final PlainActionFuture<GetEnrichPolicyAction.Response> listener = PlainActionFuture.newFuture(); | ||
| client.execute(GetEnrichPolicyAction.INSTANCE, request, listener); | ||
| return listener; | ||
| } | ||
|
|
||
| public void putEnrichPolicy( | ||
| final PutEnrichPolicyAction.Request request, | ||
| final ActionListener<AcknowledgedResponse> listener) { | ||
| client.execute(PutEnrichPolicyAction.INSTANCE, request, listener); | ||
| } | ||
|
|
||
| public ActionFuture<AcknowledgedResponse> putEnrichPolicy(final PutEnrichPolicyAction.Request request) { | ||
| final PlainActionFuture<AcknowledgedResponse> listener = PlainActionFuture.newFuture(); | ||
| client.execute(PutEnrichPolicyAction.INSTANCE, request, listener); | ||
| return listener; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...nt-tests/src/test/java/org/elasticsearch/xpack/enrich/client/EnrichTransportClientIT.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.enrich.client; | ||
|
|
||
| import org.elasticsearch.action.support.master.AcknowledgedResponse; | ||
| import org.elasticsearch.client.Client; | ||
| import org.elasticsearch.xpack.ESXPackSmokeClientTestCase; | ||
| import org.elasticsearch.xpack.core.XPackClient; | ||
| import org.elasticsearch.xpack.core.enrich.EnrichPolicy; | ||
| import org.elasticsearch.xpack.core.enrich.action.DeleteEnrichPolicyAction; | ||
| import org.elasticsearch.xpack.core.enrich.action.GetEnrichPolicyAction; | ||
| import org.elasticsearch.xpack.core.enrich.action.PutEnrichPolicyAction; | ||
| import org.elasticsearch.xpack.core.enrich.client.EnrichClient; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.nullValue; | ||
|
|
||
| public class EnrichTransportClientIT extends ESXPackSmokeClientTestCase { | ||
|
|
||
| private static void assertEqualPolicies(EnrichPolicy expectedInstance, EnrichPolicy newInstance) { | ||
| assertThat(newInstance.getType(), equalTo(expectedInstance.getType())); | ||
| if (newInstance.getQuery() != null) { | ||
| // testFromXContent, always shuffles the xcontent and then byte wise the query is different, so we check the parsed version: | ||
| assertThat(newInstance.getQuery().getQueryAsMap(), equalTo(expectedInstance.getQuery().getQueryAsMap())); | ||
| } else { | ||
| assertThat(expectedInstance.getQuery(), nullValue()); | ||
| } | ||
| assertThat(newInstance.getIndices(), equalTo(expectedInstance.getIndices())); | ||
| assertThat(newInstance.getMatchField(), equalTo(expectedInstance.getMatchField())); | ||
| assertThat(newInstance.getEnrichFields(), equalTo(expectedInstance.getEnrichFields())); | ||
| } | ||
|
|
||
| public void testEnrichCrud() throws IOException { | ||
| Client client = getClient(); | ||
| XPackClient xPackClient = new XPackClient(client); | ||
| EnrichClient enrichClient = xPackClient.enrichClient(); | ||
|
|
||
| EnrichPolicy policy = new EnrichPolicy("exact_match", null, Collections.emptyList(), "test", Collections.emptyList()); | ||
| String policyName = "my-policy"; | ||
|
|
||
| AcknowledgedResponse acknowledgedResponse = enrichClient.putEnrichPolicy( | ||
| new PutEnrichPolicyAction.Request(policyName, | ||
| policy)).actionGet(); | ||
|
|
||
| assertTrue(acknowledgedResponse.isAcknowledged()); | ||
|
|
||
| GetEnrichPolicyAction.Response getResponse = enrichClient.getEnrichPolicy( | ||
| new GetEnrichPolicyAction.Request(policyName)).actionGet(); | ||
|
|
||
| assertThat(getResponse.getPolicies().size(), equalTo(1)); | ||
| assertThat(policyName, equalTo(getResponse.getPolicies().get(0).getName())); | ||
| assertEqualPolicies(policy, getResponse.getPolicies().get(0).getPolicy()); | ||
|
|
||
| acknowledgedResponse = enrichClient.deleteEnrichPolicy(new DeleteEnrichPolicyAction.Request(policyName)).actionGet(); | ||
| assertTrue(acknowledgedResponse.isAcknowledged()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and this is the quality of work i give when im paying attn to support cases instead of code :P