/*
 * Copyright (c) 2011-2015 Spotify AB
 *
 * 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.spotify.google.cloud.pubsub.client;

import com.google.api.client.repackaged.com.google.common.base.Throwables;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;

import java.io.IOException;
import java.io.OutputStream;

import io.norberg.automatter.jackson.AutoMatterModule;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY;

class Json {

  private static final ObjectMapper MAPPER = new ObjectMapper()
      .setSerializationInclusion(NON_EMPTY)
      .registerModule(new AutoMatterModule())
      .registerModule(new Jdk8Module());

  static <T> T read(final byte[] buffer, final Class<T> cls) throws IOException {
    return MAPPER.readValue(buffer, cls);
  }

  static byte[] write(final Object value) {
    try {
      return MAPPER.writeValueAsBytes(value);
    } catch (JsonProcessingException e) {
      throw Throwables.propagate(e);
    }
  }

  static void write(final OutputStream stream, final Object value) throws IOException {
    try {
      MAPPER.writeValue(stream, value);
    } catch (JsonProcessingException e) {
      throw Throwables.propagate(e);
    }
  }
}

@@ -833,16 +833,73 @@
 Mapper;%0A
+import com.fasterxml.jackson.datatype.guava.GuavaModule;%0A
 import c
@@ -1346,16 +1346,57 @@
 odule())
+%0A      .registerModule(new GuavaModule())
 ;%0A%0A  sta

support guava collections