Skip to content

Commit 2be290d

Browse files
committed
Remove minor code duplication around parsing the 'norms' mapping.
1 parent 2cedeb5 commit 2be290d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public Mapper.Builder<?,?> parse(String name, Map<String, Object> node, ParserCo
167167
builder.ignoreAbove(XContentMapValues.nodeIntegerValue(propNode, -1));
168168
iterator.remove();
169169
} else if (propName.equals("norms")) {
170-
builder.omitNorms(XContentMapValues.nodeBooleanValue(propNode, "norms") == false);
170+
TypeParsers.parseNorms(builder, name, propNode);
171171
iterator.remove();
172172
} else if (propName.equals("eager_global_ordinals")) {
173173
builder.eagerGlobalOrdinals(XContentMapValues.nodeBooleanValue(propNode, "eager_global_ordinals"));

server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ private static void parseAnalyzersAndTermVectors(FieldMapper.Builder builder, St
122122
}
123123
}
124124

125-
public static void parseNorms(FieldMapper.Builder builder, String fieldName, Object propNode,
126-
Mapper.TypeParser.ParserContext parserContext) {
125+
public static void parseNorms(FieldMapper.Builder builder, String fieldName, Object propNode) {
127126
builder.omitNorms(XContentMapValues.nodeBooleanValue(propNode, fieldName + ".norms") == false);
128127
}
129128

@@ -140,7 +139,7 @@ public static void parseTextField(FieldMapper.Builder builder, String name, Map<
140139
final String propName = entry.getKey();
141140
final Object propNode = entry.getValue();
142141
if ("norms".equals(propName)) {
143-
parseNorms(builder, name, propNode, parserContext);
142+
parseNorms(builder, name, propNode);
144143
iterator.remove();
145144
}
146145
}

0 commit comments

Comments
 (0)