All hit rendering of raw data use base64 encoding without padding

6 files changed, 7 insertions, 17 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index fbcf84f5b5d..84411b31274 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -209,7 +209,6 @@
     ],
     "methods" : [
       "public void <init>(byte[])",
-      "public void <init>(byte[], boolean)",
       "public byte[] value()",
       "public int compareTo(com.yahoo.prelude.hitfield.RawBase64)",
       "public java.lang.String toString()",
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/RawBase64.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/RawBase64.java
index 71964054e0d..d92f52249d9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/RawBase64.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/RawBase64.java
@@ -11,14 +11,9 @@ import java.util.Objects;
  */
 public class RawBase64 implements Comparable<RawBase64> {
     private final byte[] content;
-    private final boolean withoutPadding;
     public RawBase64(byte[] content) {
-        this(content, false);
-    }
-    public RawBase64(byte[] content, boolean withoutPadding) {
         Objects.requireNonNull(content);
         this.content = content;
-        this.withoutPadding = withoutPadding;
     }
 
     public byte [] value() { return content; }
@@ -30,9 +25,7 @@ public class RawBase64 implements Comparable<RawBase64> {
 
     @Override
     public String toString() {
-        return withoutPadding
-                ? Base64.getEncoder().withoutPadding().encodeToString(content)
-                : Base64.getEncoder().encodeToString(content);
+        return Base64.getEncoder().withoutPadding().encodeToString(content);
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/result/RawBucketId.java b/container-search/src/main/java/com/yahoo/search/grouping/result/RawBucketId.java
index dc8a2efb5cb..9b5ad6660b0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/result/RawBucketId.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/result/RawBucketId.java
@@ -18,8 +18,6 @@ public class RawBucketId extends BucketGroupId<RawBase64> {
      * @param to   The identifying exclusive-to raw buffer.
      */
     public RawBucketId(byte[] from, byte[] to) {
-        super("raw_bucket",
-                new RawBase64(from, true),
-                new RawBase64(to, true));
+        super("raw_bucket", new RawBase64(from), new RawBase64(to));
     }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/result/RawId.java b/container-search/src/main/java/com/yahoo/search/grouping/result/RawId.java
index f0ae9628c22..fd0d38c37fd 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/result/RawId.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/result/RawId.java
@@ -16,6 +16,6 @@ public class RawId extends ValueGroupId<RawBase64> {
      * @param value The identifying byte array.
      */
     public RawId(byte[] value) {
-        super("raw", new RawBase64(value, true));
+        super("raw", new RawBase64(value));
     }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
index 2333a180690..e746706f9c5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java
@@ -245,7 +245,7 @@ class ResultBuilder {
 
         private Object convertResult(Object value) {
             if (value instanceof RawData raw) {
-                return new RawBase64(raw.getData(), true);
+                return new RawBase64(raw.getData());
             }
             return value;
         }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java
index bdc52685140..77ed858b14b 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java
@@ -26,10 +26,10 @@ public class GroupIdTestCase {
         assertEquals(9L, rangeId.getTo());
 
         valueId = new RawId(new byte[]{6, 9});
-        assertEquals(new RawBase64(new byte[]{6, 9}, true), valueId.getValue());
+        assertEquals(new RawBase64(new byte[]{6, 9}), valueId.getValue());
         rangeId = new RawBucketId(new byte[]{6, 9}, new byte[]{9, 6});
-        assertEquals(new RawBase64(new byte[]{6, 9}, true), rangeId.getFrom());
-        assertEquals(new RawBase64(new byte[]{9, 6}, true), rangeId.getTo());
+        assertEquals(new RawBase64(new byte[]{6, 9}), rangeId.getFrom());
+        assertEquals(new RawBase64(new byte[]{9, 6}), rangeId.getTo());
 
         valueId = new StringId("69");
         assertEquals("69", valueId.getValue());