more fixes for java check style (#517)
* more fixes for java check style
* yet another check style fix
* more check style fixes
* when method signature does not fit in one line, each parameter goes into a single line
diff --git a/heron/api/src/java/com/twitter/heron/api/Config.java b/heron/api/src/java/com/twitter/heron/api/Config.java
index 6c0c1a7..0a99870 100644
--- a/heron/api/src/java/com/twitter/heron/api/Config.java
+++ b/heron/api/src/java/com/twitter/heron/api/Config.java
@@ -292,7 +292,10 @@
}
}
- public static void setComponentJvmOptions(Map<String, Object> conf, String component, String jvmOptions) {
+ public static void setComponentJvmOptions(
+ Map<String, Object> conf,
+ String component,
+ String jvmOptions) {
String optsBase64;
String componentBase64;
diff --git a/heron/api/src/java/com/twitter/heron/api/bolt/BasicBoltExecutor.java b/heron/api/src/java/com/twitter/heron/api/bolt/BasicBoltExecutor.java
index 3c23f4e..7674679 100644
--- a/heron/api/src/java/com/twitter/heron/api/bolt/BasicBoltExecutor.java
+++ b/heron/api/src/java/com/twitter/heron/api/bolt/BasicBoltExecutor.java
@@ -39,7 +39,10 @@
@Override
- public void prepare(Map<String, Object> heronConf, TopologyContext context, OutputCollector aCollector) {
+ public void prepare(
+ Map<String, Object> heronConf,
+ TopologyContext context,
+ OutputCollector aCollector) {
bolt.prepare(heronConf, context);
collector = new BasicOutputCollector(aCollector);
}
diff --git a/heron/examples/src/java/com/twitter/heron/examples/AckingTopology.java b/heron/examples/src/java/com/twitter/heron/examples/AckingTopology.java
index ce4cb0b..953da9f 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/AckingTopology.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/AckingTopology.java
@@ -75,7 +75,10 @@
public AckingTestWordSpout() {
}
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector acollector) {
+ public void open(
+ Map<String, Object> conf,
+ TopologyContext context,
+ SpoutOutputCollector acollector) {
collector = acollector;
words = new String[]{"nathan", "mike", "jackson", "golda", "bertels"};
rand = new Random();
@@ -112,7 +115,8 @@
private long startTime;
@Override
- public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector acollector) {
+ public void prepare(Map<String, Object> conf, TopologyContext context,
+ OutputCollector acollector) {
collector = acollector;
nItems = 0;
startTime = System.currentTimeMillis();
diff --git a/heron/examples/src/java/com/twitter/heron/examples/ComponentJVMOptionsTopology.java b/heron/examples/src/java/com/twitter/heron/examples/ComponentJVMOptionsTopology.java
index 21625bc..e5e4b33 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/ComponentJVMOptionsTopology.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/ComponentJVMOptionsTopology.java
@@ -75,7 +75,10 @@
private long startTime;
@Override
- public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(
+ Map<String, Object> conf,
+ TopologyContext context,
+ OutputCollector collector) {
nItems = 0;
startTime = System.currentTimeMillis();
}
diff --git a/heron/examples/src/java/com/twitter/heron/examples/CustomGroupingTopology.java b/heron/examples/src/java/com/twitter/heron/examples/CustomGroupingTopology.java
index b147dc2..2a5cd0e 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/CustomGroupingTopology.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/CustomGroupingTopology.java
@@ -56,7 +56,10 @@
private long nItems;
@Override
- public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector acollector) {
+ public void prepare(
+ Map<String, Object> conf,
+ TopologyContext context,
+ OutputCollector acollector) {
nItems = 0;
}
diff --git a/heron/examples/src/java/com/twitter/heron/examples/ExclamationTopology.java b/heron/examples/src/java/com/twitter/heron/examples/ExclamationTopology.java
index 93678e0..5ee0c94 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/ExclamationTopology.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/ExclamationTopology.java
@@ -71,7 +71,10 @@
private long startTime;
@Override
- public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector collector) {
+ public void prepare(
+ Map<String, Object> conf,
+ TopologyContext context,
+ OutputCollector collector) {
nItems = 0;
startTime = System.currentTimeMillis();
}
diff --git a/heron/examples/src/java/com/twitter/heron/examples/MultiStageAckingTopology.java b/heron/examples/src/java/com/twitter/heron/examples/MultiStageAckingTopology.java
index b35d282..e167c9a 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/MultiStageAckingTopology.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/MultiStageAckingTopology.java
@@ -75,7 +75,10 @@
public AckingTestWordSpout() {
}
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector acollector) {
+ public void open(
+ Map<String, Object> conf,
+ TopologyContext context,
+ SpoutOutputCollector acollector) {
collector = acollector;
words = new String[]{"nathan", "mike", "jackson", "golda", "bertels"};
rand = new Random();
@@ -115,7 +118,10 @@
}
@Override
- public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector acollector) {
+ public void prepare(
+ Map<String, Object> conf,
+ TopologyContext context,
+ OutputCollector acollector) {
collector = acollector;
nItems = 0;
startTime = System.currentTimeMillis();
diff --git a/heron/examples/src/java/com/twitter/heron/examples/TaskHookTopology.java b/heron/examples/src/java/com/twitter/heron/examples/TaskHookTopology.java
index c588af6..95eefce 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/TaskHookTopology.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/TaskHookTopology.java
@@ -191,7 +191,10 @@
public AckingTestWordSpout() {
}
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector acollector) {
+ public void open(
+ Map<String, Object> conf,
+ TopologyContext context,
+ SpoutOutputCollector acollector) {
collector = acollector;
words = new String[]{"nathan", "mike", "jackson", "golda", "bertels"};
rand = new Random();
@@ -230,7 +233,10 @@
private long startTime;
@Override
- public void prepare(Map<String, Object> conf, TopologyContext context, OutputCollector acollector) {
+ public void prepare(
+ Map<String, Object> conf,
+ TopologyContext context,
+ OutputCollector acollector) {
collector = acollector;
nItems = 0;
startTime = System.currentTimeMillis();
diff --git a/heron/examples/src/java/com/twitter/heron/examples/TestWordSpout.java b/heron/examples/src/java/com/twitter/heron/examples/TestWordSpout.java
index 6b93f80..1f6e403 100644
--- a/heron/examples/src/java/com/twitter/heron/examples/TestWordSpout.java
+++ b/heron/examples/src/java/com/twitter/heron/examples/TestWordSpout.java
@@ -31,7 +31,10 @@
private String[] words;
private Random rand;
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector acollector) {
+ public void open(
+ Map<String, Object> conf,
+ TopologyContext context,
+ SpoutOutputCollector acollector) {
collector = acollector;
words = new String[]{"nathan", "mike", "jackson", "golda", "bertels"};
rand = new Random();
diff --git a/heron/instance/tests/java/com/twitter/heron/resource/TestBolt.java b/heron/instance/tests/java/com/twitter/heron/resource/TestBolt.java
index 44efce8..ef5b52b 100644
--- a/heron/instance/tests/java/com/twitter/heron/resource/TestBolt.java
+++ b/heron/instance/tests/java/com/twitter/heron/resource/TestBolt.java
@@ -42,7 +42,10 @@
private int tupleExecuted = 0;
@Override
- public void prepare(Map<String, Object> map, TopologyContext topologyContext, OutputCollector collector) {
+ public void prepare(
+ Map<String, Object> map,
+ TopologyContext topologyContext,
+ OutputCollector collector) {
this.outputCollector = collector;
}
diff --git a/heron/newscheduler/tests/java/com/twitter/heron/scheduler/LaunchRunnerTest.java b/heron/newscheduler/tests/java/com/twitter/heron/scheduler/LaunchRunnerTest.java
index 146b2ed..390c3c5 100644
--- a/heron/newscheduler/tests/java/com/twitter/heron/scheduler/LaunchRunnerTest.java
+++ b/heron/newscheduler/tests/java/com/twitter/heron/scheduler/LaunchRunnerTest.java
@@ -60,7 +60,10 @@
public void declareOutputFields(OutputFieldsDeclarer declarer) {
}
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(
+ Map<String, Object> conf,
+ TopologyContext context,
+ SpoutOutputCollector collector) {
}
public void nextTuple() {
diff --git a/heron/spi/src/java/com/twitter/heron/spi/common/Jars.java b/heron/spi/src/java/com/twitter/heron/spi/common/Jars.java
index 3f0ad03..f812375 100644
--- a/heron/spi/src/java/com/twitter/heron/spi/common/Jars.java
+++ b/heron/spi/src/java/com/twitter/heron/spi/common/Jars.java
@@ -23,6 +23,7 @@
import java.util.regex.Pattern;
public final class Jars {
+ private static final Logger LOG = Logger.getLogger(Jars.class.getName());
// scheduler jar search pattern
private static Pattern schedulerJarPattern =
diff --git a/heron/spi/src/java/com/twitter/heron/spi/common/Resource.java b/heron/spi/src/java/com/twitter/heron/spi/common/Resource.java
index d894390..b8f4a11 100644
--- a/heron/spi/src/java/com/twitter/heron/spi/common/Resource.java
+++ b/heron/spi/src/java/com/twitter/heron/spi/common/Resource.java
@@ -34,7 +34,9 @@
*
* @return Map, a map of key value pairs
*/
- public static Map<String, Object> load(String className, String resName) throws ClassNotFoundException {
+ public static Map<String, Object> load(String className, String resName)
+ throws ClassNotFoundException {
+
// get the class loader for current class
ClassLoader cLoader = Class.forName(className).getClassLoader();
diff --git a/heron/spi/src/java/com/twitter/heron/spi/utils/TopologyTests.java b/heron/spi/src/java/com/twitter/heron/spi/utils/TopologyTests.java
index 2d42e98..c927a69 100644
--- a/heron/spi/src/java/com/twitter/heron/spi/utils/TopologyTests.java
+++ b/heron/spi/src/java/com/twitter/heron/spi/utils/TopologyTests.java
@@ -59,7 +59,10 @@
declarer.declare(new Fields("field1"));
}
- public void open(Map<String, Object> conf, TopologyContext context, SpoutOutputCollector collector) {
+ public void open(
+ Map<String, Object> conf,
+ TopologyContext context,
+ SpoutOutputCollector collector) {
}
public void nextTuple() {
diff --git a/heron/storm/src/java/backtype/storm/Config.java b/heron/storm/src/java/backtype/storm/Config.java
index 5e0ec18..9e24ac3 100644
--- a/heron/storm/src/java/backtype/storm/Config.java
+++ b/heron/storm/src/java/backtype/storm/Config.java
@@ -309,7 +309,9 @@
getRegisteredSerializations(conf).add(register);
}
- public static void registerDecorator(Map<String, Object> conf, Class<? extends IKryoDecorator> klass) {
+ public static void registerDecorator(
+ Map<String, Object> conf,
+ Class<? extends IKryoDecorator> klass) {
getRegisteredDecorators(conf).add(klass.getName());
}
diff --git a/heron/storm/src/java/backtype/storm/StormSubmitter.java b/heron/storm/src/java/backtype/storm/StormSubmitter.java
index 09eba1f..021156a 100644
--- a/heron/storm/src/java/backtype/storm/StormSubmitter.java
+++ b/heron/storm/src/java/backtype/storm/StormSubmitter.java
@@ -43,8 +43,10 @@
* @throws AlreadyAliveException if a topology with this name is already running
* @throws InvalidTopologyException if an invalid topology was submitted
*/
- public static void submitTopology(String name, Map<String, Object> stormConfig, StormTopology topology)
- throws AlreadyAliveException, InvalidTopologyException {
+ public static void submitTopology(
+ String name,
+ Map<String, Object> stormConfig,
+ StormTopology topology) throws AlreadyAliveException, InvalidTopologyException {
// First do config translation
com.twitter.heron.api.Config heronConfig = ConfigUtils.translateConfig(stormConfig);
diff --git a/heron/storm/src/java/backtype/storm/topology/IRichBoltDelegate.java b/heron/storm/src/java/backtype/storm/topology/IRichBoltDelegate.java
index e87d2b1..26f545c 100644
--- a/heron/storm/src/java/backtype/storm/topology/IRichBoltDelegate.java
+++ b/heron/storm/src/java/backtype/storm/topology/IRichBoltDelegate.java
@@ -35,8 +35,10 @@
}
@Override
- public void prepare(Map<String, Object> conf, com.twitter.heron.api.topology.TopologyContext context,
- com.twitter.heron.api.bolt.OutputCollector collector) {
+ public void prepare(
+ Map<String, Object> conf,
+ com.twitter.heron.api.topology.TopologyContext context,
+ com.twitter.heron.api.bolt.OutputCollector collector) {
topologyContextImpl = new TopologyContext(context);
outputCollectorImpl = new OutputCollectorImpl(collector);
delegate.prepare(conf, topologyContextImpl, outputCollectorImpl);
diff --git a/heron/storm/src/java/org/apache/storm/Config.java b/heron/storm/src/java/org/apache/storm/Config.java
index 3b1b3b4..9591723 100644
--- a/heron/storm/src/java/org/apache/storm/Config.java
+++ b/heron/storm/src/java/org/apache/storm/Config.java
@@ -305,7 +305,9 @@
getRegisteredSerializations(conf).add(register);
}
- public static void registerDecorator(Map<String, Object> conf, Class<? extends IKryoDecorator> klass) {
+ public static void registerDecorator(
+ Map<String, Object> conf,
+ Class<? extends IKryoDecorator> klass) {
getRegisteredDecorators(conf).add(klass.getName());
}
diff --git a/heron/storm/src/java/org/apache/storm/StormSubmitter.java b/heron/storm/src/java/org/apache/storm/StormSubmitter.java
index 0c46c9b..f4f65f3 100644
--- a/heron/storm/src/java/org/apache/storm/StormSubmitter.java
+++ b/heron/storm/src/java/org/apache/storm/StormSubmitter.java
@@ -43,8 +43,10 @@
* @throws AlreadyAliveException if a topology with this name is already running
* @throws InvalidTopologyException if an invalid topology was submitted
*/
- public static void submitTopology(String name, Map<String, Object> stormConfig, StormTopology topology)
- throws AlreadyAliveException, InvalidTopologyException {
+ public static void submitTopology(
+ String name,
+ Map<String, Object> stormConfig,
+ StormTopology topology) throws AlreadyAliveException, InvalidTopologyException {
// First do config translation
com.twitter.heron.api.Config heronConfig = ConfigUtils.translateConfig(stormConfig);
diff --git a/heron/storm/src/java/org/apache/storm/topology/IRichBoltDelegate.java b/heron/storm/src/java/org/apache/storm/topology/IRichBoltDelegate.java
index 2c2c647..576e454 100644
--- a/heron/storm/src/java/org/apache/storm/topology/IRichBoltDelegate.java
+++ b/heron/storm/src/java/org/apache/storm/topology/IRichBoltDelegate.java
@@ -35,8 +35,10 @@
}
@Override
- public void prepare(Map<String, Object> conf, com.twitter.heron.api.topology.TopologyContext context,
- com.twitter.heron.api.bolt.OutputCollector collector) {
+ public void prepare(
+ Map<String, Object> conf,
+ com.twitter.heron.api.topology.TopologyContext context,
+ com.twitter.heron.api.bolt.OutputCollector collector) {
topologyContextImpl = new TopologyContext(context);
outputCollectorImpl = new OutputCollectorImpl(collector);
delegate.prepare(conf, topologyContextImpl, outputCollectorImpl);
