/*
 * JBoss, Home of Professional Open Source.
 * Copyright 2013, Red Hat, Inc., and individual contributors
 * as indicated by the @author tags. See the copyright.txt file in the
 * distribution for a full listing of individual contributors.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package org.wildfly.clustering.server.group;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.net.InetAddress;
import java.net.InetSocketAddress;

import org.jgroups.Address;
import org.kohsuke.MetaInfServices;
import org.wildfly.clustering.infinispan.spi.persistence.BinaryKeyFormat;
import org.wildfly.clustering.infinispan.spi.persistence.KeyFormat;
import org.wildfly.clustering.marshalling.Externalizer;

/**
 * Marshalling externalizer for an {@link AddressableNode}.
 * @author Paul Ferraro
 */
@MetaInfServices({ Externalizer.class, KeyFormat.class })
public class AddressableNodeExternalizer extends BinaryKeyFormat<AddressableNode> implements Externalizer<AddressableNode> {

    public AddressableNodeExternalizer() {
        super(AddressableNode.class, AddressableNodeExternalizer::read, AddressableNodeExternalizer::write);
    }

    private static AddressableNode read(DataInput input) throws IOException {
        try {
            Address jgroupsAddress = org.jgroups.util.Util.readAddress(input);
            String name = input.readUTF();
            byte[] address = new byte[input.readInt()];
            input.readFully(address);
            int port = input.readInt();
            return new AddressableNode(jgroupsAddress, name, new InetSocketAddress(InetAddress.getByAddress(address), port));
        } catch (IOException e) {
            throw e;
        } catch (Exception e) {
            throw new IOException(e);
        }
    }

    private static void write(DataOutput output, AddressableNode node) throws IOException {
        try {
            org.jgroups.util.Util.writeAddress(node.getAddress(), output);
            output.writeUTF(node.getName());
            InetSocketAddress socketAddress = node.getSocketAddress();
            byte[] address = socketAddress.getAddress().getAddress();
            output.writeInt(address.length);
            output.write(address);
            output.writeInt(socketAddress.getPort());
        } catch (IOException e) {
            throw e;
        } catch (Exception e) {
            throw new IOException(e);
        }
    }

    @Override
    public AddressableNode readObject(ObjectInput input) throws IOException {
        return read(input);
    }

    @Override
    public void writeObject(ObjectOutput output, AddressableNode node) throws IOException {
        write(output, node);
    }
}

@@ -1526,16 +1526,81 @@
 nalizer;
+%0Aimport org.wildfly.clustering.marshalling.spi.IndexExternalizer;
 %0A%0A/**%0A *
@@ -2280,30 +2280,62 @@
 ew byte%5B
-input.readInt(
+IndexExternalizer.UNSIGNED_BYTE.readData(input
 )%5D;%0A    
@@ -2395,22 +2395,55 @@
 t = 
-input.readInt(
+IndexExternalizer.UNSIGNED_SHORT.readData(input
 );%0A 
@@ -2998,32 +2998,101 @@
 ocketAddress();%0A
+            // Socket address will always contain a resolved address%0A
             byte
@@ -3157,32 +3157,66 @@
         
-output.writeInt(
+IndexExternalizer.UNSIGNED_BYTE.writeData(output, 
 address.
@@ -3275,24 +3275,59 @@
     
-output.writeInt(
+IndexExternalizer.UNSIGNED_SHORT.writeData(output, 
 sock

Optimize marshalling of AddressableNode.