Skip to content

Commit dc99843

Browse files
dadoonetdadoonet
committed
refactoring getter/setters for package action.admin.indices.validate.query #2657 
1 parent f3d7acd commit dc99843

File tree

6 files changed

+54
-84
lines changed

6 files changed

+54
-84
lines changed

‎src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java

+4-20
Original file line numberDiff line numberDiff line change
@@ -49,36 +49,20 @@ public QueryExplanation(String index, boolean valid, String explanation, String
4949
this.error = error;
5050
}
5151

52-
public String index() {
53-
return this.index;
54-
}
55-
5652
public String getIndex() {
57-
return index();
53+
return this.index;
5854
}
5955

60-
public boolean valid() {
56+
public boolean isValid() {
6157
return this.valid;
6258
}
6359

64-
public boolean getValid() {
65-
return valid();
66-
}
67-
68-
public String error() {
69-
return this.error;
70-
}
71-
7260
public String getError() {
73-
return error();
74-
}
75-
76-
public String explanation() {
77-
return this.explanation;
61+
return this.error;
7862
}
7963

8064
public String getExplanation() {
81-
return explanation();
65+
return this.explanation;
8266
}
8367

8468
@Override

‎src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public ShardValidateQueryResponse(String index, int shardId, boolean valid, Stri
4949
this.error = error;
5050
}
5151

52-
public boolean valid() {
52+
public boolean isValid() {
5353
return this.valid;
5454
}
5555

56-
public String explanation() {
56+
public String getExplanation() {
5757
return explanation;
5858
}
5959

60-
public String error() {
60+
public String getError() {
6161
return error;
6262
}
6363

‎src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,16 @@ protected ValidateQueryResponse newResponse(ValidateQueryRequest request, Atomic
135135
shardFailures.add(new DefaultShardOperationFailedException((BroadcastShardOperationFailedException) shardResponse));
136136
} else {
137137
ShardValidateQueryResponse validateQueryResponse = (ShardValidateQueryResponse) shardResponse;
138-
valid = valid && validateQueryResponse.valid();
138+
valid = valid && validateQueryResponse.isValid();
139139
if (request.explain()) {
140140
if (queryExplanations == null) {
141141
queryExplanations = newArrayList();
142142
}
143143
queryExplanations.add(new QueryExplanation(
144144
validateQueryResponse.index(),
145-
validateQueryResponse.valid(),
146-
validateQueryResponse.explanation(),
147-
validateQueryResponse.error()
145+
validateQueryResponse.isValid(),
146+
validateQueryResponse.getExplanation(),
147+
validateQueryResponse.getError()
148148
));
149149
}
150150
successfulShards++;

‎src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java

+2-16
Original file line numberDiff line numberDiff line change
@@ -58,34 +58,20 @@ public class ValidateQueryResponse extends BroadcastOperationResponse {
5858
/**
5959
* A boolean denoting whether the query is valid.
6060
*/
61-
public boolean valid() {
62-
return valid;
63-
}
64-
65-
/**
66-
* A boolean denoting whether the query is valid.
67-
*/
68-
public boolean getValid() {
61+
public boolean isValid() {
6962
return valid;
7063
}
7164

7265
/**
7366
* The list of query explanations.
7467
*/
75-
public List<? extends QueryExplanation> queryExplanations() {
68+
public List<? extends QueryExplanation> getQueryExplanation() {
7669
if (queryExplanations == null) {
7770
return ImmutableList.of();
7871
}
7972
return queryExplanations;
8073
}
8174

82-
/**
83-
* The list of query explanations.
84-
*/
85-
public List<QueryExplanation> getQueryExplanation() {
86-
return queryExplanations;
87-
}
88-
8975
@Override
9076
public void readFrom(StreamInput in) throws IOException {
9177
super.readFrom(in);

‎src/main/java/org/elasticsearch/rest/action/admin/indices/validate/query/RestValidateQueryAction.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,23 @@ public void onResponse(ValidateQueryResponse response) {
108108
try {
109109
XContentBuilder builder = RestXContentBuilder.restContentBuilder(request);
110110
builder.startObject();
111-
builder.field("valid", response.valid());
111+
builder.field("valid", response.isValid());
112112

113113
buildBroadcastShardsHeader(builder, response);
114114

115-
if (response.queryExplanations() != null && !response.queryExplanations().isEmpty()) {
115+
if (response.getQueryExplanation() != null && !response.getQueryExplanation().isEmpty()) {
116116
builder.startArray("explanations");
117-
for (QueryExplanation explanation : response.queryExplanations()) {
117+
for (QueryExplanation explanation : response.getQueryExplanation()) {
118118
builder.startObject();
119-
if (explanation.index() != null) {
120-
builder.field("index", explanation.index(), XContentBuilder.FieldCaseConversion.NONE);
119+
if (explanation.getIndex() != null) {
120+
builder.field("index", explanation.getIndex(), XContentBuilder.FieldCaseConversion.NONE);
121121
}
122-
builder.field("valid", explanation.valid());
123-
if (explanation.error() != null) {
124-
builder.field("error", explanation.error());
122+
builder.field("valid", explanation.isValid());
123+
if (explanation.getError() != null) {
124+
builder.field("error", explanation.getError());
125125
}
126-
if (explanation.explanation() != null) {
127-
builder.field("explanation", explanation.explanation());
126+
if (explanation.getExplanation() != null) {
127+
builder.field("explanation", explanation.getExplanation());
128128
}
129129
builder.endObject();
130130
}

‎src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java

+31-31
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ public void simpleValidateQuery() throws Exception {
7878

7979
client.admin().indices().prepareRefresh().execute().actionGet();
8080

81-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery("foo".getBytes()).execute().actionGet().valid(), equalTo(false));
82-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("_id:1")).execute().actionGet().valid(), equalTo(true));
83-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("_i:d:1")).execute().actionGet().valid(), equalTo(false));
81+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery("foo".getBytes()).execute().actionGet().isValid(), equalTo(false));
82+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("_id:1")).execute().actionGet().isValid(), equalTo(true));
83+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("_i:d:1")).execute().actionGet().isValid(), equalTo(false));
8484

85-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("foo:1")).execute().actionGet().valid(), equalTo(true));
86-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("bar:hey")).execute().actionGet().valid(), equalTo(false));
85+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("foo:1")).execute().actionGet().isValid(), equalTo(true));
86+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("bar:hey")).execute().actionGet().isValid(), equalTo(false));
8787

