You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2016/12/30 08:44:44 UTC
[04/12] storm git commit: STORM-2020: Stop using sun internal classes.
STORM-2020: Stop using sun internal classes.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d3a90d5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d3a90d5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d3a90d5
Branch: refs/heads/1.x-branch
Commit: 6d3a90d53ea425881b8b3c20a52932c7977bbccc
Parents: cdf8015
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Aug 4 10:43:02 2016 -0500
Committer: Balazs Kossovics <ba...@s4m.io>
Committed: Fri Dec 2 11:38:03 2016 +0100
----------------------------------------------------------------------
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 5 ++---
external/storm-redis/pom.xml | 4 ++++
.../storm/redis/state/RedisKeyValueState.java | 18 ++++--------------
3 files changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6d3a90d5/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
index df26545..67a3541 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
@@ -57,7 +57,6 @@ import java.util.List;
import java.util.Map;
import org.apache.storm.hdfs.common.HdfsUtils.Pair;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
public class TestHdfsSpout {
@@ -704,12 +703,12 @@ public class TestHdfsSpout {
@Override
public void emitDirect(int arg0, String arg1, List<Object> arg2, Object arg3) {
- throw new NotImplementedException();
+ throw new RuntimeException("NOT Implemented");
}
@Override
public void reportError(Throwable arg0) {
- throw new NotImplementedException();
+ throw new RuntimeException("NOT Implemented");
}
@Override
http://git-wip-us.apache.org/repos/asf/storm/blob/6d3a90d5/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index 470e2d5..60b7bbf 100644
--- a/external/storm-redis/pom.xml
+++ b/external/storm-redis/pom.xml
@@ -52,6 +52,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
http://git-wip-us.apache.org/repos/asf/storm/blob/6d3a90d5/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
index 6d690d4..8769cb0 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
@@ -26,10 +26,8 @@ import org.apache.storm.redis.common.container.JedisCommandsInstanceContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.JedisCommands;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64;
-import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -42,9 +40,7 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> {
private static final Logger LOG = LoggerFactory.getLogger(RedisKeyValueState.class);
private static final String COMMIT_TXID_KEY = "commit";
private static final String PREPARE_TXID_KEY = "prepare";
-
- private final BASE64Encoder base64Encoder;
- private final BASE64Decoder base64Decoder;
+
private final String namespace;
private final String prepareNamespace;
private final String txidNamespace;
@@ -69,8 +65,6 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> {
public RedisKeyValueState(String namespace, JedisCommandsInstanceContainer jedisContainer,
Serializer<K> keySerializer, Serializer<V> valueSerializer) {
- base64Encoder = new BASE64Encoder();
- base64Decoder = new BASE64Decoder();
this.namespace = namespace;
this.prepareNamespace = namespace + "$prepare";
this.txidNamespace = namespace + "$txid";
@@ -297,14 +291,10 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> {
}
private String encode(byte[] bytes) {
- return base64Encoder.encode(bytes);
+ return Base64.encodeBase64String(bytes);
}
private byte[] decode(String s) {
- try {
- return base64Decoder.decodeBuffer(s);
- } catch (IOException ex) {
- throw new RuntimeException("Error while decoding string " + s);
- }
+ return Base64.decodeBase64(s);
}
}