Skip to content

Commit

Permalink
Moving NoOpClient from HeadersAndContextCopyClientTests, moving it in…
Browse files Browse the repository at this point in the history
…to own class
  • Loading branch information
cbuescher committed May 29, 2015
1 parent 506151f commit c97e6ba
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 42 deletions.
Expand Up @@ -19,28 +19,47 @@

package org.elasticsearch.action.admin.indices.create;

import org.elasticsearch.action.index.IndexRequestBuilderTest;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.ElasticsearchSingleNodeTest;
import org.elasticsearch.rest.NoOpClient;
import org.elasticsearch.test.ElasticsearchTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

public class CreateIndexRequestBuilderTest extends ElasticsearchSingleNodeTest {
public class CreateIndexRequestBuilderTest extends ElasticsearchTestCase {

private static final String KEY = "my.settings.key";
private static final String VALUE = "my.settings.value";
private NoOpClient testClient;

@Override
@Before
public void setUp() throws Exception {
super.setUp();
this.testClient = new NoOpClient(getTestName());
}

@Override
@After
public void tearDown() throws Exception {
this.testClient.close();
super.tearDown();
}

/**
* test setting the source with available setters
*/
@Test
public void testSetSource() throws IOException {
CreateIndexRequestBuilder builder = client().admin().indices().prepareCreate("test");
CreateIndexRequestBuilder builder = new CreateIndexRequestBuilder(this.testClient, CreateIndexAction.INSTANCE);
builder.setSource("{\""+KEY+"\" : \""+VALUE+"\"}");
assertEquals(VALUE, builder.request().settings().get(KEY));

Expand All @@ -66,7 +85,7 @@ public void testSetSource() throws IOException {
*/
@Test
public void testSetSettings() throws IOException {
CreateIndexRequestBuilder builder = client().admin().indices().prepareCreate("test");
CreateIndexRequestBuilder builder = new CreateIndexRequestBuilder(this.testClient, CreateIndexAction.INSTANCE);
builder.setSettings(KEY, VALUE);
assertEquals(VALUE, builder.request().settings().get(KEY));

Expand Down
Expand Up @@ -23,23 +23,41 @@
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.test.ElasticsearchSingleNodeTest;
import org.elasticsearch.rest.NoOpClient;
import org.elasticsearch.test.ElasticsearchTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import java.io.ByteArrayOutputStream;
import java.util.HashMap;
import java.util.Map;

public class IndexRequestBuilderTest extends ElasticsearchSingleNodeTest {
public class IndexRequestBuilderTest extends ElasticsearchTestCase {

private static final String EXPECTED_SOURCE = "{\"SomeKey\":\"SomeValue\"}";
private NoOpClient testClient;

@Override
@Before
public void setUp() throws Exception {
super.setUp();
this.testClient = new NoOpClient(getTestName());
}

@Override
@After
public void tearDown() throws Exception {
this.testClient.close();
super.tearDown();
}

/**
* test setting the source for the request with different available setters
*/
@Test
public void testSetSource() throws Exception {
IndexRequestBuilder indexRequestBuilder = client().prepareIndex();
IndexRequestBuilder indexRequestBuilder = new IndexRequestBuilder(this.testClient, IndexAction.INSTANCE);
Map<String, String> source = new HashMap<>();
source.put("SomeKey", "SomeValue");
indexRequestBuilder.setSource(source);
Expand Down
Expand Up @@ -20,8 +20,9 @@
package org.elasticsearch.rest;

import com.google.common.collect.Maps;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.*;

import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
import org.elasticsearch.action.admin.cluster.stats.ClusterStatsRequest;
Expand All @@ -31,24 +32,26 @@
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.client.*;
import org.elasticsearch.client.support.AbstractClient;
import org.elasticsearch.client.support.Headers;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.ElasticsearchTestCase;
import org.elasticsearch.test.rest.FakeRestRequest;
import org.elasticsearch.threadpool.ThreadPool;
import org.junit.Test;

import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.is;

public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {

Expand Down Expand Up @@ -108,7 +111,7 @@ public void testCopyHeadersRequest() {
expectedContext.putAll(transportContext);
expectedContext.putAll(restContext);

try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {

SearchRequest searchRequest = Requests.searchRequest();
putHeaders(searchRequest, transportHeaders);
Expand Down Expand Up @@ -154,7 +157,7 @@ public void testCopyHeadersClusterAdminRequest() {
expectedContext.putAll(transportContext);
expectedContext.putAll(restContext);

try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, expectedContext), usefulRestHeaders)) {
try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, expectedContext), usefulRestHeaders)) {

ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
putHeaders(clusterHealthRequest, transportHeaders);
Expand Down Expand Up @@ -200,7 +203,7 @@ public void testCopyHeadersIndicesAdminRequest() {
expectedContext.putAll(transportContext);
expectedContext.putAll(restContext);

try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {

CreateIndexRequest createIndexRequest = Requests.createIndexRequest("test");
putHeaders(createIndexRequest, transportHeaders);
Expand Down Expand Up @@ -246,7 +249,7 @@ public void testCopyHeadersRequestBuilder() {
expectedContext.putAll(transportContext);
expectedContext.putAll(restContext);

try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {

ActionRequestBuilder requestBuilders[] = new ActionRequestBuilder[]{
client.prepareIndex("index", "type"),
Expand Down Expand Up @@ -287,7 +290,7 @@ public void testCopyHeadersClusterAdminRequestBuilder() {
expectedContext.putAll(transportContext);
expectedContext.putAll(restContext);

try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {

ActionRequestBuilder requestBuilders[] = new ActionRequestBuilder[]{
client.admin().cluster().prepareNodesInfo(),
Expand Down Expand Up @@ -327,7 +330,7 @@ public void testCopyHeadersIndicesAdminRequestBuilder() {
expectedContext.putAll(transportContext);
expectedContext.putAll(restContext);

try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {

ActionRequestBuilder requestBuilders[] = new ActionRequestBuilder[]{
client.admin().indices().prepareValidateQuery(),
Expand Down Expand Up @@ -420,25 +423,4 @@ private static void assertContext(ActionRequest<?> request, Map<String, String>
}
}
}

private class NoOpClient extends AbstractClient {

public NoOpClient() {
super(Settings.EMPTY, new ThreadPool(getTestName()), Headers.EMPTY);
}

@Override
protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
listener.onResponse(null);
}

@Override
public void close() {
try {
terminate(threadPool());
} catch (Throwable t) {
throw new ElasticsearchException(t.getMessage(), t);
}
}
}
}
54 changes: 54 additions & 0 deletions src/test/java/org/elasticsearch/rest/NoOpClient.java
@@ -0,0 +1,54 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.elasticsearch.rest;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.client.support.AbstractClient;
import org.elasticsearch.client.support.Headers;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.threadpool.ThreadPool;

import java.util.concurrent.TimeUnit;

public class NoOpClient extends AbstractClient {

public NoOpClient(String testName) {
super(Settings.EMPTY, new ThreadPool(testName), Headers.EMPTY);
}

@Override
protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
listener.onResponse(null);
}

@Override
public void close() {
try {
ThreadPool.terminate(threadPool(), 10, TimeUnit.SECONDS);
} catch (Throwable t) {
throw new ElasticsearchException(t.getMessage(), t);
}
}
}

0 comments on commit c97e6ba

Please sign in to comment.