Revert changes in Parser, now using objectBytes() again. Instead use ByteRefs comparison in equals()

Author: Christoph Büscher

src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java

@@ -233,7 +233,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public int hashCode() {
-        return Objects.hash(fieldName, value, boost, queryName);
+        return Objects.hash(fieldName, BytesRefs.toBytesRef(value), boost, queryName);
     }
 
     @Override
@@ -246,7 +246,7 @@ public boolean equals(Object obj) {
         }
         TermQueryBuilder other = (TermQueryBuilder) obj;
         return Objects.equals(fieldName, other.fieldName) &&
-               Objects.equals(value, other.value) &&
+               Objects.equals(BytesRefs.toBytesRef(value), BytesRefs.toBytesRef(other.value)) &&
                Objects.equals(boost, other.boost) &&
                Objects.equals(queryName, other.queryName);
     }

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

@@ -60,9 +60,9 @@ public QueryBuilder fromXContent(QueryParseContext parseContext) throws IOExcept
                     currentFieldName = parser.currentName();
                 } else {
                     if ("term".equals(currentFieldName)) {
-                        value = parser.objectText();
+                        value = parser.objectBytes();
                     } else if ("value".equals(currentFieldName)) {
-                        value = parser.objectText();
+                        value = parser.objectBytes();
                     } else if ("boost".equals(currentFieldName)) {
                         boost = parser.floatValue();
                     } else if ("_name".equals(currentFieldName)) {
@@ -74,7 +74,7 @@ public QueryBuilder fromXContent(QueryParseContext parseContext) throws IOExcept
             }
             parser.nextToken();
         } else {
-            value = parser.objectText();
+            value = parser.text();
             // move to the next token
             parser.nextToken();
         }

src/test/java/org/elasticsearch/index/query/TermQueryBuilderTest.java

@@ -43,14 +43,26 @@ protected TermQueryBuilder createEmptyQueryBuilder() {
     /**
      * @return a TermQuery with random field name and value, optional random boost and queryname
      */
-
     protected TermQueryBuilder createTestQueryBuilder() {
         Object value = null;
         switch (randomIntBetween(0, 3)) {
-            case 0: value = randomBoolean(); break;
-            case 1: value = randomAsciiOfLength(8); break;
-            case 2: value = randomInt(10000); break;
-            case 3: value = randomDouble(); break;
+        case 0:
+            value = randomBoolean();
+            break;
+        case 1:
+            if (randomInt(10) > 0) {
+                value = randomAsciiOfLength(8);
+            } else {
+                // generate unicode string in 10% of cases
+                value = randomUnicodeOfLength(10);
+            }
+            break;
+        case 2:
+            value = randomInt(10000);
+            break;
+        case 3:
+            value = randomDouble();
+            break;
         }
         TermQueryBuilder query = new TermQueryBuilder(randomAsciiOfLength(8), value);
         if (randomBoolean()) {