From 468918227a9602e70e2d3b66c2b53f212652b272 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 31 May 2012 16:03:57 -0700 Subject: [PATCH] Remove unnecessary parameter in AttributeKey and ChannelOption - Removed UniqueKey which does nothing - The valueType parameter was not needed at all because we do not need type information in runtime at all. --- .../ContextBoundUnmarshallerProvider.java | 3 +- .../CompatibleObjectEncoder.java | 3 +- .../main/java/io/netty/util/AttributeKey.java | 6 +- .../main/java/io/netty/util/UniqueKey.java | 32 ----------- .../java/io/netty/channel/ChannelOption.java | 55 +++++++++---------- 5 files changed, 32 insertions(+), 67 deletions(-) delete mode 100644 common/src/main/java/io/netty/util/UniqueKey.java diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java b/codec/src/main/java/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java index 026315a827..87c405c085 100644 --- a/codec/src/main/java/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java +++ b/codec/src/main/java/io/netty/handler/codec/marshalling/ContextBoundUnmarshallerProvider.java @@ -36,8 +36,7 @@ import org.jboss.marshalling.Unmarshaller; public class ContextBoundUnmarshallerProvider extends DefaultUnmarshallerProvider { private static final AttributeKey UNMARSHALLER = new AttributeKey( - ContextBoundUnmarshallerProvider.class.getName() + ".unmarshaller", - Unmarshaller.class); + ContextBoundUnmarshallerProvider.class.getName() + ".unmarshaller"); public ContextBoundUnmarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config) { super(factory, config); diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java index 663ed25ab3..a811db3262 100644 --- a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java @@ -37,8 +37,7 @@ import java.io.Serializable; public class CompatibleObjectEncoder extends MessageToStreamEncoder { private static final AttributeKey OOS = - new AttributeKey( - CompatibleObjectEncoder.class.getName() + ".oos", ObjectOutputStream.class); + new AttributeKey(CompatibleObjectEncoder.class.getName() + ".oos"); private final int resetInterval; private int writtenObjects; diff --git a/common/src/main/java/io/netty/util/AttributeKey.java b/common/src/main/java/io/netty/util/AttributeKey.java index 32d068baf7..dd79869571 100644 --- a/common/src/main/java/io/netty/util/AttributeKey.java +++ b/common/src/main/java/io/netty/util/AttributeKey.java @@ -3,11 +3,11 @@ package io.netty.util; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -public final class AttributeKey extends UniqueKey { +public final class AttributeKey extends UniqueName { private static final ConcurrentMap names = new ConcurrentHashMap(); - public AttributeKey(String name, Class valueType) { - super(names, name, valueType); + public AttributeKey(String name) { + super(names, name); } } diff --git a/common/src/main/java/io/netty/util/UniqueKey.java b/common/src/main/java/io/netty/util/UniqueKey.java deleted file mode 100644 index a878d3c6db..0000000000 --- a/common/src/main/java/io/netty/util/UniqueKey.java +++ /dev/null @@ -1,32 +0,0 @@ -package io.netty.util; - -import java.util.concurrent.ConcurrentMap; - -public class UniqueKey extends UniqueName { - - private final Class valueType; - private final String strVal; - - public UniqueKey(ConcurrentMap map, String name, Class valueType) { - super(map, name, valueType); - this.valueType = valueType; - strVal = name + '[' + valueType.getSimpleName() + ']'; - } - - @Override - protected void validateArgs(Object... args) { - super.validateArgs(args); - if (args[0] == null) { - throw new NullPointerException("valueType"); - } - } - - public final Class valueType() { - return valueType; - } - - @Override - public String toString() { - return strVal; - } -} diff --git a/transport/src/main/java/io/netty/channel/ChannelOption.java b/transport/src/main/java/io/netty/channel/ChannelOption.java index 3d89b934ec..0e018c5528 100644 --- a/transport/src/main/java/io/netty/channel/ChannelOption.java +++ b/transport/src/main/java/io/netty/channel/ChannelOption.java @@ -1,6 +1,6 @@ package io.netty.channel; -import io.netty.util.UniqueKey; +import io.netty.util.UniqueName; import java.net.InetAddress; import java.net.NetworkInterface; @@ -9,56 +9,55 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -public class ChannelOption extends UniqueKey { +public class ChannelOption extends UniqueName { private static final ConcurrentMap names = new ConcurrentHashMap(); public static final ChannelOption CONNECT_TIMEOUT_MILLIS = - new ChannelOption("CONNECT_TIMEOUT_MILLIS", Integer.class); + new ChannelOption("CONNECT_TIMEOUT_MILLIS"); public static final ChannelOption WRITE_SPIN_COUNT = - new ChannelOption("WRITE_SPIN_COUNT", Integer.class); + new ChannelOption("WRITE_SPIN_COUNT"); public static final ChannelOption SO_BROADCAST = - new ChannelOption("SO_BROADCAST", Boolean.class); + new ChannelOption("SO_BROADCAST"); public static final ChannelOption SO_KEEPALIVE = - new ChannelOption("SO_KEEPALIVE", Boolean.class); + new ChannelOption("SO_KEEPALIVE"); public static final ChannelOption SO_SNDBUF = - new ChannelOption("SO_SNDBUF", Integer.class); + new ChannelOption("SO_SNDBUF"); public static final ChannelOption SO_RCVBUF = - new ChannelOption("SO_RCVBUF", Integer.class); + new ChannelOption("SO_RCVBUF"); public static final ChannelOption SO_REUSEADDR = - new ChannelOption("SO_REUSEADDR", Boolean.class); + new ChannelOption("SO_REUSEADDR"); public static final ChannelOption SO_LINGER = - new ChannelOption("SO_LINGER", Integer.class); + new ChannelOption("SO_LINGER"); public static final ChannelOption SO_BACKLOG = - new ChannelOption("SO_BACKLOG", Integer.class); + new ChannelOption("SO_BACKLOG"); public static final ChannelOption IP_TOS = - new ChannelOption("IP_TOS", Integer.class); + new ChannelOption("IP_TOS"); public static final ChannelOption IP_MULTICAST_ADDR = - new ChannelOption("IP_MULTICAST_ADDR", InetAddress.class); + new ChannelOption("IP_MULTICAST_ADDR"); public static final ChannelOption IP_MULTICAST_IF = - new ChannelOption("IP_MULTICAST_IF", NetworkInterface.class); + new ChannelOption("IP_MULTICAST_IF"); public static final ChannelOption IP_MULTICAST_TTL = - new ChannelOption("IP_MULTICAST_TTL", Integer.class); + new ChannelOption("IP_MULTICAST_TTL"); public static final ChannelOption IP_MULTICAST_LOOP_DISABLED = - new ChannelOption("IP_MULTICAST_LOOP_DISABLED", Boolean.class); + new ChannelOption("IP_MULTICAST_LOOP_DISABLED"); public static final ChannelOption UDP_RECEIVE_PACKET_SIZE = - new ChannelOption("UDP_RECEIVE_PACKET_SIZE", Integer.class); + new ChannelOption("UDP_RECEIVE_PACKET_SIZE"); public static final ChannelOption TCP_NODELAY = - new ChannelOption("TCP_NODELAY", Boolean.class); + new ChannelOption("TCP_NODELAY"); public static final ChannelOption SCTP_DISABLE_FRAGMENTS = - new ChannelOption("SCTP_DISABLE_FRAGMENTS", Boolean.class); + new ChannelOption("SCTP_DISABLE_FRAGMENTS"); public static final ChannelOption SCTP_EXPLICIT_COMPLETE = - new ChannelOption("SCTP_EXPLICIT_COMPLETE", Boolean.class); + new ChannelOption("SCTP_EXPLICIT_COMPLETE"); public static final ChannelOption SCTP_FRAGMENT_INTERLEAVE = - new ChannelOption("SCTP_FRAGMENT_INTERLEAVE", Integer.class); - @SuppressWarnings("unchecked") + new ChannelOption("SCTP_FRAGMENT_INTERLEAVE"); public static final ChannelOption> SCTP_INIT_MAXSTREAMS = - new ChannelOption>("SCTP_INIT_MAXSTREAMS", (Class>)(Class) List.class) { + new ChannelOption>("SCTP_INIT_MAXSTREAMS") { @Override public void validate(List value) { super.validate(value); @@ -74,14 +73,14 @@ public class ChannelOption extends UniqueKey { } }; public static final ChannelOption SCTP_NODELAY = - new ChannelOption("SCTP_NODELAY", Boolean.class); + new ChannelOption("SCTP_NODELAY"); public static final ChannelOption SCTP_PRIMARY_ADDR = - new ChannelOption("SCTP_PRIMARY_ADDR", SocketAddress.class); + new ChannelOption("SCTP_PRIMARY_ADDR"); public static final ChannelOption SCTP_SET_PEER_PRIMARY_ADDR = - new ChannelOption("SCTP_SET_PEER_PRIMARY_ADDR", SocketAddress.class); + new ChannelOption("SCTP_SET_PEER_PRIMARY_ADDR"); - public ChannelOption(String name, Class valueType) { - super(names, name, valueType); + public ChannelOption(String name) { + super(names, name); } public void validate(T value) {