You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/11/03 04:57:35 UTC
[1/2] storm git commit: STORM-1153 Use static final instead of just
static for class members
Repository: storm
Updated Branches:
refs/heads/STORM-1153-V1 [created] 7edf5200d
STORM-1153 Use static final instead of just static for class members
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6e29d270
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6e29d270
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6e29d270
Branch: refs/heads/STORM-1153-V1
Commit: 6e29d270d95d45cb6e05be8c325475639ae8d9a7
Parents: 60d9f81
Author: Suresh Srinivas <su...@yahoo-inc.com>
Authored: Fri Oct 30 13:38:07 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Nov 2 19:56:29 2015 -0800
----------------------------------------------------------------------
.../src/jvm/backtype/storm/StormSubmitter.java | 6 +--
.../storm/coordination/BatchBoltExecutor.java | 4 +-
.../storm/coordination/CoordinatedBolt.java | 14 +++----
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 10 ++---
.../src/jvm/backtype/storm/drpc/JoinResult.java | 8 ++--
.../security/auth/ShellBasedGroupsMapping.java | 10 ++---
.../auth/authorizer/DRPCAuthorizerBase.java | 2 +-
.../authorizer/SimpleWhitelistAuthorizer.java | 7 ++--
.../storm/security/auth/kerberos/AutoTGT.java | 10 ++---
.../serialization/BlowfishTupleSerializer.java | 6 +--
.../jvm/backtype/storm/spout/ShellSpout.java | 4 +-
.../src/jvm/backtype/storm/task/ShellBolt.java | 42 +++++++++++---------
.../storm/testing/MemoryTransactionalSpout.java | 9 ++---
.../testing/OpaqueMemoryTransactionalSpout.java | 8 ++--
.../storm/testing/TupleCaptureBolt.java | 4 +-
.../TransactionalSpoutBatchExecutor.java | 4 +-
.../jvm/backtype/storm/utils/LocalState.java | 22 ++--------
.../jvm/backtype/storm/utils/ShellProcess.java | 6 +--
.../jvm/backtype/storm/utils/ShellUtils.java | 2 +-
.../src/jvm/backtype/storm/utils/Time.java | 4 +-
.../trident/spout/TridentSpoutExecutor.java | 2 +-
.../trident/topology/TridentBoltExecutor.java | 6 +--
.../storm/trident/tuple/TridentTupleView.java | 12 +++---
23 files changed, 93 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/StormSubmitter.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/StormSubmitter.java b/storm-core/src/jvm/backtype/storm/StormSubmitter.java
index 8afbbc6..d995bec 100644
--- a/storm-core/src/jvm/backtype/storm/StormSubmitter.java
+++ b/storm-core/src/jvm/backtype/storm/StormSubmitter.java
@@ -44,7 +44,7 @@ import backtype.storm.utils.Utils;
* submit your topologies.
*/
public class StormSubmitter {
- public static Logger LOG = LoggerFactory.getLogger(StormSubmitter.class);
+ public static final Logger LOG = LoggerFactory.getLogger(StormSubmitter.class);
private static final int THRIFT_CHUNK_SIZE_BYTES = 307200;
@@ -90,7 +90,7 @@ public class StormSubmitter {
}
private static Map<String,String> populateCredentials(Map conf, Map<String, String> creds) {
- Map<String,String> ret = new HashMap<String,String>();
+ Map<String,String> ret = new HashMap<>();
for (IAutoCredentials autoCred: AuthUtils.GetAutoCredentials(conf)) {
LOG.info("Running "+autoCred);
autoCred.populateCredentials(ret);
@@ -201,7 +201,7 @@ public class StormSubmitter {
validateConfs(conf, topology);
- Map<String,String> passedCreds = new HashMap<String, String>();
+ Map<String,String> passedCreds = new HashMap<>();
if (opts != null) {
Credentials tmpCreds = opts.get_creds();
if (tmpCreds != null) {
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java b/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
index 8653010..55590d0 100644
--- a/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
+++ b/storm-core/src/jvm/backtype/storm/coordination/BatchBoltExecutor.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BatchBoltExecutor implements IRichBolt, FinishedCallback, TimeoutCallback {
- public static Logger LOG = LoggerFactory.getLogger(BatchBoltExecutor.class);
+ public static final Logger LOG = LoggerFactory.getLogger(BatchBoltExecutor.class);
byte[] _boltSer;
Map<Object, IBatchBolt> _openTransactions;
@@ -49,7 +49,7 @@ public class BatchBoltExecutor implements IRichBolt, FinishedCallback, TimeoutCa
_conf = conf;
_context = context;
_collector = new BatchOutputCollectorImpl(collector);
- _openTransactions = new HashMap<Object, IBatchBolt>();
+ _openTransactions = new HashMap<>();
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/coordination/CoordinatedBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/coordination/CoordinatedBolt.java b/storm-core/src/jvm/backtype/storm/coordination/CoordinatedBolt.java
index 61e5e29..c3a428c 100644
--- a/storm-core/src/jvm/backtype/storm/coordination/CoordinatedBolt.java
+++ b/storm-core/src/jvm/backtype/storm/coordination/CoordinatedBolt.java
@@ -49,7 +49,7 @@ import static backtype.storm.utils.Utils.get;
* in the case of retries.
*/
public class CoordinatedBolt implements IRichBolt {
- public static Logger LOG = LoggerFactory.getLogger(CoordinatedBolt.class);
+ public static final Logger LOG = LoggerFactory.getLogger(CoordinatedBolt.class);
public static interface FinishedCallback {
void finishedId(Object id);
@@ -148,7 +148,7 @@ public class CoordinatedBolt implements IRichBolt {
private IdStreamSpec _idStreamSpec;
private IRichBolt _delegate;
private Integer _numSourceReports;
- private List<Integer> _countOutTasks = new ArrayList<Integer>();;
+ private List<Integer> _countOutTasks = new ArrayList<>();
private OutputCollector _collector;
private TimeCacheMap<Object, TrackingInfo> _tracked;
@@ -157,10 +157,10 @@ public class CoordinatedBolt implements IRichBolt {
int expectedTupleCount = 0;
int receivedTuples = 0;
boolean failed = false;
- Map<Integer, Integer> taskEmittedTuples = new HashMap<Integer, Integer>();
+ Map<Integer, Integer> taskEmittedTuples = new HashMap<>();
boolean receivedId = false;
boolean finished = false;
- List<Tuple> ackTuples = new ArrayList<Tuple>();
+ List<Tuple> ackTuples = new ArrayList<>();
@Override
public String toString() {
@@ -199,7 +199,7 @@ public class CoordinatedBolt implements IRichBolt {
public CoordinatedBolt(IRichBolt delegate, Map<String, SourceArgs> sourceArgs, IdStreamSpec idStreamSpec) {
_sourceArgs = sourceArgs;
- if(_sourceArgs==null) _sourceArgs = new HashMap<String, SourceArgs>();
+ if(_sourceArgs==null) _sourceArgs = new HashMap<>();
_delegate = delegate;
_idStreamSpec = idStreamSpec;
}
@@ -209,7 +209,7 @@ public class CoordinatedBolt implements IRichBolt {
if(_delegate instanceof TimeoutCallback) {
callback = new TimeoutItems();
}
- _tracked = new TimeCacheMap<Object, TrackingInfo>(context.maxTopologyMessageTimeout(), callback);
+ _tracked = new TimeCacheMap<>(context.maxTopologyMessageTimeout(), callback);
_collector = collector;
_delegate.prepare(config, context, new OutputCollector(new CoordinatedOutputCollector(collector)));
for(String component: Utils.get(context.getThisTargets(),
@@ -343,7 +343,7 @@ public class CoordinatedBolt implements IRichBolt {
}
private static Map<String, SourceArgs> singleSourceArgs(String sourceComponent, SourceArgs sourceArgs) {
- Map<String, SourceArgs> ret = new HashMap<String, SourceArgs>();
+ Map<String, SourceArgs> ret = new HashMap<>();
ret.put(sourceComponent, sourceArgs);
return ret;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
index ce233ed..4ed15c0 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
@@ -37,7 +37,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.LinkedList;
import java.util.Map;
-import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.Callable;
@@ -47,17 +46,16 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
import org.json.simple.JSONValue;
public class DRPCSpout extends BaseRichSpout {
//ANY CHANGE TO THIS CODE MUST BE SERIALIZABLE COMPATIBLE OR THERE WILL BE PROBLEMS
static final long serialVersionUID = 2387848310969237877L;
- public static Logger LOG = LoggerFactory.getLogger(DRPCSpout.class);
+ public static final Logger LOG = LoggerFactory.getLogger(DRPCSpout.class);
SpoutOutputCollector _collector;
- List<DRPCInvocationsClient> _clients = new ArrayList<DRPCInvocationsClient>();
+ List<DRPCInvocationsClient> _clients = new ArrayList<>();
transient LinkedList<Future<Void>> _futures = null;
transient ExecutorService _backround = null;
String _function;
@@ -140,7 +138,7 @@ public class DRPCSpout extends BaseRichSpout {
_backround = new ExtendedThreadPoolExecutor(0, Integer.MAX_VALUE,
60L, TimeUnit.SECONDS,
new SynchronousQueue<Runnable>());
- _futures = new LinkedList<Future<Void>>();
+ _futures = new LinkedList<>();
int numTasks = context.getComponentTasks(context.getThisComponentId()).size();
int index = context.getThisTaskIndex();
@@ -174,7 +172,7 @@ public class DRPCSpout extends BaseRichSpout {
public void nextTuple() {
boolean gotRequest = false;
if(_local_drpc_id==null) {
- int size = 0;
+ int size;
synchronized (_clients) {
size = _clients.size(); //This will only ever grow, so no need to worry about falling off the end
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/drpc/JoinResult.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/JoinResult.java b/storm-core/src/jvm/backtype/storm/drpc/JoinResult.java
index b74b97e..2c416ed 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/JoinResult.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/JoinResult.java
@@ -33,11 +33,11 @@ import org.slf4j.LoggerFactory;
public class JoinResult extends BaseRichBolt {
- public static Logger LOG = LoggerFactory.getLogger(JoinResult.class);
+ public static final Logger LOG = LoggerFactory.getLogger(JoinResult.class);
String returnComponent;
- Map<Object, Tuple> returns = new HashMap<Object, Tuple>();
- Map<Object, Tuple> results = new HashMap<Object, Tuple>();
+ Map<Object, Tuple> returns = new HashMap<>();
+ Map<Object, Tuple> results = new HashMap<>();
OutputCollector _collector;
public JoinResult(String returnComponent) {
@@ -60,7 +60,7 @@ public class JoinResult extends BaseRichBolt {
Tuple result = results.remove(requestId);
Tuple returner = returns.remove(requestId);
LOG.debug(result.getValue(1).toString());
- List<Tuple> anchors = new ArrayList<Tuple>();
+ List<Tuple> anchors = new ArrayList<>();
anchors.add(result);
anchors.add(returner);
_collector.emit(anchors, new Values(""+result.getValue(1), returner.getValue(1)));
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/security/auth/ShellBasedGroupsMapping.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/ShellBasedGroupsMapping.java b/storm-core/src/jvm/backtype/storm/security/auth/ShellBasedGroupsMapping.java
index d83cf1c..5f53c17 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/ShellBasedGroupsMapping.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/ShellBasedGroupsMapping.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
public class ShellBasedGroupsMapping implements
IGroupMappingServiceProvider {
- public static Logger LOG = LoggerFactory.getLogger(ShellBasedGroupsMapping.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ShellBasedGroupsMapping.class);
public TimeCacheMap<String, Set<String>> cachedGroups;
/**
@@ -45,7 +45,7 @@ public class ShellBasedGroupsMapping implements
@Override
public void prepare(Map storm_conf) {
int timeout = Utils.getInt(storm_conf.get(Config.STORM_GROUP_MAPPING_SERVICE_CACHE_DURATION_SECS));
- cachedGroups = new TimeCacheMap<String, Set<String>>(timeout);
+ cachedGroups = new TimeCacheMap<>(timeout);
}
/**
@@ -73,18 +73,18 @@ public class ShellBasedGroupsMapping implements
* @throws IOException if encounter any error when running the command
*/
private static Set<String> getUnixGroups(final String user) throws IOException {
- String result = "";
+ String result;
try {
result = ShellUtils.execCommand(ShellUtils.getGroupsForUserCommand(user));
} catch (ExitCodeException e) {
// if we didn't get the group - just return empty list;
LOG.debug("unable to get groups for user " + user + ".ShellUtils command failed with exit code "+ e.getExitCode());
- return new HashSet<String>();
+ return new HashSet<>();
}
StringTokenizer tokenizer =
new StringTokenizer(result, ShellUtils.TOKEN_SEPARATOR_REGEX);
- Set<String> groups = new HashSet<String>();
+ Set<String> groups = new HashSet<>();
while (tokenizer.hasMoreTokens()) {
groups.add(tokenizer.nextToken());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/security/auth/authorizer/DRPCAuthorizerBase.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/authorizer/DRPCAuthorizerBase.java b/storm-core/src/jvm/backtype/storm/security/auth/authorizer/DRPCAuthorizerBase.java
index e1bb077..04269dd 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/authorizer/DRPCAuthorizerBase.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/authorizer/DRPCAuthorizerBase.java
@@ -26,7 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class DRPCAuthorizerBase implements IAuthorizer {
- public static Logger LOG = LoggerFactory.getLogger(DRPCAuthorizerBase.class);
+ public static final Logger LOG = LoggerFactory.getLogger(DRPCAuthorizerBase.class);
/**
* A key name for the function requested to be executed by a user.
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java b/storm-core/src/jvm/backtype/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
index c522adf..21ee9a6 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/authorizer/SimpleWhitelistAuthorizer.java
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collection;
-import backtype.storm.Config;
import backtype.storm.security.auth.IAuthorizer;
import backtype.storm.security.auth.ReqContext;
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
*/
public class SimpleWhitelistAuthorizer implements IAuthorizer {
private static final Logger LOG = LoggerFactory.getLogger(SimpleWhitelistAuthorizer.class);
- public static String WHITELIST_USERS_CONF = "storm.auth.simple-white-list.users";
+ public static final String WHITELIST_USERS_CONF = "storm.auth.simple-white-list.users";
protected Set<String> users;
/**
@@ -45,7 +44,7 @@ public class SimpleWhitelistAuthorizer implements IAuthorizer {
*/
@Override
public void prepare(Map conf) {
- users = new HashSet<String>();
+ users = new HashSet<>();
if (conf.containsKey(WHITELIST_USERS_CONF)) {
users.addAll((Collection<String>)conf.get(WHITELIST_USERS_CONF));
}
@@ -55,7 +54,7 @@ public class SimpleWhitelistAuthorizer implements IAuthorizer {
* permit() method is invoked for each incoming Thrift request
* @param context request context includes info about
* @param operation operation name
- * @param topology_storm configuration of targeted topology
+ * @param topology_conf configuration of targeted topology
* @return true if the request is authorized, false if reject
*/
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/security/auth/kerberos/AutoTGT.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/kerberos/AutoTGT.java b/storm-core/src/jvm/backtype/storm/security/auth/kerberos/AutoTGT.java
index aed1c4f..dd54e02 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/kerberos/AutoTGT.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/kerberos/AutoTGT.java
@@ -22,7 +22,6 @@ import backtype.storm.security.auth.IAutoCredentials;
import backtype.storm.security.auth.ICredentialsRenewer;
import backtype.storm.security.auth.AuthUtils;
-import java.util.Date;
import java.util.Map;
import java.util.Set;
import java.io.ByteArrayInputStream;
@@ -38,7 +37,6 @@ import java.util.Iterator;
import javax.security.auth.kerberos.KerberosTicket;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginException;
import javax.security.auth.login.LoginContext;
import javax.security.auth.DestroyFailedException;
import javax.security.auth.RefreshFailedException;
@@ -54,7 +52,7 @@ import org.slf4j.LoggerFactory;
public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
private static final Logger LOG = LoggerFactory.getLogger(AutoTGT.class);
private static final float TICKET_RENEW_WINDOW = 0.80f;
- protected static AtomicReference<KerberosTicket> kerbTicket = new AtomicReference<KerberosTicket>();
+ protected static final AtomicReference<KerberosTicket> kerbTicket = new AtomicReference<>();
private Map conf;
public void prepare(Map conf) {
@@ -66,11 +64,9 @@ public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
for(KerberosTicket ticket: tickets) {
KerberosPrincipal server = ticket.getServer();
if (server.getName().equals("krbtgt/" + server.getRealm() + "@" + server.getRealm())) {
- tickets = null;
return ticket;
}
}
- tickets = null;
return null;
}
@@ -165,7 +161,7 @@ public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
try {
t.destroy();
} catch (DestroyFailedException e) {
- LOG.warn("Failed to destory ticket ", e);
+ LOG.warn("Failed to destroy ticket ", e);
}
}
}
@@ -184,7 +180,7 @@ public class AutoTGT implements IAutoCredentials, ICredentialsRenewer {
* @param subject the subject that should have a TGT in it.
*/
private void loginHadoopUser(Subject subject) {
- Class<?> ugi = null;
+ Class<?> ugi;
try {
ugi = Class.forName("org.apache.hadoop.security.UserGroupInformation");
} catch (ClassNotFoundException e) {
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java b/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
index 8e66cdf..fca0c46 100644
--- a/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/security/serialization/BlowfishTupleSerializer.java
@@ -36,19 +36,19 @@ import backtype.storm.utils.ListDelegate;
import backtype.storm.Config;
/**
- * Apply Blowfish encrption for tuple communication to bolts
+ * Apply Blowfish encryption for tuple communication to bolts
*/
public class BlowfishTupleSerializer extends Serializer<ListDelegate> {
/**
* The secret key (if any) for data encryption by blowfish payload serialization factory (BlowfishSerializationFactory).
* You should use in via "storm -c topology.tuple.serializer.blowfish.key=YOURKEY -c topology.tuple.serializer=backtype.storm.security.serialization.BlowfishTupleSerializer jar ...".
*/
- public static String SECRET_KEY = "topology.tuple.serializer.blowfish.key";
+ public static final String SECRET_KEY = "topology.tuple.serializer.blowfish.key";
private static final Logger LOG = LoggerFactory.getLogger(BlowfishTupleSerializer.class);
private BlowfishSerializer _serializer;
public BlowfishTupleSerializer(Kryo kryo, Map storm_conf) {
- String encryption_key = null;
+ String encryption_key;
try {
encryption_key = (String)storm_conf.get(SECRET_KEY);
LOG.debug("Blowfish serializer being constructed ...");
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
index a69b9b2..4976903 100644
--- a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
@@ -41,11 +41,11 @@ import org.slf4j.LoggerFactory;
public class ShellSpout implements ISpout {
- public static Logger LOG = LoggerFactory.getLogger(ShellSpout.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ShellSpout.class);
private SpoutOutputCollector _collector;
private String[] _command;
- private Map<String, String> env = new HashMap<String, String>();
+ private Map<String, String> env = new HashMap<>();
private ShellProcess _process;
private TopologyContext _context;
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
index 44b8e48..dda99ca 100644
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@ -68,13 +68,12 @@ import static java.util.concurrent.TimeUnit.SECONDS;
*/
public class ShellBolt implements IBolt {
public static final String HEARTBEAT_STREAM_ID = "__heartbeat";
- public static Logger LOG = LoggerFactory.getLogger(ShellBolt.class);
- Process _subprocess;
+ public static final Logger LOG = LoggerFactory.getLogger(ShellBolt.class);
OutputCollector _collector;
- Map<String, Tuple> _inputs = new ConcurrentHashMap<String, Tuple>();
+ Map<String, Tuple> _inputs = new ConcurrentHashMap<>();
private String[] _command;
- private Map<String, String> env = new HashMap<String, String>();
+ private Map<String, String> env = new HashMap<>();
private ShellProcess _process;
private volatile boolean _running = true;
private volatile Throwable _exception;
@@ -198,7 +197,7 @@ public class ShellBolt implements IBolt {
}
private void handleEmit(ShellMsg shellMsg) throws InterruptedException {
- List<Tuple> anchors = new ArrayList<Tuple>();
+ List<Tuple> anchors = new ArrayList<>();
List<String> recvAnchors = shellMsg.getAnchors();
if (recvAnchors != null) {
for (String anchor : recvAnchors) {
@@ -337,18 +336,25 @@ public class ShellBolt implements IBolt {
setHeartbeat();
// We don't need to take care of sync, cause we're always updating heartbeat
- if(command.equals("ack")) {
- handleAck(shellMsg.getId());
- } else if (command.equals("fail")) {
- handleFail(shellMsg.getId());
- } else if (command.equals("error")) {
- handleError(shellMsg.getMsg());
- } else if (command.equals("log")) {
- handleLog(shellMsg);
- } else if (command.equals("emit")) {
- handleEmit(shellMsg);
- } else if (command.equals("metrics")) {
- handleMetrics(shellMsg);
+ switch (command) {
+ case "ack":
+ handleAck(shellMsg.getId());
+ break;
+ case "fail":
+ handleFail(shellMsg.getId());
+ break;
+ case "error":
+ handleError(shellMsg.getMsg());
+ break;
+ case "log":
+ handleLog(shellMsg);
+ break;
+ case "emit":
+ handleEmit(shellMsg);
+ break;
+ case "metrics":
+ handleMetrics(shellMsg);
+ break;
}
} catch (InterruptedException e) {
} catch (Throwable t) {
@@ -390,7 +396,7 @@ public class ShellBolt implements IBolt {
msg.setId(genId);
msg.setTask(Constants.SYSTEM_TASK_ID);
msg.setStream(HEARTBEAT_STREAM_ID);
- msg.setTuple(new ArrayList<Object>());
+ msg.setTuple(new ArrayList<>());
return msg;
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/testing/MemoryTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/testing/MemoryTransactionalSpout.java b/storm-core/src/jvm/backtype/storm/testing/MemoryTransactionalSpout.java
index 3b492e1..faca77d 100644
--- a/storm-core/src/jvm/backtype/storm/testing/MemoryTransactionalSpout.java
+++ b/storm-core/src/jvm/backtype/storm/testing/MemoryTransactionalSpout.java
@@ -23,7 +23,6 @@ import backtype.storm.topology.OutputFieldsDeclarer;
import backtype.storm.transactional.TransactionAttempt;
import backtype.storm.coordination.BatchOutputCollector;
import backtype.storm.transactional.partitioned.IPartitionedTransactionalSpout;
-import backtype.storm.transactional.partitioned.IPartitionedTransactionalSpout.Emitter;
import backtype.storm.tuple.Fields;
import backtype.storm.utils.RegisteredGlobalState;
import backtype.storm.utils.Utils;
@@ -34,7 +33,7 @@ import java.util.List;
import java.util.Map;
public class MemoryTransactionalSpout implements IPartitionedTransactionalSpout<MemoryTransactionalSpoutMeta> {
- public static String TX_FIELD = MemoryTransactionalSpout.class.getName() + "/id";
+ public static final String TX_FIELD = MemoryTransactionalSpout.class.getName() + "/id";
private String _id;
private String _finishedPartitionsId;
@@ -81,7 +80,7 @@ public class MemoryTransactionalSpout implements IPartitionedTransactionalSpout<
class Emitter implements IPartitionedTransactionalSpout.Emitter<MemoryTransactionalSpoutMeta> {
Integer _maxSpoutPending;
- Map<Integer, Integer> _emptyPartitions = new HashMap<Integer, Integer>();
+ Map<Integer, Integer> _emptyPartitions = new HashMap<>();
public Emitter(Map conf) {
Object c = conf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING);
@@ -125,7 +124,7 @@ public class MemoryTransactionalSpout implements IPartitionedTransactionalSpout<
public void emitPartitionBatch(TransactionAttempt tx, BatchOutputCollector collector, int partition, MemoryTransactionalSpoutMeta partitionMeta) {
List<List<Object>> queue = getQueues().get(partition);
for(int i=partitionMeta.index; i < partitionMeta.index + partitionMeta.amt; i++) {
- List<Object> toEmit = new ArrayList<Object>(queue.get(i));
+ List<Object> toEmit = new ArrayList<>(queue.get(i));
toEmit.add(0, tx);
collector.emit(toEmit);
}
@@ -148,7 +147,7 @@ public class MemoryTransactionalSpout implements IPartitionedTransactionalSpout<
@Override
public void declareOutputFields(OutputFieldsDeclarer declarer) {
- List<String> toDeclare = new ArrayList<String>(_outFields.toList());
+ List<String> toDeclare = new ArrayList<>(_outFields.toList());
toDeclare.add(0, TX_FIELD);
declarer.declare(new Fields(toDeclare));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/testing/OpaqueMemoryTransactionalSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/testing/OpaqueMemoryTransactionalSpout.java b/storm-core/src/jvm/backtype/storm/testing/OpaqueMemoryTransactionalSpout.java
index 0151392..876bf51 100644
--- a/storm-core/src/jvm/backtype/storm/testing/OpaqueMemoryTransactionalSpout.java
+++ b/storm-core/src/jvm/backtype/storm/testing/OpaqueMemoryTransactionalSpout.java
@@ -36,7 +36,7 @@ import java.util.Map;
* This spout only works in local mode.
*/
public class OpaqueMemoryTransactionalSpout implements IOpaquePartitionedTransactionalSpout<MemoryTransactionalSpoutMeta> {
- public static String TX_FIELD = MemoryTransactionalSpout.class.getName() + "/id";
+ public static final String TX_FIELD = MemoryTransactionalSpout.class.getName() + "/id";
private String _id;
private String _finishedPartitionsId;
@@ -95,7 +95,7 @@ public class OpaqueMemoryTransactionalSpout implements IOpaquePartitionedTransac
class Emitter implements IOpaquePartitionedTransactionalSpout.Emitter<MemoryTransactionalSpoutMeta> {
Integer _maxSpoutPending;
- Map<Integer, Integer> _emptyPartitions = new HashMap<Integer, Integer>();
+ Map<Integer, Integer> _emptyPartitions = new HashMap<>();
public Emitter(Map conf) {
Object c = conf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING);
@@ -120,7 +120,7 @@ public class OpaqueMemoryTransactionalSpout implements IOpaquePartitionedTransac
MemoryTransactionalSpoutMeta ret = new MemoryTransactionalSpoutMeta(index, toTake);
for(int i=ret.index; i < ret.index + ret.amt; i++) {
- List<Object> toEmit = new ArrayList<Object>(queue.get(i));
+ List<Object> toEmit = new ArrayList<>(queue.get(i));
toEmit.add(0, tx);
collector.emit(toEmit);
}
@@ -151,7 +151,7 @@ public class OpaqueMemoryTransactionalSpout implements IOpaquePartitionedTransac
@Override
public void declareOutputFields(OutputFieldsDeclarer declarer) {
- List<String> toDeclare = new ArrayList<String>(_outFields.toList());
+ List<String> toDeclare = new ArrayList<>(_outFields.toList());
toDeclare.add(0, TX_FIELD);
declarer.declare(new Fields(toDeclare));
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/testing/TupleCaptureBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/testing/TupleCaptureBolt.java b/storm-core/src/jvm/backtype/storm/testing/TupleCaptureBolt.java
index e163576..b085c54 100644
--- a/storm-core/src/jvm/backtype/storm/testing/TupleCaptureBolt.java
+++ b/storm-core/src/jvm/backtype/storm/testing/TupleCaptureBolt.java
@@ -30,7 +30,7 @@ import java.util.UUID;
public class TupleCaptureBolt implements IRichBolt {
- public static transient Map<String, Map<String, List<FixedTuple>>> emitted_tuples = new HashMap<String, Map<String, List<FixedTuple>>>();
+ public static final transient Map<String, Map<String, List<FixedTuple>>> emitted_tuples = new HashMap<>();
private String _name;
private OutputCollector _collector;
@@ -66,7 +66,7 @@ public class TupleCaptureBolt implements IRichBolt {
}
public Map<String, List<FixedTuple>> getAndClearResults() {
- Map<String, List<FixedTuple>> ret = new HashMap<String, List<FixedTuple>>(emitted_tuples.get(_name));
+ Map<String, List<FixedTuple>> ret = new HashMap<>(emitted_tuples.get(_name));
emitted_tuples.get(_name).clear();
return ret;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/transactional/TransactionalSpoutBatchExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/transactional/TransactionalSpoutBatchExecutor.java b/storm-core/src/jvm/backtype/storm/transactional/TransactionalSpoutBatchExecutor.java
index 53aacae..101abe6 100644
--- a/storm-core/src/jvm/backtype/storm/transactional/TransactionalSpoutBatchExecutor.java
+++ b/storm-core/src/jvm/backtype/storm/transactional/TransactionalSpoutBatchExecutor.java
@@ -31,13 +31,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TransactionalSpoutBatchExecutor implements IRichBolt {
- public static Logger LOG = LoggerFactory.getLogger(TransactionalSpoutBatchExecutor.class);
+ public static final Logger LOG = LoggerFactory.getLogger(TransactionalSpoutBatchExecutor.class);
BatchOutputCollectorImpl _collector;
ITransactionalSpout _spout;
ITransactionalSpout.Emitter _emitter;
- TreeMap<BigInteger, TransactionAttempt> _activeTransactions = new TreeMap<BigInteger, TransactionAttempt>();
+ TreeMap<BigInteger, TransactionAttempt> _activeTransactions = new TreeMap<>();
public TransactionalSpoutBatchExecutor(ITransactionalSpout spout) {
_spout = spout;
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/utils/LocalState.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/LocalState.java b/storm-core/src/jvm/backtype/storm/utils/LocalState.java
index b6ecba2..847fea4 100644
--- a/storm-core/src/jvm/backtype/storm/utils/LocalState.java
+++ b/storm-core/src/jvm/backtype/storm/utils/LocalState.java
@@ -42,7 +42,7 @@ import backtype.storm.generated.ThriftSerializedObject;
* Every read/write hits disk.
*/
public class LocalState {
- public static Logger LOG = LoggerFactory.getLogger(LocalState.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LocalState.class);
private VersionedStore _vs;
public LocalState(String backingDir) throws IOException {
@@ -65,7 +65,7 @@ public class LocalState {
}
private Map<String, TBase> deserializeLatestVersion() throws IOException {
- Map<String, TBase> result = new HashMap<String, TBase>();
+ Map<String, TBase> result = new HashMap<>();
TDeserializer td = new TDeserializer();
for (Map.Entry<String, ThriftSerializedObject> ent: partialDeserializeLatestVersion(td).entrySet()) {
result.put(ent.getKey(), deserialize(ent.getValue(), td));
@@ -87,7 +87,7 @@ public class LocalState {
private Map<String, ThriftSerializedObject> partialDeserializeLatestVersion(TDeserializer td) {
try {
String latestPath = _vs.mostRecentVersionPath();
- Map<String, ThriftSerializedObject> result = new HashMap<String, ThriftSerializedObject>();
+ Map<String, ThriftSerializedObject> result = new HashMap<>();
if (latestPath != null) {
byte[] serialized = FileUtils.readFileToByteArray(new File(latestPath));
if (serialized.length == 0) {
@@ -181,21 +181,7 @@ public class LocalState {
private ThriftSerializedObject serialize(TBase o, TSerializer ser) {
try {
- return new ThriftSerializedObject(o.getClass().getName(), ByteBuffer.wrap(ser.serialize((TBase)o)));
- } catch(Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- private void persist(Map<String, TBase> val, boolean cleanup) {
- try {
- TSerializer ser = new TSerializer();
- Map<String, ThriftSerializedObject> serialized = new HashMap<String, ThriftSerializedObject>();
- for (Map.Entry<String, TBase> ent: val.entrySet()) {
- Object o = ent.getValue();
- serialized.put(ent.getKey(), serialize(ent.getValue(), ser));
- }
- persistInternal(serialized, ser, cleanup);
+ return new ThriftSerializedObject(o.getClass().getName(), ByteBuffer.wrap(ser.serialize(o)));
} catch(Exception e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
index d1b2800..0b2d34e 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
@@ -36,12 +36,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ShellProcess implements Serializable {
- public static Logger LOG = LoggerFactory.getLogger(ShellProcess.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ShellProcess.class);
public static Logger ShellLogger;
private Process _subprocess;
private InputStream processErrorStream;
private String[] command;
- private Map<String, String> env = new HashMap<String, String>();
+ private Map<String, String> env = new HashMap<>();
public ISerializer serializer;
public Number pid;
public String componentName;
@@ -98,7 +98,7 @@ public class ShellProcess implements Serializable {
String serializer_className = (String)conf.get(Config.TOPOLOGY_MULTILANG_SERIALIZER);
LOG.info("Storm multilang serializer: " + serializer_className);
- ISerializer serializer = null;
+ ISerializer serializer;
try {
//create a factory class
Class klass = Class.forName(serializer_className);
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/utils/ShellUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/ShellUtils.java b/storm-core/src/jvm/backtype/storm/utils/ShellUtils.java
index 1065ff9..8595b71 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ShellUtils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ShellUtils.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
abstract public class ShellUtils {
- public static Logger LOG = LoggerFactory.getLogger(ShellUtils.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ShellUtils.class);
// OSType detection
public enum OSType {
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/backtype/storm/utils/Time.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Time.java b/storm-core/src/jvm/backtype/storm/utils/Time.java
index 6af7185..8aa871b 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Time.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Time.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
public class Time {
- public static Logger LOG = LoggerFactory.getLogger(Time.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Time.class);
private static AtomicBoolean simulating = new AtomicBoolean(false);
//TODO: should probably use weak references here or something
@@ -39,7 +39,7 @@ public class Time {
synchronized(sleepTimesLock) {
simulating.set(true);
simulatedCurrTimeMs = new AtomicLong(0);
- threadSleepTimes = new ConcurrentHashMap<Thread, AtomicLong>();
+ threadSleepTimes = new ConcurrentHashMap<>();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/storm/trident/spout/TridentSpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/spout/TridentSpoutExecutor.java b/storm-core/src/jvm/storm/trident/spout/TridentSpoutExecutor.java
index 6431426..63debdb 100644
--- a/storm-core/src/jvm/storm/trident/spout/TridentSpoutExecutor.java
+++ b/storm-core/src/jvm/storm/trident/spout/TridentSpoutExecutor.java
@@ -37,7 +37,7 @@ import storm.trident.topology.MasterBatchCoordinator;
import storm.trident.tuple.ConsList;
public class TridentSpoutExecutor implements ITridentBatchBolt {
- public static String ID_FIELD = "$tx";
+ public static final String ID_FIELD = "$tx";
public static Logger LOG = LoggerFactory.getLogger(TridentSpoutExecutor.class);
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java b/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java
index ec67af7..7210541 100644
--- a/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java
+++ b/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java
@@ -47,7 +47,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
import storm.trident.spout.IBatchID;
public class TridentBoltExecutor implements IRichBolt {
- public static String COORD_STREAM_PREFIX = "$coord-";
+ public static final String COORD_STREAM_PREFIX = "$coord-";
public static String COORD_STREAM(String batch) {
return COORD_STREAM_PREFIX + batch;
@@ -81,7 +81,7 @@ public class TridentBoltExecutor implements IRichBolt {
public static class CoordSpec implements Serializable {
public GlobalStreamId commitStream = null;
- public Map<String, CoordType> coords = new HashMap<String, CoordType>();
+ public Map<String, CoordType> coords = new HashMap<>();
public CoordSpec() {
}
@@ -317,7 +317,7 @@ public class TridentBoltExecutor implements IRichBolt {
}
IBatchID id = (IBatchID) tuple.getValue(0);
//get transaction id
- //if it already exissts and attempt id is greater than the attempt there
+ //if it already exists and attempt id is greater than the attempt there
TrackedBatch tracked = (TrackedBatch) _batches.get(id.getId());
http://git-wip-us.apache.org/repos/asf/storm/blob/6e29d270/storm-core/src/jvm/storm/trident/tuple/TridentTupleView.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/tuple/TridentTupleView.java b/storm-core/src/jvm/storm/trident/tuple/TridentTupleView.java
index 0be0c3f..04b554e 100644
--- a/storm-core/src/jvm/storm/trident/tuple/TridentTupleView.java
+++ b/storm-core/src/jvm/storm/trident/tuple/TridentTupleView.java
@@ -46,7 +46,7 @@ public class TridentTupleView extends AbstractList<Object> implements TridentTup
_parent = parent;
if(projectFields==null) projectFields = new Fields();
Map<String, ValuePointer> parentFieldIndex = parent.getFieldIndex();
- _fieldIndex = new HashMap<String, ValuePointer>();
+ _fieldIndex = new HashMap<>();
for(String f: projectFields) {
_fieldIndex.put(f, parentFieldIndex.get(f));
}
@@ -79,7 +79,7 @@ public class TridentTupleView extends AbstractList<Object> implements TridentTup
ValuePointer[] _index;
public FreshOutputFactory(Fields selfFields) {
- _fieldIndex = new HashMap<String, ValuePointer>();
+ _fieldIndex = new HashMap<>();
for(int i=0; i<selfFields.size(); i++) {
String field = selfFields.get(i);
_fieldIndex.put(field, new ValuePointer(0, i, field));
@@ -120,9 +120,9 @@ public class TridentTupleView extends AbstractList<Object> implements TridentTup
String field = selfFields.get(i);
_fieldIndex.put(field, new ValuePointer(myIndex, i, field));
}
- List<String> myOrder = new ArrayList<String>(parent.getOutputFields());
+ List<String> myOrder = new ArrayList<>(parent.getOutputFields());
- Set<String> parentFieldsSet = new HashSet<String>(myOrder);
+ Set<String> parentFieldsSet = new HashSet<>(myOrder);
for(String f: selfFields) {
if(parentFieldsSet.contains(f)) {
throw new IllegalArgumentException(
@@ -192,14 +192,14 @@ public class TridentTupleView extends AbstractList<Object> implements TridentTup
}
private static List<String> indexToFieldsList(ValuePointer[] index) {
- List<String> ret = new ArrayList<String>();
+ List<String> ret = new ArrayList<>();
for(ValuePointer p: index) {
ret.add(p.field);
}
return ret;
}
- public static TridentTupleView EMPTY_TUPLE = new TridentTupleView(null, new ValuePointer[0], new HashMap());
+ public static final TridentTupleView EMPTY_TUPLE = new TridentTupleView(null, new ValuePointer[0], new HashMap());
// index and fieldIndex are precomputed, delegates built up over many operations using persistent data structures
public TridentTupleView(IPersistentVector delegates, ValuePointer[] index, Map<String, ValuePointer> fieldIndex) {
[2/2] storm git commit: Added STORM-1153 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1153 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7edf5200
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7edf5200
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7edf5200
Branch: refs/heads/STORM-1153-V1
Commit: 7edf5200d4c9d9348f7af37ee4b17e5c5e1d492a
Parents: 6e29d27
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Nov 2 19:57:21 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Nov 2 19:57:21 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7edf5200/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 803281c..8adc5f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1153: Use static final instead of just static for class members.
* STORM-817: Kafka Wildcard Topic Support.
* STORM-40: Turn worker garbage collection and heapdump on by default.
* STORM-1152: Change map keySet iteration to entrySet iteration for efficiency.