diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-04-19 06:35:04 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-04-19 06:35:04 +0200 |
commit | 1d818e96e1d6002726f6b89967e0835116251f15 (patch) | |
tree | e7aefa162bdc5300f7440d542dc9e102669ba4d2 /document/src/main | |
parent | 99c785443065ce08cfdf6ff78c63fd050881c857 (diff) |
Skip padding of base64 encoded data.
Diffstat (limited to 'document/src/main')
-rw-r--r-- | document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java | 7 | ||||
-rw-r--r-- | document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java index 110564bea46..795f8e93187 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.Field; -import com.yahoo.document.PositionDataType; import com.yahoo.document.PrimitiveDataType; import com.yahoo.document.datatypes.Array; import com.yahoo.document.datatypes.BoolFieldValue; @@ -41,7 +40,6 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Iterator; import java.util.Map; -import java.util.Set; /** * @author Steinar Knutsen @@ -49,7 +47,7 @@ import java.util.Set; */ public class JsonSerializationHelper { - private final static Base64.Encoder base64Encoder = Base64.getEncoder(); // Important: _basic_ format + private final static Base64.Encoder base64Encoder = Base64.getEncoder().withoutPadding(); // Important: _basic_ format static class JsonSerializationException extends RuntimeException { public JsonSerializationException(Exception base) { @@ -166,8 +164,7 @@ public class JsonSerializationHelper { public static void serializeStructField(FieldWriter fieldWriter, JsonGenerator generator, FieldBase field, Struct value) { DataType dt = value.getDataType(); - if (dt instanceof GeoPosType) { - var gpt = (GeoPosType)dt; + if (dt instanceof GeoPosType gpt) { if (gpt.renderJsonAsVespa8()) { serializeGeoPos(generator, field, value, gpt); return; diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java index 9c1df0cd6c7..d35693f785f 100644 --- a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java @@ -34,6 +34,8 @@ import java.util.Map; @SuppressWarnings("removal") public class XmlSerializationHelper { + private final static Base64.Encoder base64Encoder = Base64.getEncoder().withoutPadding(); + public static void printArrayXml(Array array, XmlStream xml) { List<FieldValue> lst = array.getValues(); for (FieldValue value : lst) { @@ -98,7 +100,7 @@ public class XmlSerializationHelper { public static void printRawXml(Raw r, XmlStream xml) { xml.addAttribute("binaryencoding", "base64"); - xml.addContent(Base64.getEncoder().encodeToString(r.getByteBuffer().array())); + xml.addContent(base64Encoder.encodeToString(r.getByteBuffer().array())); } public static void printStringXml(StringFieldValue s, XmlStream xml) { @@ -106,7 +108,7 @@ public class XmlSerializationHelper { if (containsNonPrintableCharactersString(content)) { byte[] bytecontent = Utf8.toBytes(content); xml.addAttribute("binaryencoding", "base64"); - xml.addContent(Base64.getEncoder().encodeToString(bytecontent)); + xml.addContent(base64Encoder.encodeToString(bytecontent)); } else { xml.addContent(content); } |