use web-safe base64 encoding for byte arrays

tangiel · tangiel · commit 5f7350089e46 · 2017-03-17T12:13:48.000-05:00
diff --git a/endpoints-framework/src/main/java/com/google/api/server/spi/ObjectMapperUtil.java b/endpoints-framework/src/main/java/com/google/api/server/spi/ObjectMapperUtil.java
@@ -18,6 +18,7 @@
 import com.google.api.server.spi.config.annotationreader.ApiAnnotationIntrospector;
 import com.google.api.server.spi.config.model.ApiSerializationConfig;
 
+import com.fasterxml.jackson.core.Base64Variants;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
@@ -76,6 +77,7 @@ public static ObjectMapper createStandardObjectMapper(ApiSerializationConfig con
         .configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true)
         .configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true)
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        .setBase64Variant(Base64Variants.MODIFIED_FOR_URL)
         .setSerializerFactory(
             BeanSerializerFactory.instance.withSerializerModifier(new DeepEmptyCheckingModifier()));
     AnnotationIntrospector pair = AnnotationIntrospector.pair(
diff --git a/endpoints-framework/src/test/java/com/google/api/server/spi/ObjectMapperUtilTest.java b/endpoints-framework/src/test/java/com/google/api/server/spi/ObjectMapperUtilTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.api.server.spi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link ObjectMapperUtil}
+ */
+public class ObjectMapperUtilTest {
+  @Test
+  public void createStandardObjectMapper_base64Variant() throws Exception {
+    byte[] bytes = new byte[] {(byte) 0xff, (byte) 0xef};
+    ObjectMapper mapper = ObjectMapperUtil.createStandardObjectMapper();
+    assertThat(mapper.writeValueAsString(bytes)).isEqualTo("\"_-8\"");
+    assertThat(mapper.readValue("\"_-8\"", byte[].class)).isEqualTo(bytes);
+  }
+}
