/*
 * Copyright (c) 2008-2017, Hazelcast, 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.hazelcast.client.impl.protocol.util;

import com.hazelcast.nio.Bits;
import com.hazelcast.nio.serialization.Data;

import java.util.Map;

public final class ParameterUtil {

    static final int UTF8_MAX_BYTES_PER_CHAR = 3;

    private ParameterUtil() { }

    public static int calculateDataSize(String string) {
        return Bits.INT_SIZE_IN_BYTES + string.length() * UTF8_MAX_BYTES_PER_CHAR;
    }

    public static int calculateDataSize(Data data) {
        return calculateDataSize(data.toByteArray());
    }

    public static int calculateDataSize(Map.Entry<Data, Data> entry) {
        return calculateDataSize(entry.getKey().toByteArray()) + calculateDataSize(entry.getValue().toByteArray());
    }

    public static int calculateDataSize(byte[] bytes) {
        return Bits.INT_SIZE_IN_BYTES + bytes.length;
    }

    public static int calculateDataSize(Integer data) {
        return Bits.INT_SIZE_IN_BYTES;
    }

    public static int calculateDataSize(Boolean data) {
        return Bits.BOOLEAN_SIZE_IN_BYTES;
    }

    public static int calculateDataSize(Long data) {
        return Bits.LONG_SIZE_IN_BYTES;
    }
}

@@ -886,16 +886,20 @@
 Util() %7B
+%0A   
  %7D%0A%0A    
@@ -1113,42 +1113,47 @@
 urn 
-calculateDataSize(data.toByteArray
+addByteArrayLengthHeader(data.totalSize
 ());
@@ -1250,75 +1250,103 @@
 urn 
-calculateDataSize(entry.getKey().toByteArray()) + calculateDataSize
+addByteArrayLengthHeader(entry.getKey().totalSize())%0A                + addByteArrayLengthHeader
 (ent
@@ -1361,25 +1361,23 @@
 lue().to
-ByteArray
+talSize
 ());%0A   
@@ -1432,24 +1432,148 @@
 %5B%5D bytes) %7B%0A
+        return addByteArrayLengthHeader(bytes.length);%0A    %7D%0A%0A    private static int addByteArrayLengthHeader(int length) %7B%0A
         retu
@@ -1600,22 +1600,16 @@
 BYTES + 
-bytes.
 length;%0A

Fix unwanted toByteArray to determine message size