Streamline single value with boost queries: Allow for both value and query name to specify the query value, closes #192.

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/PrefixQueryParser.java

@@ -68,7 +68,9 @@ public class PrefixQueryParser extends AbstractIndexComponent implements XConten
                 if (token == XContentParser.Token.FIELD_NAME) {
                     currentFieldName = parser.currentName();
                 } else if (token.isValue()) {
-                    if (NAME.equals(currentFieldName)) {
+                    if ("prefix".equals(currentFieldName)) {
+                        value = parser.text();
+                    } else if ("value".equals(currentFieldName)) {
                         value = parser.text();
                     } else if ("boost".equals(currentFieldName)) {
                         boost = parser.floatValue();

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/SpanTermQueryParser.java

@@ -71,7 +71,9 @@ public class SpanTermQueryParser extends AbstractIndexComponent implements XCont
                 if (token == XContentParser.Token.FIELD_NAME) {
                     currentFieldName = parser.currentName();
                 } else {
-                    if ("value".equals(currentFieldName)) {
+                    if ("term".equals(currentFieldName)) {
+                        value = parser.text();
+                    } else if ("value".equals(currentFieldName)) {
                         value = parser.text();
                     } else if ("boost".equals(currentFieldName)) {
                         boost = parser.floatValue();

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/TermQueryParser.java

@@ -66,7 +66,9 @@ public class TermQueryParser extends AbstractIndexComponent implements XContentQ
                 if (token == XContentParser.Token.FIELD_NAME) {
                     currentFieldName = parser.currentName();
                 } else {
-                    if ("value".equals(currentFieldName)) {
+                    if ("term".equals(currentFieldName)) {
+                        value = parser.text();
+                    } else if ("value".equals(currentFieldName)) {
                         value = parser.text();
                     } else if ("boost".equals(currentFieldName)) {
                         boost = parser.floatValue();

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/WildcardQueryParser.java

@@ -70,6 +70,8 @@ public class WildcardQueryParser extends AbstractIndexComponent implements XCont
                 } else {
                     if ("wildcard".equals(currentFieldName)) {
                         value = parser.text();
+                    } else if ("value".equals(currentFieldName)) {
+                        value = parser.text();
                     } else if ("boost".equals(currentFieldName)) {
                         boost = parser.floatValue();
                     }