Refactoring response status check to close issue VanRoy#27

Author: VanRoy

spring-data-jest/src/main/java/com/github/vanroy/springdata/jest/JestElasticsearchTemplate.java

@@ -206,8 +206,7 @@ public <T> boolean createIndex(Class<T> clazz) {
 
 	@Override
 	public boolean createIndex(String indexName) {
-		JestResult result = execute(new CreateIndex.Builder(indexName).build());
-		return result.isSucceeded();
+		return executeWithAcknowledge(new CreateIndex.Builder(indexName).build());
 	}
 
 	@Override
@@ -392,7 +391,7 @@ public <T> T queryForObject(String indexName, GetQuery query, Class<T> clazz, Je
 
 		Get.Builder build = new Get.Builder(index, query.getId()).type(persistentEntity.getIndexType());
 
-		DocumentResult result = execute(build.build());
+		DocumentResult result = execute(build.build(), true);
 
 		return mapper.mapResult(result, clazz);
 	}
@@ -750,7 +749,7 @@ public void bulkUpdate(List<UpdateQuery> queries) {
 
 	@Override
 	public String delete(String indexName, String type, String id) {
-		return execute(new Delete.Builder(id).index(indexName).type(type).build()).getId();
+		return execute(new Delete.Builder(id).index(indexName).type(type).build(), true).getId();
 	}
 
 	@Override
@@ -960,13 +959,13 @@ public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResult
 
 	@Override
 	public <T> void clearScroll(String scrollId) {
-		execute(new ClearScroll.Builder().addScrollId(scrollId).build());
+		execute(new ClearScroll.Builder().addScrollId(scrollId).build(), true);
 	}
 
 	public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, JestScrollResultMapper mapper) {
 		SearchScroll scroll = new SearchScroll.Builder(scrollId, scrollTimeInMillis + "ms").build();
 
-		SearchScrollResult response = new SearchScrollResult(execute(scroll));
+		SearchScrollResult response = new SearchScrollResult(execute(scroll, true));
 
 		return mapper.mapResults(response, null);
 	}
@@ -1082,14 +1081,18 @@ public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
 	}
 
 	private <T extends JestResult> T execute(Action<T> action) {
+		return execute(action, false);
+	}
+
+	private <T extends JestResult> T execute(Action<T> action, boolean acceptNotFound) {
 		try {
 
 			T result = client.execute(action);
 			if (!result.isSucceeded()) {
 
 				String errorMessage = String.format("Cannot execute jest action , response code : %s , error : %s , message : %s", result.getResponseCode(), result.getErrorMessage(), getMessage(result));
 
-				if(isSuccessfulResponse(result.getResponseCode())) {
+				if(acceptNotFound && isSuccessfulResponse(result.getResponseCode())) {
 					logger.debug(errorMessage);
 				} else {
 					logger.error(errorMessage);
@@ -1105,7 +1108,7 @@ private <T extends JestResult> T execute(Action<T> action) {
 	}
 
 	private boolean executeWithAcknowledge(Action<?> action) {
-		return execute(action).isSucceeded();
+		return execute(action, true).isSucceeded();
 	}
 
 	private <T> SearchSourceBuilder prepareSearch(Query query, Class<T> clazz) {

spring-data-jest/src/test/java/com/github/vanroy/springdata/jest/JestElasticsearchTemplateTests.java

@@ -281,6 +281,14 @@ public <T> LinkedList<T> mapResults(MultiDocumentResult responses, Class<T> claz
 		assertThat(sampleEntities.size(), is(equalTo(2)));
 	}
 
+	@Test(expected = ElasticsearchException.class)
+	public void shouldThrowExceptionForInvalidSearchQuery() {
+		// given
+		SearchQuery searchQuery = new NativeSearchQueryBuilder().withIndices("inexisting_index").withQuery(matchAllQuery()).build();
+		// when
+		Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
+	}
+
 	@Test
 	public void shouldReturnPageForGivenSearchQuery() {
 		// given
@@ -1105,11 +1113,11 @@ public void shouldReturnResultsWithScanAndScrollForGivenSearchQueryAndClass() {
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
 				.withPageable(new PageRequest(0, 10)).build();
 
-		String scrollId = elasticsearchTemplate.scan(searchQuery, 1000, false, SampleEntity.class);
+		String scrollId = elasticsearchTemplate.scan(searchQuery, 30000L, false, SampleEntity.class);
 		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
 		boolean hasRecords = true;
 		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, SampleEntity.class);
+			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 30000L, SampleEntity.class);
 			if (page.hasContent()) {
 				sampleEntities.addAll(page.getContent());
 			} else {