Internal: Removing unused methods/parameters.

Close #7474
elastic · Sep 8, 2014 · 0381cf9 · 0381cf9
1 parent 5c74543
commit 0381cf9
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 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
@@ -171,7 +171,7 @@ public static class TypeParser implements Mapper.TypeParser {
                 } 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
@@ -153,7 +153,7 @@ public static class TypeParser implements Mapper.TypeParser {
                 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
@@ -178,7 +178,7 @@ public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext
                 } 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
@@ -154,7 +154,7 @@ public static void parseNumberField(NumberFieldMapper.Builder builder, String na
             } 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 static void parseField(AbstractFieldMapper.Builder builder, String name,
         }
     }
 
-    public static void parseMultiField(AbstractFieldMapper.Builder builder, String name, Map<String, Object> 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 @@ private static IndexOptions nodeIndexOptionValue(final Object propNode) {
         }
     }
 
-    public static FormatDateTimeFormatter parseDateTimeFormatter(String fieldName, Object node) {
+    public static FormatDateTimeFormatter parseDateTimeFormatter(Object node) {
         return Joda.forPattern(node.toString());
     }
 
@@ -345,16 +345,6 @@ public static void parseIndex(String fieldName, String index, AbstractFieldMappe
         }
     }
 
-    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
@@ -245,7 +245,7 @@ public static class TypeParser implements Mapper.TypeParser {
                 } 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
@@ -130,7 +130,7 @@ public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext
                 } 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
@@ -422,10 +422,6 @@ public String fullPath() {
         return this.fullPath;
     }
 
-    public BytesRef nestedTypePathAsBytes() {
-        return nestedTypePathAsBytes;
-    }
-
     public String nestedTypePathAsString() {
         return nestedTypePathAsString;
     }
@@ -798,21 +794,6 @@ public void parseDynamicValue(final ParseContext context, String currentFieldNam
                             }
                         }
                     }
-                    // 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
@@ -146,12 +146,12 @@ protected boolean processField(ObjectMapper.Builder builder, String fieldName, O
                 List<FormatDateTimeFormatter> 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
@@ -131,7 +131,7 @@ public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext
                 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;