Fix validation workflow (#33384)

elastic · Oct 31, 2018 · c3c9be0 · c3c9be0
1 parent 04fce0b
commit c3c9be0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java
@@ -91,7 +91,7 @@ static class RestGetSourceResponseListener extends RestResponseListener<GetRespo
 
         @Override
         public RestResponse buildResponse(final GetResponse response) throws Exception {
-            checkIfSourceEmpty(response);
+            checkResource(response);
 
             final XContentBuilder builder = channel.newBuilder(request.getXContentType(), false);
             final BytesReference source = response.getSourceInternal();
@@ -102,19 +102,20 @@ public RestResponse buildResponse(final GetResponse response) throws Exception {
         }
 
         /**
-         * Checks if the requested source or document itself is missing.
+         * Checks if the requested document or source is missing.
          *
          * @param response a response
-         * @throws ResourceNotFoundException if source or doc itself is missing
+         * @throws ResourceNotFoundException if the document or source is missing
          */
-        private void checkIfSourceEmpty(final GetResponse response) {
-            if (response.isSourceEmpty()) {
-                final String resourceType = response.isExists() == false ? "Document" : "Source";
-                final String index = response.getIndex();
-                final String type = response.getType();
-                final String id = response.getId();
-
-                throw new ResourceNotFoundException(resourceType + " not found [" + index + "]/[" + type + "]/[" + id + "]");
+        private void checkResource(final GetResponse response) {
+            final String index = response.getIndex();
+            final String type = response.getType();
+            final String id = response.getId();
+
+            if (response.isExists() == false) {
+                throw new ResourceNotFoundException("Document not found [" + index + "]/[" + type + "]/[" + id + "]");
+            } else if (response.isSourceEmpty()) {
+                throw new ResourceNotFoundException("Source not found [" + index + "]/[" + type + "]/[" + id + "]");
             }
         }
     }

diff --git a/server/src/test/java/org/elasticsearch/rest/action/document/RestGetSourceActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/document/RestGetSourceActionTests.java
@@ -51,29 +51,27 @@ public static void cleanupReferences() {
 
     public void testRestGetSourceAction() throws Exception {
         final BytesReference source = new BytesArray("{\"foo\": \"bar\"}");
-        final GetResponse getResponse = new GetResponse(new GetResult("index1", "_doc", "1", -1, true, source, emptyMap()));
+        final GetResponse response = new GetResponse(new GetResult("index1", "_doc", "1", -1, true, source, emptyMap()));
 
-        final RestResponse restResponse = listener.buildResponse(getResponse);
+        final RestResponse restResponse = listener.buildResponse(response);
 
         assertThat(restResponse.status(), equalTo(OK));
         assertThat(restResponse.contentType(), equalTo("application/json; charset=UTF-8"));
         assertThat(restResponse.content(), equalTo(new BytesArray("{\"foo\": \"bar\"}")));
     }
 
     public void testRestGetSourceActionWithMissingDocument() {
-        final GetResponse getResponse = new GetResponse(new GetResult("index1", "_doc", "1", -1, false, null, emptyMap()));
+        final GetResponse response = new GetResponse(new GetResult("index1", "_doc", "1", -1, false, null, emptyMap()));
 
-        final ResourceNotFoundException exception = expectThrows(ResourceNotFoundException.class,
-            () -> listener.buildResponse(getResponse));
+        final ResourceNotFoundException exception = expectThrows(ResourceNotFoundException.class, () -> listener.buildResponse(response));
 
         assertThat(exception.getMessage(), equalTo("Document not found [index1]/[_doc]/[1]"));
     }
 
     public void testRestGetSourceActionWithMissingDocumentSource() {
-        final GetResponse getResponse = new GetResponse(new GetResult("index1", "_doc", "1", -1, true, null, emptyMap()));
+        final GetResponse response = new GetResponse(new GetResult("index1", "_doc", "1", -1, true, null, emptyMap()));
 
-        final ResourceNotFoundException exception = expectThrows(ResourceNotFoundException.class,
-            () -> listener.buildResponse(getResponse));
+        final ResourceNotFoundException exception = expectThrows(ResourceNotFoundException.class, () -> listener.buildResponse(response));
 
         assertThat(exception.getMessage(), equalTo("Source not found [index1]/[_doc]/[1]"));
     }