refactoring getter/setters for package action.admin.indices.analyze #2657

Author: dadoonet

src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java

@@ -54,40 +54,20 @@ public AnalyzeToken(String term, int position, int startOffset, int endOffset, S
             this.type = type;
         }
 
-        public String term() {
-            return this.term;
-        }
-
         public String getTerm() {
-            return term();
-        }
-
-        public int startOffset() {
-            return this.startOffset;
+            return this.term;
         }
 
         public int getStartOffset() {
-            return startOffset();
-        }
-
-        public int endOffset() {
-            return this.endOffset;
+            return this.startOffset;
         }
 
         public int getEndOffset() {
-            return endOffset();
-        }
-
-        public int position() {
-            return this.position;
+            return this.endOffset;
         }
 
         public int getPosition() {
-            return position();
-        }
-
-        public String type() {
-            return this.type;
+            return this.position;
         }
 
         public String getType() {
@@ -128,12 +108,8 @@ public AnalyzeResponse(List<AnalyzeToken> tokens) {
         this.tokens = tokens;
     }
 
-    public List<AnalyzeToken> tokens() {
-        return this.tokens;
-    }
-
     public List<AnalyzeToken> getTokens() {
-        return tokens();
+        return this.tokens;
     }
 
     @Override
@@ -148,28 +124,28 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.startArray("tokens");
             for (AnalyzeToken token : tokens) {
                 builder.startObject();
-                builder.field("token", token.term());
-                builder.field("start_offset", token.startOffset());
-                builder.field("end_offset", token.endOffset());
-                builder.field("type", token.type());
-                builder.field("position", token.position());
+                builder.field("token", token.getTerm());
+                builder.field("start_offset", token.getStartOffset());
+                builder.field("end_offset", token.getEndOffset());
+                builder.field("type", token.getType());
+                builder.field("position", token.getPosition());
                 builder.endObject();
             }
             builder.endArray();
         } else if ("text".equals(format)) {
             StringBuilder sb = new StringBuilder();
             int lastPosition = 0;
             for (AnalyzeToken token : tokens) {
-                if (lastPosition != token.position()) {
+                if (lastPosition != token.getPosition()) {
                     if (lastPosition != 0) {
-                        sb.append("\n").append(token.position()).append(": \n");
+                        sb.append("\n").append(token.getPosition()).append(": \n");
                     }
-                    lastPosition = token.position();
+                    lastPosition = token.getPosition();
                 }
                 sb.append('[')
-                        .append(token.term()).append(":")
-                        .append(token.startOffset()).append("->").append(token.endOffset()).append(":")
-                        .append(token.type())
+                        .append(token.getTerm()).append(":")
+                        .append(token.getStartOffset()).append("->").append(token.getEndOffset()).append(":")
+                        .append(token.getType())
                         .append("]\n");
             }
             builder.field("tokens", sb);

src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java

@@ -67,11 +67,11 @@ public void simpleAnalyzerTests() throws Exception {
 
         for (int i = 0; i < 10; i++) {
             AnalyzeResponse analyzeResponse = client.admin().indices().prepareAnalyze("test", "this is a test").execute().actionGet();
-            assertThat(analyzeResponse.tokens().size(), equalTo(1));
-            AnalyzeResponse.AnalyzeToken token = analyzeResponse.tokens().get(0);
-            assertThat(token.term(), equalTo("test"));
-            assertThat(token.startOffset(), equalTo(10));
-            assertThat(token.endOffset(), equalTo(14));
+            assertThat(analyzeResponse.getTokens().size(), equalTo(1));
+            AnalyzeResponse.AnalyzeToken token = analyzeResponse.getTokens().get(0);
+            assertThat(token.getTerm(), equalTo("test"));
+            assertThat(token.getStartOffset(), equalTo(10));
+            assertThat(token.getEndOffset(), equalTo(14));
         }
     }
 
@@ -80,11 +80,11 @@ public void analyzeWithNoIndex() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
         AnalyzeResponse analyzeResponse = client.admin().indices().prepareAnalyze("THIS IS A TEST").setAnalyzer("simple").execute().actionGet();
-        assertThat(analyzeResponse.tokens().size(), equalTo(4));
+        assertThat(analyzeResponse.getTokens().size(), equalTo(4));
 
         analyzeResponse = client.admin().indices().prepareAnalyze("THIS IS A TEST").setTokenizer("keyword").setTokenFilters("lowercase").execute().actionGet();
-        assertThat(analyzeResponse.tokens().size(), equalTo(1));
-        assertThat(analyzeResponse.tokens().get(0).term(), equalTo("this is a test"));
+        assertThat(analyzeResponse.getTokens().size(), equalTo(1));
+        assertThat(analyzeResponse.getTokens().get(0).getTerm(), equalTo("this is a test"));
     }
 
     @Test
@@ -112,11 +112,11 @@ public void analyzerWithFieldOrTypeTests() throws Exception {
             final AnalyzeRequestBuilder requestBuilder = client.admin().indices().prepareAnalyze("test", "THIS IS A TEST");
             requestBuilder.setField("document.simple");
             AnalyzeResponse analyzeResponse = requestBuilder.execute().actionGet();
-            assertThat(analyzeResponse.tokens().size(), equalTo(4));
-            AnalyzeResponse.AnalyzeToken token = analyzeResponse.tokens().get(3);
-            assertThat(token.term(), equalTo("test"));
-            assertThat(token.startOffset(), equalTo(10));
-            assertThat(token.endOffset(), equalTo(14));
+            assertThat(analyzeResponse.getTokens().size(), equalTo(4));
+            AnalyzeResponse.AnalyzeToken token = analyzeResponse.getTokens().get(3);
+            assertThat(token.getTerm(), equalTo("test"));
+            assertThat(token.getStartOffset(), equalTo(10));
+            assertThat(token.getEndOffset(), equalTo(14));
         }
     }
 }