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 2015/11/17 16:46:21 UTC
[4/6] storm git commit: add apache license header
add apache license header
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/532a5944
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/532a5944
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/532a5944
Branch: refs/heads/master
Commit: 532a594426c686da38aeab5179c0369cbd2892f1
Parents: 1496f27
Author: wangjiasheng <wa...@xiaomi.com>
Authored: Tue Nov 17 11:35:22 2015 +0800
Committer: wangjiasheng <wa...@xiaomi.com>
Committed: Tue Nov 17 11:35:22 2015 +0800
----------------------------------------------------------------------
.../jvm/storm/trident/graph/GraphGrouper.java | 2 +-
.../jvm/storm/trident/TestTridentTopology.java | 24 +++++++++++++++-----
2 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/532a5944/storm-core/src/jvm/storm/trident/graph/GraphGrouper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/graph/GraphGrouper.java b/storm-core/src/jvm/storm/trident/graph/GraphGrouper.java
index 37f00a5..671498e 100644
--- a/storm-core/src/jvm/storm/trident/graph/GraphGrouper.java
+++ b/storm-core/src/jvm/storm/trident/graph/GraphGrouper.java
@@ -31,7 +31,7 @@ public class GraphGrouper {
public GraphGrouper(DirectedGraph<Node, IndexedEdge> graph, Collection<Group> initialGroups) {
this.graph = graph;
- this.currGroups = new LinkedHashSet(initialGroups);
+ this.currGroups = new LinkedHashSet<>(initialGroups);
reindex();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/532a5944/storm-core/test/jvm/storm/trident/TestTridentTopology.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/storm/trident/TestTridentTopology.java b/storm-core/test/jvm/storm/trident/TestTridentTopology.java
index 2c8910e..0b0218a 100644
--- a/storm-core/test/jvm/storm/trident/TestTridentTopology.java
+++ b/storm-core/test/jvm/storm/trident/TestTridentTopology.java
@@ -1,3 +1,21 @@
+/**
+ * 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 storm.trident;
import backtype.storm.generated.Bolt;
@@ -7,20 +25,14 @@ import backtype.storm.tuple.Values;
import org.junit.Assert;
import org.junit.Test;
import storm.trident.operation.builtin.Count;
-import storm.trident.operation.builtin.FilterNull;
import storm.trident.operation.builtin.Sum;
-import storm.trident.operation.impl.FilterExecutor;
import storm.trident.testing.FixedBatchSpout;
import storm.trident.testing.Split;
import storm.trident.testing.StringLength;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-/**
- * Created by jiasheng on 15-8-25.
- */
public class TestTridentTopology {
private StormTopology buildTopology() {