No padding

5 files changed, 10 insertions, 8 deletions

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 cab1b1928c4..129c6aadee8 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
@@ -19,6 +19,8 @@ public class RawBucketId extends BucketGroupId<byte[]> {
      * @param to   The identifying exclusive-to raw buffer.
      */
     public RawBucketId(byte[] from, byte[] to) {
-        super("raw_bucket", from, Base64.getEncoder().encodeToString(from), to, Base64.getEncoder().encodeToString(to));
+        super("raw_bucket",
+                from, Base64.getEncoder().withoutPadding().encodeToString(from),
+                to, Base64.getEncoder().withoutPadding().encodeToString(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 b9c18aea380..f160f9b66af 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<byte[]> {
      * @param value The identifying byte array.
      */
     public RawId(byte[] value) {
-        super("raw", value, Base64.getEncoder().encodeToString(value));
+        super("raw", value, Base64.getEncoder().withoutPadding().encodeToString(value));
     }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index e15a1116175..003d6e01685 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -439,13 +439,13 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
 
     private static String getBucketFrom(BucketGroupId<?> id) {
         if (id instanceof RawBucketId rawBucketId)
-            return Base64.getEncoder().encodeToString(rawBucketId.getFrom());
+            return Base64.getEncoder().withoutPadding().encodeToString(rawBucketId.getFrom());
         return id.getFrom().toString();
     }
 
     private static String getBucketTo(BucketGroupId<?> id) {
         if (id instanceof RawBucketId rawBucketId)
-            return Base64.getEncoder().encodeToString(rawBucketId.getTo());
+            return Base64.getEncoder().withoutPadding().encodeToString(rawBucketId.getTo());
         return id.getTo().toString();
     }
 
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 b4ac523feb9..f986c593fae 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
@@ -47,8 +47,8 @@ public class GroupIdTestCase {
         assertEquals("group:long:69", new LongId(69L).toString());
         assertEquals("group:long_bucket:6:9", new LongBucketId(6L, 9L).toString());
         assertEquals("group:null", new NullId().toString());
-        assertEquals("group:raw:Bgk=", new RawId(new byte[]{6, 9}).toString());
-        assertEquals("group:raw_bucket:Bgk=:CQY=", new RawBucketId(new byte[]{6, 9}, new byte[]{9, 6}).toString());
+        assertEquals("group:raw:Bgk", new RawId(new byte[]{6, 9}).toString());
+        assertEquals("group:raw_bucket:Bgk:CQY", new RawBucketId(new byte[]{6, 9}, new byte[]{9, 6}).toString());
         assertTrue(new RootId(0).toString().startsWith("group:root:"));
         assertEquals("group:string:69", new StringId("69").toString());
         assertEquals("group:string_bucket:6:9", new StringBucketId("6", "9").toString());
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java
index 8fb1428cef4..28a6b6a2c1d 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java
@@ -33,12 +33,12 @@ public class ResultBuilderTestCase {
         assertGroupId("group:6.9", new FloatResultNode(6.9));
         assertGroupId("group:69", new IntegerResultNode(69));
         assertGroupId("group:null", new NullResultNode());
-        assertGroupId("group:Bgk=", new RawResultNode(new byte[]{6, 9}));
+        assertGroupId("group:Bgk", new RawResultNode(new byte[]{6, 9}));
         assertGroupId("group:a", new StringResultNode("a"));
         assertGroupId("group:6.9:9.6", new FloatBucketResultNode(6.9, 9.6));
         assertGroupId("group:6:9", new IntegerBucketResultNode(6, 9));
         assertGroupId("group:a:b", new StringBucketResultNode("a", "b"));
-        assertGroupId("group:Bgk=:CQY=", new RawBucketResultNode(new RawResultNode(new byte[]{6, 9}),
+        assertGroupId("group:Bgk:CQY", new RawBucketResultNode(new RawResultNode(new byte[]{6, 9}),
                 new RawResultNode(new byte[]{9, 6})));
     }