Fixing some checkstyle complaints.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9f621e5f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9f621e5f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9f621e5f Branch: refs/heads/master Commit: 9f621e5faeb7ed6129e6032c28a91bead7a11169 Parents: d484779 Author: Kyle Nusbaum <[email protected]> Authored: Wed Jul 19 11:16:12 2017 -0500 Committer: Kyle Nusbaum <[email protected]> Committed: Wed Jul 19 11:16:12 2017 -0500 ---------------------------------------------------------------------- storm-client/src/jvm/org/apache/storm/Config.java | 2 +- .../org/apache/storm/pacemaker/PacemakerClient.java | 8 ++++++-- .../apache/storm/pacemaker/codec/ThriftDecoder.java | 15 +++++++-------- .../pacemaker/codec/ThriftNettyClientCodec.java | 6 +++--- 4 files changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/9f621e5f/storm-client/src/jvm/org/apache/storm/Config.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java index 367e7ed..7f1c89e 100644 --- a/storm-client/src/jvm/org/apache/storm/Config.java +++ b/storm-client/src/jvm/org/apache/storm/Config.java @@ -804,7 +804,7 @@ public class Config extends HashMap<String, Object> { public static final String PACEMAKER_AUTH_METHOD = "pacemaker.auth.method"; /** - * Pacemaker Thrift Max Message Size (bytes) + * Pacemaker Thrift Max Message Size (bytes). */ @isInteger @isPositiveNumber http://git-wip-us.apache.org/repos/asf/storm/blob/9f621e5f/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java index bdfdeae..33535a2 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java @@ -117,8 +117,12 @@ public class PacemakerClient implements ISaslClient { bootstrap.setOption("keepAlive", true); remote_addr = new InetSocketAddress(host, port); - int thriftMessageMaxSize = (Integer)config.get(Config.PACEMAKER_THRIFT_MESSAGE_SIZE_MAX); - ChannelPipelineFactory pipelineFactory = new ThriftNettyClientCodec(this, config, authMethod, host, thriftMessageMaxSize).pipelineFactory(); + int thriftMessageMaxSize = + (Integer) config.get(Config.PACEMAKER_THRIFT_MESSAGE_SIZE_MAX); + ChannelPipelineFactory pipelineFactory = + new ThriftNettyClientCodec(this, config, authMethod, + host, thriftMessageMaxSize) + .pipelineFactory(); bootstrap.setPipelineFactory(pipelineFactory); bootstrap.connect(remote_addr); } http://git-wip-us.apache.org/repos/asf/storm/blob/9f621e5f/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java index 58d2b1b..c9d7bc3 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java @@ -17,17 +17,16 @@ */ package org.apache.storm.pacemaker.codec; -import org.apache.storm.utils.Utils; -import org.jboss.netty.handler.codec.frame.FrameDecoder; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.Channel; +import java.io.IOException; import org.apache.storm.generated.HBMessage; import org.apache.storm.generated.HBServerMessageType; -import org.jboss.netty.buffer.ChannelBuffer; import org.apache.storm.messaging.netty.ControlMessage; import org.apache.storm.messaging.netty.SaslMessageToken; - -import java.io.IOException; +import org.apache.storm.utils.Utils; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.frame.FrameDecoder; public class ThriftDecoder extends FrameDecoder { @@ -51,7 +50,7 @@ public class ThriftDecoder extends FrameDecoder { int thriftLen = buf.readInt(); - if(thriftLen < 0 || thriftLen > maxLength) { + if (thriftLen < 0 || thriftLen > maxLength) { throw new IOException("Thrift message of length " + Integer.toString(thriftLen) + " is greater than allowed " + maxLength + " or less than 0."); http://git-wip-us.apache.org/repos/asf/storm/blob/9f621e5f/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java index 1ad5a6c..dbe4a5d 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java @@ -48,14 +48,14 @@ public class ThriftNettyClientCodec { private AuthMethod authMethod; private Map<String, Object> topoConf; private String host; - private int thriftMessageMaxSize; + private final int _thriftMessageMaxSize; public ThriftNettyClientCodec(PacemakerClient pacemaker_client, Map<String, Object> topoConf, AuthMethod authMethod, String host, int thriftMessageMaxSize) { client = pacemaker_client; this.authMethod = authMethod; this.topoConf = topoConf; this.host = host; - this.thriftMessageMaxSize = thriftMessageMaxSize; + _thriftMessageMaxSize = thriftMessageMaxSize; } public ChannelPipelineFactory pipelineFactory() { @@ -63,7 +63,7 @@ public class ThriftNettyClientCodec { public ChannelPipeline getPipeline() { ChannelPipeline pipeline = Channels.pipeline(); pipeline.addLast("encoder", new ThriftEncoder()); - pipeline.addLast("decoder", new ThriftDecoder(thriftMessageMaxSize)); + pipeline.addLast("decoder", new ThriftDecoder(_thriftMessageMaxSize)); if (authMethod == AuthMethod.KERBEROS) { try {
