fix dynamic_type in dynamic_template

closes #5256
2014-03-27 15:41:45 +11:00 · 2014-03-27 15:41:45 +11:00 · 8ab22a53fe
parent 34e9f8e83b
commit 8ab22a53fe
2 changed files with 4 additions and 7 deletions
--- a/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java
+++ b/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java
@ -154,7 +154,7 @@ public class DynamicTemplate {
    }

    public String mappingType(String dynamicType) {
-        return mapping.containsKey("type") ? mapping.get("type").toString() : dynamicType;
+        return mapping.containsKey("type") ? mapping.get("type").toString().replace("{dynamic_type}", dynamicType).replace("{dynamicType}", dynamicType) : dynamicType;
    }

    private boolean patternMatch(String pattern, String str) {
--- a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json
+++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json
@ -5,13 +5,10 @@
                "tempalte_1":{
                    "match":"multi*",
                    "mapping":{
-                        "type":"multi_field",
+                        "type":"{dynamic_type}",
+                        "index":"analyzed",
+                        "store":"yes",
                        "fields":{
-                            "{name}":{
-                                "type":"{dynamic_type}",
-                                "index":"analyzed",
-                                "store":"yes"
-                            },
                            "org":{
                                "type":"{dynamic_type}",
                                "index":"not_analyzed",