From df5d22c7d7a5f50ba8f63e90d4678375ffe976b1 Mon Sep 17 00:00:00 2001 From: Cristiano Fontes Date: Wed, 27 Aug 2014 15:45:32 +0800 Subject: [PATCH] Internal: Removing unused methods/parameters. Close #7474 --- .../mapper/core/CompletionFieldMapper.java | 2 +- .../index/mapper/core/DateFieldMapper.java | 2 +- .../index/mapper/core/StringFieldMapper.java | 2 +- .../index/mapper/core/TypeParsers.java | 16 +++------------- .../index/mapper/geo/GeoPointFieldMapper.java | 2 +- .../mapper/internal/TimestampFieldMapper.java | 2 +- .../index/mapper/object/ObjectMapper.java | 19 ------------------- .../index/mapper/object/RootObjectMapper.java | 4 ++-- .../mapper/externalvalues/ExternalMapper.java | 2 +- 9 files changed, 11 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java index db867b41093..da2fa61f12d 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java @@ -170,7 +170,7 @@ public class CompletionFieldMapper extends AbstractFieldMapper { } else if (Fields.MAX_INPUT_LENGTH.match(fieldName)) { builder.maxInputLength(Integer.parseInt(fieldNode.toString())); } else if ("fields".equals(fieldName) || "path".equals(fieldName)) { - parseMultiField(builder, name, node, parserContext, fieldName, fieldNode); + parseMultiField(builder, name, parserContext, fieldName, fieldNode); } else if (fieldName.equals(Fields.CONTEXT)) { builder.contextMapping(ContextBuilder.loadMappings(fieldNode)); } else { diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java index a937e52a797..fdf14cb6ac5 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java @@ -153,7 +153,7 @@ public class DateFieldMapper extends NumberFieldMapper { if (propName.equals("null_value")) { builder.nullValue(propNode.toString()); } else if (propName.equals("format")) { - builder.dateTimeFormatter(parseDateTimeFormatter(propName, propNode)); + builder.dateTimeFormatter(parseDateTimeFormatter(propNode)); } else if (propName.equals("numeric_resolution")) { builder.timeUnit(TimeUnit.valueOf(propNode.toString().toUpperCase(Locale.ROOT))); } else if (propName.equals("locale")) { diff --git a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java index b8b5b65907a..2db2485f594 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java @@ -178,7 +178,7 @@ public class StringFieldMapper extends AbstractFieldMapper implements Al } else if (propName.equals("ignore_above")) { builder.ignoreAbove(XContentMapValues.nodeIntegerValue(propNode, -1)); } else { - parseMultiField(builder, name, node, parserContext, propName, propNode); + parseMultiField(builder, name, parserContext, propName, propNode); } } return builder; diff --git a/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java b/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java index c6cf49f2a8a..fcbe033c2db 100644 --- a/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java +++ b/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java @@ -154,7 +154,7 @@ public class TypeParsers { } else if (propName.equals("similarity")) { builder.similarity(parserContext.similarityLookupService().similarity(propNode.toString())); } else { - parseMultiField(builder, name, numberNode, parserContext, propName, propNode); + parseMultiField(builder, name, parserContext, propName, propNode); } } } @@ -245,7 +245,7 @@ public class TypeParsers { } } - public static void parseMultiField(AbstractFieldMapper.Builder builder, String name, Map node, Mapper.TypeParser.ParserContext parserContext, String propName, Object propNode) { + public static void parseMultiField(AbstractFieldMapper.Builder builder, String name, Mapper.TypeParser.ParserContext parserContext, String propName, Object propNode) { if (propName.equals("path")) { builder.multiFieldPathType(parsePathType(name, propNode.toString())); } else if (propName.equals("fields")) { @@ -301,7 +301,7 @@ public class TypeParsers { } } - public static FormatDateTimeFormatter parseDateTimeFormatter(String fieldName, Object node) { + public static FormatDateTimeFormatter parseDateTimeFormatter(Object node) { return Joda.forPattern(node.toString()); } @@ -345,16 +345,6 @@ public class TypeParsers { } } - public static boolean parseDocValues(String docValues) { - if ("no".equals(docValues)) { - return false; - } else if ("yes".equals(docValues)) { - return true; - } else { - return nodeBooleanValue(docValues); - } - } - public static boolean parseStore(String fieldName, String store) throws MapperParsingException { if ("no".equals(store)) { return false; diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java index 964207189be..fe7a39351bf 100644 --- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java @@ -245,7 +245,7 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implement } else if (fieldName.equals("normalize_lon")) { builder.normalizeLon = XContentMapValues.nodeBooleanValue(fieldNode); } else { - parseMultiField(builder, name, node, parserContext, fieldName, fieldNode); + parseMultiField(builder, name, parserContext, fieldName, fieldNode); } } return builder; diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java index aa42ee93831..301c38d5123 100644 --- a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java @@ -130,7 +130,7 @@ public class TimestampFieldMapper extends DateFieldMapper implements InternalMap } else if (fieldName.equals("path")) { builder.path(fieldNode.toString()); } else if (fieldName.equals("format")) { - builder.dateTimeFormatter(parseDateTimeFormatter(builder.name(), fieldNode.toString())); + builder.dateTimeFormatter(parseDateTimeFormatter(fieldNode.toString())); } else if (fieldName.equals("default")) { builder.defaultTimestamp(fieldNode == null ? null : fieldNode.toString()); } diff --git a/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java b/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java index e8ad3d454a3..19da8f1122d 100644 --- a/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java @@ -422,10 +422,6 @@ public class ObjectMapper implements Mapper, AllFieldMapper.IncludeInAll { return this.fullPath; } - public BytesRef nestedTypePathAsBytes() { - return nestedTypePathAsBytes; - } - public String nestedTypePathAsString() { return nestedTypePathAsString; } @@ -798,21 +794,6 @@ public class ObjectMapper implements Mapper, AllFieldMapper.IncludeInAll { } } } - // DON'T do automatic ip detection logic, since it messes up with docs that have hosts and ips - // check if its an ip -// if (!resolved && text.indexOf('.') != -1) { -// try { -// IpFieldMapper.ipToLong(text); -// XContentMapper.Builder builder = context.root().findTemplateBuilder(context, currentFieldName, "ip"); -// if (builder == null) { -// builder = ipField(currentFieldName); -// } -// mapper = builder.build(builderContext); -// resolved = true; -// } catch (Exception e) { -// // failure to parse, not ip... -// } -// } if (!resolved) { Mapper.Builder builder = context.root().findTemplateBuilder(context, currentFieldName, "string"); if (builder == null) { diff --git a/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java b/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java index 53944a4d0d7..d895c628aee 100644 --- a/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java +++ b/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java @@ -146,12 +146,12 @@ public class RootObjectMapper extends ObjectMapper { List dateTimeFormatters = newArrayList(); if (fieldNode instanceof List) { for (Object node1 : (List) fieldNode) { - dateTimeFormatters.add(parseDateTimeFormatter(fieldName, node1)); + dateTimeFormatters.add(parseDateTimeFormatter(node1)); } } else if ("none".equals(fieldNode.toString())) { dateTimeFormatters = null; } else { - dateTimeFormatters.add(parseDateTimeFormatter(fieldName, fieldNode)); + dateTimeFormatters.add(parseDateTimeFormatter(fieldNode)); } if (dateTimeFormatters == null) { ((Builder) builder).noDynamicDateTimeFormatter(); diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java b/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java index 9604709d376..4e75706ddce 100755 --- a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java +++ b/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java @@ -131,7 +131,7 @@ public class ExternalMapper extends AbstractFieldMapper { String propName = Strings.toUnderscoreCase(entry.getKey()); Object propNode = entry.getValue(); - parseMultiField(builder, name, node, parserContext, propName, propNode); + parseMultiField(builder, name, parserContext, propName, propNode); } return builder;