allow for _ separator on top of camel case for mapping definitions

kimchy · kimchy · commit 15bdba30e590 · 2010-04-03T21:07:01.000+03:00
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonBooleanFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonBooleanFieldMapper.java
@@ -103,7 +103,7 @@ public static class TypeParser implements JsonTypeParser {
                 Map.Entry<String, JsonNode> entry = propsIt.next();
                 String propName = entry.getKey();
                 JsonNode propNode = entry.getValue();
-                if (propName.equals("nullValue")) {
+                if (propName.equals("nullValue") || propName.equals("null_value")) {
                     builder.nullValue(nodeBooleanValue(propNode));
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonDateFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonDateFieldMapper.java
@@ -92,7 +92,7 @@ public static class TypeParser implements JsonTypeParser {
                 Map.Entry<String, JsonNode> entry = propsIt.next();
                 String propName = entry.getKey();
                 JsonNode propNode = entry.getValue();
-                if (propName.equals("nullValue")) {
+                if (propName.equals("nullValue") || propName.equals("null_value")) {
                     builder.nullValue(propNode.getValueAsText());
                 } else if (propName.equals("format")) {
                     builder.dateTimeFormatter(parseDateTimeFormatter(propName, propNode));
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonDoubleFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonDoubleFieldMapper.java
@@ -82,7 +82,7 @@ public static class TypeParser implements JsonTypeParser {
                 Map.Entry<String, JsonNode> entry = propsIt.next();
                 String propName = entry.getKey();
                 JsonNode propNode = entry.getValue();
-                if (propName.equals("nullValue")) {
+                if (propName.equals("nullValue") || propName.equals("null_value")) {
                     builder.nullValue(nodeDoubleValue(propNode));
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonFloatFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonFloatFieldMapper.java
@@ -82,7 +82,7 @@ public static class TypeParser implements JsonTypeParser {
                 Map.Entry<String, JsonNode> entry = propsIt.next();
                 String propName = entry.getKey();
                 JsonNode propNode = entry.getValue();
-                if (propName.equals("nullValue")) {
+                if (propName.equals("nullValue") || propName.equals("null_value")) {
                     builder.nullValue(nodeFloatValue(propNode));
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonObjectMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonObjectMapper.java
@@ -169,7 +169,7 @@ public static class TypeParser implements JsonTypeParser {
                     if (!type.equals("object")) {
                         throw new MapperParsingException("Trying to parse an object but has a different type [" + type + "] for [" + name + "]");
                     }
-                } else if (fieldName.equals("dateFormats")) {
+                } else if (fieldName.equals("dateFormats") || fieldName.equals("date_formats")) {
                     List<FormatDateTimeFormatter> dateTimeFormatters = newArrayList();
                     if (fieldNode.isArray()) {
                         for (JsonNode node1 : (ArrayNode) fieldNode) {
@@ -187,11 +187,11 @@ public static class TypeParser implements JsonTypeParser {
                     }
                 } else if (fieldName.equals("enabled")) {
                     builder.enabled(nodeBooleanValue(fieldNode));
-                } else if (fieldName.equals("pathType")) {
+                } else if (fieldName.equals("pathType") || fieldName.equals("path_type")) {
                     builder.pathType(parsePathType(name, fieldNode.getValueAsText()));
                 } else if (fieldName.equals("properties")) {
                     parseProperties(builder, (ObjectNode) fieldNode, parserContext);
-                } else if (fieldName.equals("includeInAll")) {
+                } else if (fieldName.equals("includeInAll") || fieldName.equals("include_in_all")) {
                     builder.includeInAll(nodeBooleanValue(fieldNode));
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonShortFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonShortFieldMapper.java
@@ -82,7 +82,7 @@ public static class TypeParser implements JsonTypeParser {
                 Map.Entry<String, JsonNode> entry = propsIt.next();
                 String propName = entry.getKey();
                 JsonNode propNode = entry.getValue();
-                if (propName.equals("nullValue")) {
+                if (propName.equals("nullValue") || propName.equals("null_value")) {
                     builder.nullValue(nodeShortValue(propNode));
                 }
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonTypeParsers.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonTypeParsers.java
@@ -42,7 +42,7 @@ public static void parseNumberField(JsonNumberFieldMapper.Builder builder, Strin
             Map.Entry<String, JsonNode> entry = propsIt.next();
             String propName = entry.getKey();
             JsonNode propNode = entry.getValue();
-            if (propName.equals("precisionStep")) {
+            if (propName.equals("precisionStep") || propName.equals("precision_step")) {
                 builder.precisionStep(nodeIntegerValue(propNode));
             }
         }
@@ -53,28 +53,28 @@ public static void parseJsonField(JsonFieldMapper.Builder builder, String name,
             Map.Entry<String, JsonNode> entry = propsIt.next();
             String propName = entry.getKey();
             JsonNode propNode = entry.getValue();
-            if (propName.equals("indexName")) {
+            if (propName.equals("indexName") || propName.equals("index_name")) {
                 builder.indexName(propNode.getTextValue());
             } else if (propName.equals("store")) {
                 builder.store(parseStore(name, propNode.getTextValue()));
             } else if (propName.equals("index")) {
                 builder.index(parseIndex(name, propNode.getTextValue()));
-            } else if (propName.equals("termVector")) {
+            } else if (propName.equals("termVector") || propName.equals("term_vector")) {
                 builder.termVector(parseTermVector(name, propNode.getTextValue()));
             } else if (propName.equals("boost")) {
                 builder.boost(nodeFloatValue(propNode));
-            } else if (propName.equals("omitNorms")) {
+            } else if (propName.equals("omitNorms") || propName.equals("omit_norms")) {
                 builder.omitNorms(nodeBooleanValue(propNode));
-            } else if (propName.equals("omitTermFreqAndPositions")) {
+            } else if (propName.equals("omitTermFreqAndPositions") || propName.equals("omit_termFreq_and_positions")) {
                 builder.omitTermFreqAndPositions(nodeBooleanValue(propNode));
-            } else if (propName.equals("indexAnalyzer")) {
+            } else if (propName.equals("indexAnalyzer") || propName.equals("index_analyzer")) {
                 builder.indexAnalyzer(parserContext.analysisService().analyzer(propNode.getTextValue()));
-            } else if (propName.equals("searchAnalyzer")) {
+            } else if (propName.equals("searchAnalyzer") || propName.equals("search_analyzer")) {
                 builder.searchAnalyzer(parserContext.analysisService().analyzer(propNode.getTextValue()));
             } else if (propName.equals("analyzer")) {
                 builder.indexAnalyzer(parserContext.analysisService().analyzer(propNode.getTextValue()));
                 builder.searchAnalyzer(parserContext.analysisService().analyzer(propNode.getTextValue()));
-            } else if (propName.equals("includeInAll")) {
+            } else if (propName.equals("includeInAll") || propName.equals("include_in_all")) {
                 builder.includeInAll(nodeBooleanValue(propNode));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public static class TypeParser implements JsonTypeParser {`
`103`	`103`	`Map.Entry<String, JsonNode> entry = propsIt.next();`
`104`	`104`	`String propName = entry.getKey();`
`105`	`105`	`JsonNode propNode = entry.getValue();`
`106`		`- if (propName.equals("nullValue")) {`
	`106`	`+ if (propName.equals("nullValue") \|\| propName.equals("null_value")) {`
`107`	`107`	`builder.nullValue(nodeBooleanValue(propNode));`
`108`	`108`	`}`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static class TypeParser implements JsonTypeParser {`
`82`	`82`	`Map.Entry<String, JsonNode> entry = propsIt.next();`
`83`	`83`	`String propName = entry.getKey();`
`84`	`84`	`JsonNode propNode = entry.getValue();`
`85`		`- if (propName.equals("nullValue")) {`
	`85`	`+ if (propName.equals("nullValue") \|\| propName.equals("null_value")) {`
`86`	`86`	`builder.nullValue(nodeDoubleValue(propNode));`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public static class TypeParser implements JsonTypeParser {`
`169`	`169`	`if (!type.equals("object")) {`
`170`	`170`	`throw new MapperParsingException("Trying to parse an object but has a different type [" + type + "] for [" + name + "]");`
`171`	`171`	`}`
`172`		`- } else if (fieldName.equals("dateFormats")) {`
	`172`	`+ } else if (fieldName.equals("dateFormats") \|\| fieldName.equals("date_formats")) {`
`173`	`173`	`List<FormatDateTimeFormatter> dateTimeFormatters = newArrayList();`
`174`	`174`	`if (fieldNode.isArray()) {`
`175`	`175`	`for (JsonNode node1 : (ArrayNode) fieldNode) {`
`@@ -187,11 +187,11 @@ public static class TypeParser implements JsonTypeParser {`
`187`	`187`	`}`
`188`	`188`	`} else if (fieldName.equals("enabled")) {`
`189`	`189`	`builder.enabled(nodeBooleanValue(fieldNode));`
`190`		`- } else if (fieldName.equals("pathType")) {`
	`190`	`+ } else if (fieldName.equals("pathType") \|\| fieldName.equals("path_type")) {`
`191`	`191`	`builder.pathType(parsePathType(name, fieldNode.getValueAsText()));`
`192`	`192`	`} else if (fieldName.equals("properties")) {`
`193`	`193`	`parseProperties(builder, (ObjectNode) fieldNode, parserContext);`
`194`		`- } else if (fieldName.equals("includeInAll")) {`
	`194`	`+ } else if (fieldName.equals("includeInAll") \|\| fieldName.equals("include_in_all")) {`
`195`	`195`	`builder.includeInAll(nodeBooleanValue(fieldNode));`
`196`	`196`	`}`
`197`	`197`	`}`