You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/08/05 18:57:02 UTC
[1/6] storm git commit: STORM-2020: Stop using sun internal classes.
Repository: storm
Updated Branches:
refs/heads/master 23ec2f13b -> 44068c419
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/4263644b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4263644b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4263644b
Branch: refs/heads/master
Commit: 4263644bbe3155780e68fb5edff5945b2773df32
Parents: 23ec2f1
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Aug 4 10:43:02 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Aug 4 10:43:02 2016 -0500
----------------------------------------------------------------------
.../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/4263644b/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/4263644b/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index c495549..3c1ca03 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/4263644b/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);
}
}
[5/6] storm git commit: Merge branch 'STORM-2020' of
https://github.com/revans2/incubator-storm into STORM-2020
Posted by bo...@apache.org.
Merge branch 'STORM-2020' of https://github.com/revans2/incubator-storm into STORM-2020
STORM-2020: Stop using sun internal classes.
STORM-2021: Fix license.
STORM-2022: fix FieldsTest
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b49c60bf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b49c60bf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b49c60bf
Branch: refs/heads/master
Commit: b49c60bfb0723fd08f7defd88ec06b8daba8c827
Parents: 23ec2f1 ed46c89
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Aug 5 13:45:06 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Aug 5 13:45:06 2016 -0500
----------------------------------------------------------------------
.../apache/storm/hdfs/spout/TestHdfsSpout.java | 5 ++---
.../kinesis/spout/test/KinesisBoltTest.java | 17 +++++++++++++++++
.../kinesis/spout/test/KinesisSpoutTopology.java | 19 ++++++++++++++++++-
.../spout/test/TestRecordToTupleMapper.java | 17 +++++++++++++++++
external/storm-redis/pom.xml | 4 ++++
.../storm/redis/state/RedisKeyValueState.java | 18 ++++--------------
pom.xml | 4 ++++
.../jvm/org/apache/storm/tuple/FieldsTest.java | 2 +-
8 files changed, 67 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[4/6] storm git commit: STORM-2022: update Fields test to match new
behavior
Posted by bo...@apache.org.
STORM-2022: update Fields test to match new behavior
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ed46c898
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed46c898
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed46c898
Branch: refs/heads/master
Commit: ed46c8988b25dc4d832cdc8ac476508cc12e9732
Parents: ebddc47
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Aug 4 11:29:24 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Aug 4 11:29:24 2016 -0500
----------------------------------------------------------------------
storm-core/test/jvm/org/apache/storm/tuple/FieldsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ed46c898/storm-core/test/jvm/org/apache/storm/tuple/FieldsTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/tuple/FieldsTest.java b/storm-core/test/jvm/org/apache/storm/tuple/FieldsTest.java
index 6d0d79f..88af572 100644
--- a/storm-core/test/jvm/org/apache/storm/tuple/FieldsTest.java
+++ b/storm-core/test/jvm/org/apache/storm/tuple/FieldsTest.java
@@ -118,7 +118,7 @@ public class FieldsTest {
Assert.assertTrue(pickSecondAndFirst.equals(secondAndFirst));
}
- @Test(expected = NullPointerException.class)
+ @Test(expected = IllegalArgumentException.class)
public void selectingUnknownFieldThrowsTest() {
Fields fields = new Fields("foo", "bar");
fields.select(new Fields("bar", "baz"), Arrays.asList(new Object[]{"a", "b", "c"}));
[6/6] storm git commit: Added STORM-2020 STORM-2021 and STORM-2022 to
Changelog
Posted by bo...@apache.org.
Added STORM-2020 STORM-2021 and STORM-2022 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/44068c41
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/44068c41
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/44068c41
Branch: refs/heads/master
Commit: 44068c4191bf0890e81a5612fc989ba984d0a971
Parents: b49c60b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Aug 5 13:45:45 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Aug 5 13:45:45 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/44068c41/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80f3857..bdd4e71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
## 2.0.0
+ * STORM-2020: Stop using sun internal classes.
+ * STORM-2021: Fix license.
+ * STORM-2022: fix FieldsTest
* STORM-1285: port backtype.storm.command.get-errors to java
* STORM-2010: port org.apache.storm.command.heartbeats.clj to Java
* STORM-2009: port org.apache.storm.blobstore.clj and org.apache.storm.command.blobstore.clj to Java
[3/6] storm git commit: Addressed some review comments
Posted by bo...@apache.org.
Addressed some review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ebddc47d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ebddc47d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ebddc47d
Branch: refs/heads/master
Commit: ebddc47dba9448f7888fdc4e04c17a02fe4567e2
Parents: ff5a4dd
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Aug 4 11:24:08 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Aug 4 11:24:08 2016 -0500
----------------------------------------------------------------------
.../src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ebddc47d/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 67a3541..f60cbf3 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
@@ -703,12 +703,12 @@ public class TestHdfsSpout {
@Override
public void emitDirect(int arg0, String arg1, List<Object> arg2, Object arg3) {
- throw new RuntimeException("NOT Implemented");
+ throw new UnsupportedOperationException("NOT Implemented");
}
@Override
public void reportError(Throwable arg0) {
- throw new RuntimeException("NOT Implemented");
+ throw new UnsupportedOperationException("NOT Implemented");
}
@Override
[2/6] storm git commit: STORM-2021: Fix License
Posted by bo...@apache.org.
STORM-2021: Fix License
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ff5a4dd2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ff5a4dd2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ff5a4dd2
Branch: refs/heads/master
Commit: ff5a4dd2895d707b509be4aafdf14c2c2eba74d6
Parents: 4263644
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Aug 4 11:09:59 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Aug 4 11:09:59 2016 -0500
----------------------------------------------------------------------
.../kinesis/spout/test/KinesisBoltTest.java | 17 +++++++++++++++++
.../kinesis/spout/test/KinesisSpoutTopology.java | 19 ++++++++++++++++++-
.../spout/test/TestRecordToTupleMapper.java | 17 +++++++++++++++++
pom.xml | 4 ++++
4 files changed, 56 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ff5a4dd2/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
index 1894934..a2adb9d 100644
--- a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
+++ b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisBoltTest.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.storm.kinesis.spout.test;
import org.apache.storm.task.OutputCollector;
http://git-wip-us.apache.org/repos/asf/storm/blob/ff5a4dd2/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisSpoutTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisSpoutTopology.java b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisSpoutTopology.java
index 2a39463..7028e3e 100644
--- a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisSpoutTopology.java
+++ b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/KinesisSpoutTopology.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.storm.kinesis.spout.test;
import com.amazonaws.ClientConfiguration;
@@ -37,4 +54,4 @@ public class KinesisSpoutTopology {
topologyConfig.setNumWorkers(3);
StormSubmitter.submitTopology(topologyName, topologyConfig, topologyBuilder.createTopology());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/ff5a4dd2/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/TestRecordToTupleMapper.java
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/TestRecordToTupleMapper.java b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/TestRecordToTupleMapper.java
index 03e024a..2879c3e 100644
--- a/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/TestRecordToTupleMapper.java
+++ b/external/storm-kinesis/src/test/java/org/apache/storm/kinesis/spout/test/TestRecordToTupleMapper.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.storm.kinesis.spout.test;
import com.amazonaws.services.kinesis.model.Record;
http://git-wip-us.apache.org/repos/asf/storm/blob/ff5a4dd2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 459a3bb..763b696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,6 +348,10 @@
<!-- exclude intellij projects -->
<exclude>**/*.iml</exclude>
<exclude>**/.idea/**</exclude>
+ <!-- exclude eclipse projects -->
+ <exclude>**/*.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
<!-- module specific testing artifacts -->
<exclude>**/metastore_db/**</exclude>
<!-- anything written into build should be ignored -->