/*
 * 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.facebook.presto.block;

import com.facebook.presto.spi.block.Block;
import com.facebook.presto.spi.block.BlockEncodingSerde;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import io.airlift.slice.DynamicSliceOutput;
import io.airlift.slice.SliceOutput;
import io.airlift.slice.Slices;

import javax.inject.Inject;

import java.io.IOException;
import java.util.Base64;

import static com.facebook.presto.spi.block.BlockSerdeUtil.readBlock;
import static com.facebook.presto.spi.block.BlockSerdeUtil.writeBlock;
import static java.util.Objects.requireNonNull;

public final class BlockJsonSerde
{
    private BlockJsonSerde() {}

    public static class Serializer
            extends JsonSerializer<Block>
    {
        private final BlockEncodingSerde blockEncodingSerde;

        @Inject
        public Serializer(BlockEncodingSerde blockEncodingSerde)
        {
            this.blockEncodingSerde = requireNonNull(blockEncodingSerde, "blockEncodingSerde is null");
        }

        @Override
        public void serialize(Block block, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
                throws IOException
        {
            SliceOutput output = new DynamicSliceOutput(64);
            writeBlock(blockEncodingSerde, output, block);
            String encoded = Base64.getEncoder().encodeToString(output.slice().getBytes());
            jsonGenerator.writeString(encoded);
        }
    }

    public static class Deserializer
            extends JsonDeserializer<Block>
    {
        private final BlockEncodingSerde blockEncodingSerde;

        @Inject
        public Deserializer(BlockEncodingSerde blockEncodingSerde)
        {
            this.blockEncodingSerde = requireNonNull(blockEncodingSerde, "blockEncodingSerde is null");
        }

        @Override
        public Block deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                throws IOException
        {
            byte[] decoded = Base64.getDecoder().decode(jsonParser.getText());
            return readBlock(blockEncodingSerde, Slices.wrappedBuffer(decoded));
        }
    }
}

@@ -692,16 +692,66 @@
 gSerde;%0A
+import com.fasterxml.jackson.core.Base64Variants;%0A
 import c
@@ -1103,32 +1103,63 @@
 micSliceOutput;%0A
+import io.airlift.slice.Slice;%0A
 import io.airlif
@@ -1272,33 +1272,8 @@
 ion;
-%0Aimport java.util.Base64;
 %0A%0Aim
@@ -1407,24 +1407,65 @@
 writeBlock;%0A
+import static java.lang.Math.toIntExact;%0A
 import stati
@@ -2111,54 +2111,226 @@
     
-SliceOutput output = new DynamicSliceOutput(64
+//  Encoding name is length prefixed as are other block data encodings%0A            SliceOutput output = new DynamicSliceOutput(toIntExact(block.getSizeInBytes() + block.getEncodingName().length() + (2 * Integer.BYTES))
 );%0A 
@@ -2404,59 +2404,21 @@
    S
-tring encoded = Base64.getEncoder().encodeToString(
+lice slice = 
 outp
@@ -2431,20 +2431,8 @@
 ce()
-.getBytes())
 ;%0A  
@@ -2464,22 +2464,107 @@
 rite
-String(encoded
+Binary(Base64Variants.MIME_NO_LINEFEEDS, slice.byteArray(), slice.byteArrayOffset(), slice.length()
 );%0A 
@@ -3135,55 +3135,66 @@
 d = 
-Base64.getDecoder().decode(jsonParser.getText()
+jsonParser.getBinaryValue(Base64Variants.MIME_NO_LINEFEEDS
 );%0A 

Use JSON generator Base64 conversion in BlockJsonSerde