Merge pull request #6276 from vespa-engine/arnej/doubleformatter-not-needed

Arnej/doubleformatter not needed

5 files changed, 7 insertions, 10 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
index 71971b56ef1..dd20472474d 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
@@ -10,7 +10,6 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.result.Relevance;
 import com.yahoo.text.XML;
-import com.yahoo.text.DoubleParser;
 import org.xml.sax.*;
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
@@ -472,7 +471,7 @@ public class ResultBuilder extends DefaultHandler {
                  //We try to get either uri or documentID and use that as id
                  Object docId = extractDocumentID();
                  Hit newHit = new Hit(docId.toString());
-                 if (hitRelevance != null) newHit.setRelevance(new Relevance(DoubleParser.parse(hitRelevance)));
+                 if (hitRelevance != null) newHit.setRelevance(new Relevance(Double.parseDouble(hitRelevance)));
                  if(hitSource != null) newHit.setSource(hitSource);
                  if(hitType != null) {
                      for(String type: hitType.split(" ")) {
diff --git a/container-search/src/main/java/com/yahoo/search/result/Relevance.java b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
index 7737b01cc14..69d49dc33ed 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Relevance.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Relevance.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.result;
 
-import com.yahoo.text.DoubleFormatter;
-
 /**
  * A relevance double value. These values should always be normalized between 0 and 1 (where 1 means perfect),
  * however, this is not enforced.
@@ -47,7 +45,7 @@ public class Relevance implements Comparable<Relevance> {
      */
     @Override
     public String toString() {
-        return DoubleFormatter.stringValue(score);
+        return String.valueOf(score);
     }
 
     /** Compares relevancy values with */
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml
index cb63af526a0..4272e54aeec 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml
@@ -64,10 +64,10 @@
       <hit relevance="0.2" source="source5">
         <id>source5-5</id>
       </hit>
-      <hit relevance="0.1666666666666667" source="source5">
+      <hit relevance="0.16666666666666666" source="source5">
         <id>source5-6</id>
       </hit>
-      <hit relevance="0.1428571428571428" source="source5">
+      <hit relevance="0.14285714285714285" source="source5">
         <id>source5-7</id>
       </hit>
     </section>
@@ -87,7 +87,7 @@
       <hit relevance="0.2" source="source4">
         <id>source4-5</id>
       </hit>
-      <hit relevance="0.1666666666666667" source="source4">
+      <hit relevance="0.16666666666666666" source="source4">
         <id>source4-6</id>
       </hit>
     </section>
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml
index 1b8b5a71e35..623918c8739 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml
@@ -64,7 +64,7 @@
       <hit relevance="0.2" source="source4">
         <id>source4-5</id>
       </hit>
-      <hit relevance="0.1666666666666667" source="source4">
+      <hit relevance="0.16666666666666666" source="source4">
         <id>source4-6</id>
       </hit>
     </section>
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml
index eb2e458ac6d..73b62afd6c1 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml
@@ -57,7 +57,7 @@
     <hit relevance="0.2" source="source4">
       <id>source4-5</id>
     </hit>
-    <hit relevance="0.1666666666666667" source="source4">
+    <hit relevance="0.16666666666666666" source="source4">
       <id>source4-6</id>
     </hit>
   </section>