88-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("nonexistent:hello")).execute().actionGet().valid(), equalTo(true));
88+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("nonexistent:hello")).execute().actionGet().isValid(), equalTo(true));
8989

90-
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("foo:1 AND")).execute().actionGet().valid(), equalTo(false));
90+
assertThat(client.admin().indices().prepareValidateQuery("test").setQuery(QueryBuilders.queryString("foo:1 AND")).execute().actionGet().isValid(), equalTo(false));
9191
}
9292

9393
@Test
@@ -121,10 +121,10 @@ public void explainValidateQuery() throws Exception {
121121
.setQuery("foo".getBytes())
122122
.setExplain(true)
123123
.execute().actionGet();
124-
assertThat(response.valid(), equalTo(false));
125-
assertThat(response.queryExplanations().size(), equalTo(1));
126-
assertThat(response.queryExplanations().get(0).error(), containsString("Failed to parse"));
127-
assertThat(response.queryExplanations().get(0).explanation(), nullValue());
124+
assertThat(response.isValid(), equalTo(false));
125+
assertThat(response.getQueryExplanation().size(), equalTo(1));
126+
assertThat(response.getQueryExplanation().get(0).getError(), containsString("Failed to parse"));
127+
assertThat(response.getQueryExplanation().get(0).getExplanation(), nullValue());
128128

129129
assertExplanation(QueryBuilders.queryString("_id:1"), equalTo("ConstantScore(_uid:type1#1)"));
130130

@@ -227,37 +227,37 @@ public void explainValidateQueryTwoNodes() throws IOException {
227227
.setQuery("foo".getBytes())
228228
.setExplain(true)
229229
.execute().actionGet();
230-
assertThat(response.valid(), equalTo(false));
231-
assertThat(response.queryExplanations().size(), equalTo(1));
232-
assertThat(response.queryExplanations().get(0).error(), containsString("Failed to parse"));
233-
assertThat(response.queryExplanations().get(0).explanation(), nullValue());
230+
assertThat(response.isValid(), equalTo(false));
231+
assertThat(response.getQueryExplanation().size(), equalTo(1));
232+
assertThat(response.getQueryExplanation().get(0).getError(), containsString("Failed to parse"));
233+
assertThat(response.getQueryExplanation().get(0).getExplanation(), nullValue());
234234

235235
response = client("node2").admin().indices().prepareValidateQuery("test")
236236
.setQuery("foo".getBytes())
237237
.setExplain(true)
238238
.execute().actionGet();
239-
assertThat(response.valid(), equalTo(false));
240-
assertThat(response.queryExplanations().size(), equalTo(1));
241-
assertThat(response.queryExplanations().get(0).error(), containsString("Failed to parse"));
242-
assertThat(response.queryExplanations().get(0).explanation(), nullValue());
239+
assertThat(response.isValid(), equalTo(false));
240+
assertThat(response.getQueryExplanation().size(), equalTo(1));
241+
assertThat(response.getQueryExplanation().get(0).getError(), containsString("Failed to parse"));
242+
assertThat(response.getQueryExplanation().get(0).getExplanation(), nullValue());
243243

244244
response = client("node1").admin().indices().prepareValidateQuery("test")
245245
.setQuery(QueryBuilders.queryString("foo"))
246246
.setExplain(true)
247247
.execute().actionGet();
248-
assertThat(response.valid(), equalTo(true));
249-
assertThat(response.queryExplanations().size(), equalTo(1));
250-
assertThat(response.queryExplanations().get(0).explanation(), equalTo("_all:foo"));
251-
assertThat(response.queryExplanations().get(0).error(), nullValue());
248+
assertThat(response.isValid(), equalTo(true));
249+
assertThat(response.getQueryExplanation().size(), equalTo(1));
250+
assertThat(response.getQueryExplanation().get(0).getExplanation(), equalTo("_all:foo"));
251+
assertThat(response.getQueryExplanation().get(0).getError(), nullValue());
252252

253253
response = client("node2").admin().indices().prepareValidateQuery("test")
254254
.setQuery(QueryBuilders.queryString("foo"))
255255
.setExplain(true)
256256
.execute().actionGet();
257-
assertThat(response.valid(), equalTo(true));
258-
assertThat(response.queryExplanations().size(), equalTo(1));
259-
assertThat(response.queryExplanations().get(0).explanation(), equalTo("_all:foo"));
260-
assertThat(response.queryExplanations().get(0).error(), nullValue());
257+
assertThat(response.isValid(), equalTo(true));
258+
assertThat(response.getQueryExplanation().size(), equalTo(1));
259+
assertThat(response.getQueryExplanation().get(0).getExplanation(), equalTo("_all:foo"));
260+
assertThat(response.getQueryExplanation().get(0).getError(), nullValue());
261261
}
262262

263263

@@ -267,10 +267,10 @@ private void assertExplanation(QueryBuilder queryBuilder, Matcher<String> matche
267267
.setQuery(queryBuilder)
268268
.setExplain(true)
269269
.execute().actionGet();
270-
assertThat(response.queryExplanations().size(), equalTo(1));
271-
assertThat(response.queryExplanations().get(0).error(), nullValue());
272-
assertThat(response.queryExplanations().get(0).explanation(), matcher);
273-
assertThat(response.valid(), equalTo(true));
270+
assertThat(response.getQueryExplanation().size(), equalTo(1));
271+
assertThat(response.getQueryExplanation().get(0).getError(), nullValue());
272+
assertThat(response.getQueryExplanation().get(0).getExplanation(), matcher);
273+
assertThat(response.isValid(), equalTo(true));
274274
}
275275

276276
}

0 commit comments

Comments
 (0)