From 95f38171827d534afd7922b4a9aa12188418f1d3 Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Mon, 31 Aug 2015 17:42:19 +0200
Subject: [PATCH] Internal: simplify SimpleQueryStringBuilder#doXContent method

No need to test for null values in fieldsAndWeights map, we use 1.0f a default boost all the time.
---
 .../index/query/SimpleQueryStringBuilder.java        | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
index 87f68cd0d92..65727d5dbcd 100644
--- a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
@@ -63,6 +63,8 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
     /** Name for (de-)serialization. */
     public static final String NAME = "simple_query_string";
 
+    static final SimpleQueryStringBuilder PROTOTYPE = new SimpleQueryStringBuilder(null);
+
     /** Query text to parse. */
     private final String queryText;
     /**
@@ -86,8 +88,6 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
     /** Further search settings needed by the ES specific query string parser only. */
     private Settings settings = new Settings();
 
-    static final SimpleQueryStringBuilder PROTOTYPE = new SimpleQueryStringBuilder(null);
-
     /** Construct a new simple query with this query string. */
     public SimpleQueryStringBuilder(String queryText) {
         this.queryText = queryText;
@@ -320,13 +320,7 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
         if (fieldsAndWeights.size() > 0) {
             builder.startArray("fields");
             for (Map.Entry<String, Float> entry : fieldsAndWeights.entrySet()) {
-                String field = entry.getKey();
-                Float boost = entry.getValue();
-                if (boost != null) {
-                    builder.value(field + "^" + boost);
-                } else {
-                    builder.value(field);
-                }
+                builder.value(entry.getKey() + "^" + entry.getValue());
             }
             builder.endArray();
         }