moved SyncedFlushResponse to org.elasticsearch.client

-- Also Fixed indentation
elastic · May 29, 2018 · 90d23ad · 90d23ad
1 parent eac85e8
commit 90d23ad
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
@@ -54,7 +54,6 @@
 import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse;
-import org.elasticsearch.client.response.indices.flush.SyncedFlushResponse;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/...se/indices/flush/SyncedFlushResponse.java → ...ticsearch/client/SyncedFlushResponse.java b/...se/indices/flush/SyncedFlushResponse.java → ...ticsearch/client/SyncedFlushResponse.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.client.response.indices.flush;
+package org.elasticsearch.client;
 
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.ParseField;

diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
@@ -63,7 +63,6 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.action.support.broadcast.BroadcastResponse;
-import org.elasticsearch.client.response.indices.flush.SyncedFlushResponse;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.settings.Setting;
@@ -567,7 +566,7 @@ public void testFlush() throws IOException {
 
     public void testSyncedFlush() throws IOException {
         {
-                String index = "index";
+            String index = "index";
             Settings settings = Settings.builder()
                     .put("number_of_shards", 1)
                     .put("number_of_replicas", 0)

diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
@@ -650,11 +650,11 @@ public void testSyncedFlush() {
         String[] indices = randomBoolean() ? null : randomIndicesNames(0, 5);
         SyncedFlushRequest syncedFlushRequest;
         if (randomBoolean()) {
-                syncedFlushRequest = new SyncedFlushRequest(indices);
-            } else {
-                syncedFlushRequest = new SyncedFlushRequest();
-                syncedFlushRequest.indices(indices);
-            }
+            syncedFlushRequest = new SyncedFlushRequest(indices);
+        } else {
+            syncedFlushRequest = new SyncedFlushRequest();
+            syncedFlushRequest.indices(indices);
+        }
         Map<String, String> expectedParams = new HashMap<>();
         setRandomIndicesOptions(syncedFlushRequest::indicesOptions, syncedFlushRequest::indicesOptions, expectedParams);
         Request request = RequestConverters.flushSynced(syncedFlushRequest);

diff --git a/...dices/flush/SyncedFlushResponseTests.java → ...arch/client/SyncedFlushResponseTests.java b/...dices/flush/SyncedFlushResponseTests.java → ...arch/client/SyncedFlushResponseTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.client.response.indices.flush;
+package org.elasticsearch.client;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/...el/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java b/...el/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
@@ -56,16 +56,14 @@
 import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
-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.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.ESRestHighLevelClientTestCase;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.client.response.indices.flush.SyncedFlushResponse;
+import org.elasticsearch.client.SyncedFlushResponse;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
@@ -83,8 +81,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.Matchers.equalTo;
-
 /**
  * This class is used to generate the Java Indices API documentation.
  * You need to wrap your code between two tags like: