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 2017/05/18 14:08:30 UTC
[03/13] storm git commit: STORM-2477: Result of transforming the code
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
index 74a9bb0..09c14ba 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/LeaderElectorImp.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicReference;
public class LeaderElectorImp implements ILeaderElector {
private static Logger LOG = LoggerFactory.getLogger(LeaderElectorImp.class);
- private final Map conf;
+ private final Map<String, Object> conf;
private final List<String> servers;
private final CuratorFramework zk;
private final String leaderlockPath;
@@ -45,7 +45,7 @@ public class LeaderElectorImp implements ILeaderElector {
private final AtomicReference<LeaderLatchListener> leaderLatchListener;
private final BlobStore blobStore;
- public LeaderElectorImp(Map conf, List<String> servers, CuratorFramework zk, String leaderlockPath, String id, AtomicReference<LeaderLatch> leaderLatch,
+ public LeaderElectorImp(Map<String, Object> conf, List<String> servers, CuratorFramework zk, String leaderlockPath, String id, AtomicReference<LeaderLatch> leaderLatch,
AtomicReference<LeaderLatchListener> leaderLatchListener, BlobStore blobStore) {
this.conf = conf;
this.servers = servers;
@@ -58,7 +58,7 @@ public class LeaderElectorImp implements ILeaderElector {
}
@Override
- public void prepare(Map conf) {
+ public void prepare(Map<String, Object> conf) {
// no-op for zookeeper implementation
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java b/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
index 2569573..4979588 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/Zookeeper.java
@@ -124,7 +124,7 @@ public class Zookeeper {
}
// Leader latch listener that will be invoked when we either gain or lose leadership
- public static LeaderLatchListener leaderLatchListenerImpl(final Map conf, final CuratorFramework zk, final BlobStore blobStore, final LeaderLatch leaderLatch) throws UnknownHostException {
+ public static LeaderLatchListener leaderLatchListenerImpl(final Map<String, Object> conf, final CuratorFramework zk, final BlobStore blobStore, final LeaderLatch leaderLatch) throws UnknownHostException {
final String hostName = InetAddress.getLocalHost().getCanonicalHostName();
return new LeaderLatchListener() {
final String STORM_JAR_SUFFIX = "-stormjar.jar";
@@ -241,11 +241,11 @@ public class Zookeeper {
};
}
- public static ILeaderElector zkLeaderElector(Map conf, BlobStore blobStore) throws UnknownHostException {
+ public static ILeaderElector zkLeaderElector(Map<String, Object> conf, BlobStore blobStore) throws UnknownHostException {
return _instance.zkLeaderElectorImpl(conf, blobStore);
}
- protected ILeaderElector zkLeaderElectorImpl(Map conf, BlobStore blobStore) throws UnknownHostException {
+ protected ILeaderElector zkLeaderElectorImpl(Map<String, Object> conf, BlobStore blobStore) throws UnknownHostException {
List<String> servers = (List<String>) conf.get(Config.STORM_ZOOKEEPER_SERVERS);
Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
CuratorFramework zk = ClientZookeeper.mkClient(conf, servers, port, "", new DefaultWatcherCallBack(), conf);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/MessagingTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/MessagingTest.java b/storm-server/src/test/java/org/apache/storm/MessagingTest.java
index 2f348d8..5686bc3 100644
--- a/storm-server/src/test/java/org/apache/storm/MessagingTest.java
+++ b/storm-server/src/test/java/org/apache/storm/MessagingTest.java
@@ -35,13 +35,13 @@ public class MessagingTest {
@Test
public void testLocalTransport() throws Exception {
- Config stormConf = new Config();
- stormConf.put(Config.TOPOLOGY_WORKERS, 2);
- stormConf.put(Config.STORM_MESSAGING_TRANSPORT , "org.apache.storm.messaging.netty.Context");
+ Config topoConf = new Config();
+ topoConf.put(Config.TOPOLOGY_WORKERS, 2);
+ topoConf.put(Config.STORM_MESSAGING_TRANSPORT , "org.apache.storm.messaging.netty.Context");
try (ILocalCluster cluster = new LocalCluster.Builder().withSimulatedTime()
.withSupervisors(1).withPortsPerSupervisor(2)
- .withDaemonConf(stormConf).build()) {
+ .withDaemonConf(topoConf).build()) {
TopologyBuilder builder = new TopologyBuilder();
builder.setSpout("1", new TestWordSpout(true), 2);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/TestCgroups.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/TestCgroups.java b/storm-server/src/test/java/org/apache/storm/TestCgroups.java
index 2eeec5d..0a57cc5 100644
--- a/storm-server/src/test/java/org/apache/storm/TestCgroups.java
+++ b/storm-server/src/test/java/org/apache/storm/TestCgroups.java
@@ -100,12 +100,12 @@ public class TestCgroups {
Assert.assertFalse("Make sure cgroup was removed properly", dirExists(pathToWorkerCgroupDir));
}
- private boolean stormCgroupHierarchyExists(Map config) {
+ private boolean stormCgroupHierarchyExists(Map<String, Object> config) {
String pathToStormCgroupHierarchy = (String) config.get(Config.STORM_CGROUP_HIERARCHY_DIR);
return dirExists(pathToStormCgroupHierarchy);
}
- private boolean stormCgroupSupervisorRootDirExists(Map config) {
+ private boolean stormCgroupSupervisorRootDirExists(Map<String, Object> config) {
String pathTostormCgroupSupervisorRootDir = ((String) config.get(Config.STORM_CGROUP_HIERARCHY_DIR))
+ "/" + ((String) config.get(DaemonConfig.STORM_SUPERVISOR_CGROUP_ROOTDIR));
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
index 503bd2a..2ee9a0c 100644
--- a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
+++ b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java
@@ -43,11 +43,11 @@ public class TickTupleTest {
try {
cluster = new LocalCluster.Builder().withSimulatedTime().withNimbusDaemon(true).build();
StormTopology topology = createNoOpTopology();
- Config stormConf = new Config();
- stormConf.putAll(Utils.readDefaultConfig());
- stormConf.put("storm.cluster.mode", "local");
- stormConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, 1);
- cluster.submitTopology("test", stormConf, topology);
+ Config topoConf = new Config();
+ topoConf.putAll(Utils.readDefaultConfig());
+ topoConf.put("storm.cluster.mode", "local");
+ topoConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, 1);
+ cluster.submitTopology("test", topoConf, topology);
cluster.advanceClusterTime(2);
Assert.assertTrue("Test is passed", true);
} finally {
@@ -64,7 +64,7 @@ public class TickTupleTest {
}
@Override
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
}
@Override
@@ -79,7 +79,7 @@ public class TickTupleTest {
private BaseRichBolt makeNoOpBolt() {
return new BaseRichBolt() {
@Override
- public void prepare(Map conf, TopologyContext topologyContext, OutputCollector outputCollector) {}
+ public void prepare(Map<String, Object> conf, TopologyContext topologyContext, OutputCollector outputCollector) {}
@Override
public void execute(Tuple tuple) {}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
index a1804bc..07333d8 100644
--- a/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
+++ b/storm-server/src/test/java/org/apache/storm/blobstore/BlobStoreTest.java
@@ -57,7 +57,7 @@ public class BlobStoreTest {
private static final Logger LOG = LoggerFactory.getLogger(BlobStoreTest.class);
URI base;
File baseFile;
- private static Map conf = new HashMap();
+ private static Map<String, Object> conf = new HashMap();
public static final int READ = 0x01;
public static final int WRITE = 0x02;
public static final int ADMIN = 0x04;
@@ -146,7 +146,7 @@ public class BlobStoreTest {
Mockito.doNothing().when(spy).checkForBlobUpdate("test-empty-subject-WE");
Mockito.doNothing().when(spy).checkForBlobUpdate("test-empty-subject-DEF");
Mockito.doNothing().when(spy).checkForBlobUpdate("test-empty-acls");
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
conf.put(Config.STORM_LOCAL_DIR, baseFile.getAbsolutePath());
conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"org.apache.storm.security.auth.DefaultPrincipalToLocal");
spy.prepare(conf, null, null);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java b/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
index 40201a8..c9f2825 100644
--- a/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
+++ b/storm-server/src/test/java/org/apache/storm/blobstore/BlobSynchronizerTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
public class BlobSynchronizerTest {
private URI base;
private File baseFile;
- private static Map conf = new HashMap();
+ private static Map<String, Object> conf = new HashMap();
private NIOServerCnxnFactory factory;
@Before
@@ -71,7 +71,7 @@ public class BlobSynchronizerTest {
private LocalFsBlobStore initLocalFs() {
LocalFsBlobStore store = new LocalFsBlobStore();
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
conf.put(Config.STORM_LOCAL_DIR, baseFile.getAbsolutePath());
conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"org.apache.storm.security.auth.DefaultPrincipalToLocal");
this.conf = conf;
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java b/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
index 8596602..5814c43 100644
--- a/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
+++ b/storm-server/src/test/java/org/apache/storm/localizer/LocalizerTest.java
@@ -63,7 +63,7 @@ public class LocalizerTest {
class TestLocalizer extends Localizer {
- TestLocalizer(Map conf, String baseDir) {
+ TestLocalizer(Map<String, Object> conf, String baseDir) {
super(conf, baseDir);
}
@@ -143,7 +143,7 @@ public class LocalizerTest {
@Test
public void testDirPaths() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
Localizer localizer = new TestLocalizer(conf, baseDir.toString());
String expectedDir = constructUserCacheDir(baseDir.toString(), user1);
@@ -157,7 +157,7 @@ public class LocalizerTest {
@Test
public void testReconstruct() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
String expectedFileDir1 = constructExpectedFilesDir(baseDir.toString(), user1);
String expectedArchiveDir1 = constructExpectedArchivesDir(baseDir.toString(), user1);
@@ -271,7 +271,7 @@ public class LocalizerTest {
supportSymlinks = false;
}
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -348,7 +348,7 @@ public class LocalizerTest {
@Test
public void testBasic() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -415,7 +415,7 @@ public class LocalizerTest {
@Test
public void testMultipleKeysOneUser() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -504,7 +504,7 @@ public class LocalizerTest {
@Test(expected = AuthorizationException.class)
public void testFailAcls() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60 * 60 * 1000);
@@ -528,7 +528,7 @@ public class LocalizerTest {
@Test(expected = KeyNotFoundException.class)
public void testKeyNotFoundException() throws Exception {
- Map conf = Utils.readStormConfig();
+ Map<String, Object> conf = Utils.readStormConfig();
String key1 = "key1";
conf.put(Config.STORM_LOCAL_DIR, "target");
LocalFsBlobStore bs = new LocalFsBlobStore();
@@ -541,7 +541,7 @@ public class LocalizerTest {
@Test
public void testMultipleUsers() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
@@ -625,7 +625,7 @@ public class LocalizerTest {
@Test
public void testUpdate() throws Exception {
- Map conf = new HashMap();
+ Map<String, Object> conf = new HashMap();
// set clean time really high so doesn't kick in
conf.put(DaemonConfig.SUPERVISOR_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS, 60*60*1000);
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java b/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
index b8b3afd..0d7b520 100644
--- a/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
+++ b/storm-server/src/test/java/org/apache/storm/metric/ClusterMetricsConsumerExecutorTest.java
@@ -130,4 +130,4 @@ public class ClusterMetricsConsumerExecutorTest {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
index b0430a0..4a1152e 100644
--- a/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
+++ b/storm-server/src/test/java/org/apache/storm/nimbus/LocalNimbusTest.java
@@ -51,18 +51,18 @@ public class LocalNimbusTest {
localClusterConf.put("nimbus-daemon", true);
ILocalCluster localCluster = Testing.getLocalCluster(localClusterConf);
- Config stormConf = new Config();
- stormConf.putAll(Utils.readDefaultConfig());
- stormConf.setDebug(true);
- stormConf.put("storm.cluster.mode", "local"); // default is aways "distributed" but here local cluster is being used.
- stormConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN, InmemoryTopologySubmitterHook.class.getName());
+ Config topoConf = new Config();
+ topoConf.putAll(Utils.readDefaultConfig());
+ topoConf.setDebug(true);
+ topoConf.put("storm.cluster.mode", "local"); // default is aways "distributed" but here local cluster is being used.
+ topoConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN, InmemoryTopologySubmitterHook.class.getName());
List<TopologyDetails> topologyNames =new ArrayList<>();
for (int i=0; i<4; i++) {
final String topologyName = "word-count-"+ UUID.randomUUID().toString();
final StormTopology stormTopology = createTestTopology();
topologyNames.add(new TopologyDetails(topologyName, stormTopology));
- localCluster.submitTopology(topologyName, stormConf, stormTopology);
+ localCluster.submitTopology(topologyName, topoConf, stormTopology);
}
Assert.assertEquals(InmemoryTopologySubmitterHook.submittedTopologies, topologyNames);
@@ -87,7 +87,7 @@ public class LocalNimbusTest {
public static final List<TopologyDetails> submittedTopologies = new ArrayList<>();
@Override
- public void notify(TopologyInfo topologyInfo, Map stormConf, StormTopology topology) throws IllegalAccessException {
+ public void notify(TopologyInfo topologyInfo, Map<String, Object> topoConf, StormTopology topology) throws IllegalAccessException {
submittedTopologies.add(new TopologyDetails(topologyInfo.get_name(), topology));
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
index bc69725..ba17ce3 100644
--- a/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
+++ b/storm-server/src/test/java/org/apache/storm/scheduler/resource/TestUtilsForResourceAwareScheduler.java
@@ -140,7 +140,7 @@ public class TestUtilsForResourceAwareScheduler {
return retMap;
}
- public static TopologyDetails getTopology(String name, Map config, int numSpout, int numBolt,
+ public static TopologyDetails getTopology(String name, Map<String, Object> config, int numSpout, int numBolt,
int spoutParallelism, int boltParallelism, int launchTime, int priority) {
Config conf = new Config();
@@ -191,7 +191,7 @@ public class TestUtilsForResourceAwareScheduler {
_isDistributed = isDistributed;
}
- public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
_collector = collector;
}
@@ -232,7 +232,7 @@ public class TestUtilsForResourceAwareScheduler {
OutputCollector _collector;
@Override
- public void prepare(Map conf, TopologyContext context,
+ public void prepare(Map<String, Object> conf, TopologyContext context,
OutputCollector collector) {
_collector = collector;
}
@@ -250,7 +250,7 @@ public class TestUtilsForResourceAwareScheduler {
public static class INimbusTest implements INimbus {
@Override
- public void prepare(Map stormConf, String schedulerLocalDir) {
+ public void prepare(Map<String, Object> topoConf, String schedulerLocalDir) {
}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
index 300a202..26cd124 100644
--- a/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
+++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java
@@ -159,4 +159,4 @@ public class DependencyResolverMain {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
index a0b7146..e1e8ca5 100644
--- a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
+++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/AetherUtils.java
@@ -88,4 +88,4 @@ public class AetherUtils {
return new RemoteRepository.Builder(parts[0], "default", parts[1]).build();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
index a2241fa..4834107 100644
--- a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
+++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/DependencyResolver.java
@@ -95,4 +95,4 @@ public class DependencyResolver {
return system.resolveDependencies(session, dependencyRequest).getArtifactResults();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
index 5b5ce3e..cb8325d 100644
--- a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
+++ b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/AetherUtilsTest.java
@@ -99,4 +99,4 @@ public class AetherUtilsTest {
assertEquals("org.apache.storm:storm-core:jar:1.0.0", ret);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
----------------------------------------------------------------------
diff --git a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
index 8f7b750..a28a66e 100644
--- a/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
+++ b/storm-submit-tools/src/test/java/org/apache/storm/submit/dependency/DependencyResolverTest.java
@@ -80,4 +80,4 @@ public class DependencyResolverTest {
throw new AssertionError("Result doesn't contain expected artifact > " + groupId + ":" + artifactId + ":" + version);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
index da77a49..b209abb 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/webapp/DRPCApplication.java
@@ -44,4 +44,4 @@ public class DRPCApplication extends Application {
public static void setup(DRPC drpc) {
_drpc = drpc;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/64e29f36/transform.sh
----------------------------------------------------------------------
diff --git a/transform.sh b/transform.sh
deleted file mode 100755
index 4abfeee..0000000
--- a/transform.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-
-find . -iname \*.java | xargs sed -i .back \
- -e 's/stormConf/topoConf/g' \
- -e 's/storm_conf/topoConf/g' \
- -e 's/topology_conf/topoConf/g' \
- -e 's/Map topoConf/Map<String, Object> topoConf/g' \
- -e 's/Map topologyConf/Map<String, Object> topologyConf/g' \
- -e 's/Map conf/Map<String, Object> conf/g' \
- -e 's/Map<String, *String> topoConf/Map<String, Object> topoConf/g' \
- -e 's/Map<String, *String> conf/Map<String, Object> conf/g' \
- -e 's/Map<String, *?> topoConf/Map<String, Object> topoConf/g' \
- -e 's/Map<String, *?> conf/Map<String, Object> conf/g' \
- -e 's/Map<Object, *Object> conf/Map<String, Object> conf/g' \
- -e 's/conf = new HashMap<String, *String>/conf = new HashMap<>/g'
-find . -iname \*.java.back | xargs rm -f