Repository: storm Updated Branches: refs/heads/nimbus-ha-branch a11fcc303 -> 765e4c2fa
http://git-wip-us.apache.org/repos/asf/storm/blob/f7c0bf8a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java ---------------------------------------------------------------------- diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java index 31434dc..ddb6939 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisCluster.java @@ -23,11 +23,11 @@ import backtype.storm.StormSubmitter; import backtype.storm.generated.StormTopology; import backtype.storm.tuple.Fields; import backtype.storm.tuple.Values; -import org.apache.storm.redis.trident.mapper.TridentTupleMapper; +import org.apache.storm.redis.common.mapper.TupleMapper; import org.apache.storm.redis.trident.state.RedisClusterState; import org.apache.storm.redis.trident.state.RedisClusterStateQuerier; import org.apache.storm.redis.trident.state.RedisClusterStateUpdater; -import org.apache.storm.redis.util.config.JedisClusterConfig; +import org.apache.storm.redis.common.config.JedisClusterConfig; import storm.trident.Stream; import storm.trident.TridentState; import storm.trident.TridentTopology; @@ -55,7 +55,7 @@ public class WordCountTridentRedisCluster { } JedisClusterConfig clusterConfig = new JedisClusterConfig.Builder().setNodes(nodes) .build(); - TridentTupleMapper tupleMapper = new WordCountTupleMapper(); + TupleMapper tupleMapper = new WordCountTupleMapper(); RedisClusterState.Factory factory = new RedisClusterState.Factory(clusterConfig); TridentTopology topology = new TridentTopology(); http://git-wip-us.apache.org/repos/asf/storm/blob/f7c0bf8a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java ---------------------------------------------------------------------- diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java index e9ae54d..de1f252 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisClusterMap.java @@ -23,11 +23,9 @@ import backtype.storm.StormSubmitter; import backtype.storm.generated.StormTopology; import backtype.storm.tuple.Fields; import backtype.storm.tuple.Values; -import org.apache.storm.redis.trident.mapper.TridentTupleMapper; +import org.apache.storm.redis.common.mapper.TupleMapper; import org.apache.storm.redis.trident.state.RedisClusterMapState; -import org.apache.storm.redis.trident.state.RedisClusterStateUpdater; -import org.apache.storm.redis.trident.state.RedisStateQuerier; -import org.apache.storm.redis.util.config.JedisClusterConfig; +import org.apache.storm.redis.common.config.JedisClusterConfig; import storm.trident.Stream; import storm.trident.TridentState; import storm.trident.TridentTopology; @@ -58,7 +56,7 @@ public class WordCountTridentRedisClusterMap { } JedisClusterConfig clusterConfig = new JedisClusterConfig.Builder().setNodes(nodes) .build(); - TridentTupleMapper tupleMapper = new WordCountTupleMapper(); + TupleMapper tupleMapper = new WordCountTupleMapper(); StateFactory factory = RedisClusterMapState.transactional(clusterConfig); TridentTopology topology = new TridentTopology(); http://git-wip-us.apache.org/repos/asf/storm/blob/f7c0bf8a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisMap.java ---------------------------------------------------------------------- diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisMap.java b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisMap.java index b096e55..4d4afe8 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisMap.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTridentRedisMap.java @@ -23,12 +23,9 @@ import backtype.storm.StormSubmitter; import backtype.storm.generated.StormTopology; import backtype.storm.tuple.Fields; import backtype.storm.tuple.Values; -import org.apache.storm.redis.trident.mapper.TridentTupleMapper; +import org.apache.storm.redis.common.mapper.TupleMapper; import org.apache.storm.redis.trident.state.RedisMapState; -import org.apache.storm.redis.trident.state.RedisState; -import org.apache.storm.redis.trident.state.RedisStateQuerier; -import org.apache.storm.redis.trident.state.RedisStateUpdater; -import org.apache.storm.redis.util.config.JedisPoolConfig; +import org.apache.storm.redis.common.config.JedisPoolConfig; import storm.trident.Stream; import storm.trident.TridentState; import storm.trident.TridentTopology; @@ -51,7 +48,7 @@ public class WordCountTridentRedisMap { JedisPoolConfig poolConfig = new JedisPoolConfig.Builder() .setHost(redisHost).setPort(redisPort) .build(); - TridentTupleMapper tupleMapper = new WordCountTupleMapper(); + TupleMapper tupleMapper = new WordCountTupleMapper(); StateFactory factory = RedisMapState.transactional(poolConfig); TridentTopology topology = new TridentTopology(); http://git-wip-us.apache.org/repos/asf/storm/blob/f7c0bf8a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTupleMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTupleMapper.java b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTupleMapper.java index 6454c9e..1e601c9 100644 --- a/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTupleMapper.java +++ b/external/storm-redis/src/test/java/org/apache/storm/redis/trident/WordCountTupleMapper.java @@ -1,16 +1,16 @@ package org.apache.storm.redis.trident; -import org.apache.storm.redis.trident.mapper.TridentTupleMapper; -import storm.trident.tuple.TridentTuple; +import backtype.storm.tuple.ITuple; +import org.apache.storm.redis.common.mapper.TupleMapper; -public class WordCountTupleMapper implements TridentTupleMapper { +public class WordCountTupleMapper implements TupleMapper { @Override - public String getKeyFromTridentTuple(TridentTuple tuple) { + public String getKeyFromTuple(ITuple tuple) { return tuple.getString(0); } @Override - public String getValueFromTridentTuple(TridentTuple tuple) { + public String getValueFromTuple(ITuple tuple) { return tuple.getInteger(1).toString(); } }
