honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add indices API to groovy client

This commit is contained in:
kimchy 2010-11-26 22:19:57 +02:00
parent 73e5eb9e14
commit 577f06fd43
4 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
View File

@ -425,7 +425,7 @@ public interface IndicesAdminClient {
* @param index The index name
* @param text The text to analyze
*/
AnalyzeRequestBuilder prepareAnalyzer(String index, String text);
AnalyzeRequestBuilder prepareAnalyze(String index, String text);
/**
* Puts an index template.

2
modules/elasticsearch/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java
View File

@ -99,7 +99,7 @@ public abstract class AbstractIndicesAdminClient implements InternalIndicesAdmin
return new UpdateSettingsRequestBuilder(this).setIndices(indices);
}
@Override public AnalyzeRequestBuilder prepareAnalyzer(String index, String text) {
@Override public AnalyzeRequestBuilder prepareAnalyze(String index, String text) {
return new AnalyzeRequestBuilder(this, index, text);
}

2
modules/test/integration/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java
View File

@ -62,7 +62,7 @@ public class AnalyzeActionTests extends AbstractNodesTests {
client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
for (int i = 0; i < 10; i++) {
AnalyzeResponse analyzeResponse = client.admin().indices().prepareAnalyzer("test", "this is a test").execute().actionGet();
AnalyzeResponse analyzeResponse = client.admin().indices().prepareAnalyze("test", "this is a test").execute().actionGet();
assertThat(analyzeResponse.tokens().size(), equalTo(1));
AnalyzeResponse.AnalyzeToken token = analyzeResponse.tokens().get(0);
assertThat(token.term(), equalTo("test"));

69
plugins/lang/groovy/src/main/groovy/org/elasticsearch/groovy/client/GIndicesAdminClient.groovy
View File

@ -22,6 +22,8 @@ package org.elasticsearch.groovy.client
import org.elasticsearch.action.ActionListener
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse
import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest
import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse
import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest
import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest
@ -42,8 +44,13 @@ import org.elasticsearch.action.admin.indices.settings.UpdateSettingsRequest
import org.elasticsearch.action.admin.indices.settings.UpdateSettingsResponse
import org.elasticsearch.action.admin.indices.status.IndicesStatusRequest
import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse
import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest
import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateResponse
import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest
import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse
import org.elasticsearch.client.IndicesAdminClient
import org.elasticsearch.client.action.admin.indices.alias.IndicesAliasesRequestBuilder
import org.elasticsearch.client.action.admin.indices.analyze.AnalyzeRequestBuilder
import org.elasticsearch.client.action.admin.indices.cache.clear.ClearIndicesCacheRequestBuilder
import org.elasticsearch.client.action.admin.indices.create.CreateIndexRequestBuilder
import org.elasticsearch.client.action.admin.indices.delete.DeleteIndexRequestBuilder
@ -54,6 +61,8 @@ import org.elasticsearch.client.action.admin.indices.optimize.OptimizeRequestBui
import org.elasticsearch.client.action.admin.indices.refresh.RefreshRequestBuilder
import org.elasticsearch.client.action.admin.indices.settings.UpdateSettingsRequestBuilder
import org.elasticsearch.client.action.admin.indices.status.IndicesStatusRequestBuilder
import org.elasticsearch.client.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder
import org.elasticsearch.client.action.admin.indices.template.put.PutIndexTemplateRequestBuilder
import org.elasticsearch.client.internal.InternalClient
import org.elasticsearch.groovy.client.action.GActionFuture
import org.elasticsearch.groovy.common.xcontent.GXContentBuilder
@ -384,4 +393,64 @@ class GIndicesAdminClient {
indicesAdminClient.updateSettings(request, future)
return future
}
// ANALYZE
AnalyzeRequestBuilder prepareAnalyze(String index, String text) {
indicesAdminClient.prepareAnalyze(index, text);
}
GActionFuture<AnalyzeResponse> analyze(Closure c) {
AnalyzeRequest request = new AnalyzeRequest()
c.setDelegate request
c.resolveStrategy = gClient.resolveStrategy;
c.call();
analyze(request)
}
GActionFuture<AnalyzeResponse> analyze(AnalyzeRequest request) {
GActionFuture<AnalyzeResponse> future = new GActionFuture<AnalyzeResponse>(internalClient.threadPool(), request)
indicesAdminClient.analyze(request, future)
return future
}
// PUT INDEX TEMPLATE
PutIndexTemplateRequestBuilder preparePutTemplate(String name) {
indicesAdminClient.preparePutTemplate(name);
}
GActionFuture<PutIndexTemplateResponse> putTemplate(Closure c) {
PutIndexTemplateRequest request = new PutIndexTemplateRequest()
c.setDelegate request
c.resolveStrategy = gClient.resolveStrategy;
c.call();
putTemplate(request)
}
GActionFuture<PutIndexTemplateResponse> putTemplate(PutIndexTemplateRequest request) {
GActionFuture<PutIndexTemplateResponse> future = new GActionFuture<PutIndexTemplateResponse>(internalClient.threadPool(), request)
indicesAdminClient.putTemplate(request, future)
return future
}
// DELETE INDEX TEMPLATE
DeleteIndexTemplateRequestBuilder prepareDeleteTemplate(String name) {
indicesAdminClient.prepareDeleteTemplate(name);
}
GActionFuture<DeleteIndexTemplateResponse> deleteTemplate(Closure c) {
DeleteIndexTemplateRequest request = new DeleteIndexTemplateRequest()
c.setDelegate request
c.resolveStrategy = gClient.resolveStrategy;
c.call();
deleteTemplate(request)
}
GActionFuture<DeleteIndexTemplateResponse> deleteTemplate(DeleteIndexTemplateRequest request) {
GActionFuture<DeleteIndexTemplateResponse> future = new GActionFuture<DeleteIndexTemplateResponse>(internalClient.threadPool(), request)
indicesAdminClient.deleteTemplate(request, future)
return future
}
}