Fix replacement logic

Author: felixbarny

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

@@ -579,15 +579,16 @@ private static Object extractValue(Object value, String name, String dynamicType
     }
 
     private static String processString(String s, String name, String dynamicType, Map<String, String> params) {
-        if (s.contains("{") == false) {
-            return s;
+        if (s.contains("{{")) {
+            s = s.replace("{{name}}", name).replace("{{dynamic_type}}", dynamicType).replace("{{dynamicType}}", dynamicType);
+        }
+        if (s.contains("{")) {
+            s = s.replace("{name}", name).replace("{dynamic_type}", dynamicType).replace("{dynamicType}", dynamicType);
         }
-        s = s.replace("{name}", name).replace("{dynamic_type}", dynamicType).replace("{dynamicType}", dynamicType);
 
         if (s.contains("{{") == false) {
             return s;
         }
-        s = s.replace("{{name}}", name).replace("{{dynamic_type}}", dynamicType).replace("{{dynamicType}}", dynamicType);
 
         // Handle {{param}} replacements
         Matcher matcher = DYNAMIC_TEMPLATE_PARAM.matcher(s);