Skip to content

Commit 1580fc7

Browse files
authored
Minor FlatObjectFieldMapper fix (elastic#62633)
The splitQueriesOnWhitespace instance field can be made final, and setter and getter are not always needed.
1 parent 00272ea commit 1580fc7

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserCont
227227
*/
228228
public static final class KeyedFlatObjectFieldType extends StringFieldType {
229229
private final String key;
230-
private boolean splitQueriesOnWhitespace;
231230

232231
public KeyedFlatObjectFieldType(String name, boolean indexed, boolean hasDocValues, String key,
233232
boolean splitQueriesOnWhitespace, Map<String, String> meta) {
@@ -236,7 +235,6 @@ public KeyedFlatObjectFieldType(String name, boolean indexed, boolean hasDocValu
236235
meta);
237236
setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
238237
this.key = key;
239-
this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
240238
}
241239

242240
private KeyedFlatObjectFieldType(String name, String key, RootFlatObjectFieldType ref) {
@@ -252,14 +250,6 @@ public String key() {
252250
return key;
253251
}
254252

255-
public boolean splitQueriesOnWhitespace() {
256-
return splitQueriesOnWhitespace;
257-
}
258-
259-
public void setSplitQueriesOnWhitespace(boolean splitQueriesOnWhitespace) {
260-
this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
261-
}
262-
263253
@Override
264254
public Query existsQuery(QueryShardContext context) {
265255
Term term = new Term(name(), FlatObjectFieldParser.createKeyedValue(key, ""));
@@ -438,7 +428,7 @@ public IndexFieldData<?> build(IndexFieldDataCache cache, CircuitBreakerService
438428
* searches on the flat object field itself, e.g. 'my_flat_object: some_value'.
439429
*/
440430
public static final class RootFlatObjectFieldType extends StringFieldType {
441-
private boolean splitQueriesOnWhitespace;
431+
private final boolean splitQueriesOnWhitespace;
442432

443433
public RootFlatObjectFieldType(String name, boolean indexed, boolean hasDocValues, Map<String, String> meta,
444434
boolean splitQueriesOnWhitespace) {
@@ -453,14 +443,6 @@ public String typeName() {
453443
return CONTENT_TYPE;
454444
}
455445

456-
public boolean splitQueriesOnWhitespace() {
457-
return splitQueriesOnWhitespace;
458-
}
459-
460-
public void setSplitQueriesOnWhitespace(boolean splitQueriesOnWhitespace) {
461-
this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
462-
}
463-
464446
@Override
465447
public Object valueForDisplay(Object value) {
466448
if (value == null) {
@@ -596,8 +578,8 @@ protected void doXContentBody(XContentBuilder builder, boolean includeDefaults,
596578
builder.field("null_value", nullValue);
597579
}
598580

599-
if (includeDefaults || fieldType().splitQueriesOnWhitespace()) {
600-
builder.field("split_queries_on_whitespace", fieldType().splitQueriesOnWhitespace());
581+
if (includeDefaults || fieldType().splitQueriesOnWhitespace) {
582+
builder.field("split_queries_on_whitespace", fieldType().splitQueriesOnWhitespace);
601583
}
602584
}
603585
}

0 commit comments

Comments
 (0)