From ecb01c15b9a6645f22f153eb099a377e70e398c8 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Wed, 8 Feb 2017 14:40:08 +0100 Subject: Fold InternalSearchHits and friends into their interfaces (#23042) We have a bunch of interfaces that have only a single implementation for 6 years now. These interfaces are pretty useless from a SW development perspective and only add unnecessary abstractions. They also require lots of casting in many places where we expect that there is only one concrete implementation. This change removes the interfaces, makes all of the classes final and removes the duplicate `foo` `getFoo` accessors in favor of `getFoo` from these classes. --- .../test/java/org/elasticsearch/versioning/SimpleVersioningIT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/test/java/org/elasticsearch/versioning') diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java index ccb392be1f..cfaf9203fe 100644 --- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -237,13 +237,13 @@ public class SimpleVersioningIT extends ESIntegTestCase { // search with versioning for (int i = 0; i < 10; i++) { SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setVersion(true).execute().actionGet(); - assertThat(searchResponse.getHits().getAt(0).version(), equalTo(2L)); + assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(2L)); } // search without versioning for (int i = 0; i < 10; i++) { SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).execute().actionGet(); - assertThat(searchResponse.getHits().getAt(0).version(), equalTo(Versions.NOT_FOUND)); + assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(Versions.NOT_FOUND)); } DeleteResponse deleteResponse = client().prepareDelete("test", "type", "1").setVersion(2).execute().actionGet(); @@ -293,7 +293,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { for (int i = 0; i < 10; i++) { SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setVersion(true).execute().actionGet(); - assertThat(searchResponse.getHits().getAt(0).version(), equalTo(2L)); + assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(2L)); } } -- cgit v1.2.3