Commit 8baba9bb authored by Christian Wulf's avatar Christian Wulf

fixed errors

parent 06feba96
......@@ -4,7 +4,7 @@
<local-check-config name="Kieker Checkstyle" location="conf/cs-conf.xml" type="project" description="">
<additional-data name="protect-config-file" value="false"/>
</local-check-config>
<fileset name="all" enabled="true" check-config-name="Sun Checks" local="false">
<fileset name="all" enabled="true" check-config-name="Kieker Checkstyle" local="true">
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
<filter name="FilesFromPackage" enabled="true">
......
......@@ -2,9 +2,11 @@
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<!-- <property name="checkstyle.ignoreCustomKieker" value=""/> -->
<!-- KIEKER default is warning instead of error -->
<property name="severity" value="error"/>
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis10;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis10Test {
final MethodCallThroughputAnalysis10 analysis = new MethodCallThroughputAnalysis10();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.Closure;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis11;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis11Test {
final MethodCallThroughputAnalysis11 analysis = new MethodCallThroughputAnalysis11();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Closure<Void, TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject execute(final Void element) {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis12;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis12Test {
final MethodCallThroughputAnalysis12 analysis = new MethodCallThroughputAnalysis12();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis13;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis13Test {
final MethodCallThroughputAnalysis13 analysis = new MethodCallThroughputAnalysis13();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis14;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis14Test {
final MethodCallThroughputAnalysis14 analysis = new MethodCallThroughputAnalysis14();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis15;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis15Test {
final MethodCallThroughputAnalysis15 analysis = new MethodCallThroughputAnalysis15();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -20,7 +20,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.Closure;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis16;
import teetime.util.ListUtil;
import teetime.util.StatisticsUtil;
......@@ -51,9 +51,9 @@ public class MethodCallThoughputTimestampAnalysis16Test {
final MethodCallThroughputAnalysis16 analysis = new MethodCallThroughputAnalysis16();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Closure<Void, TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject execute(final Void element) {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -20,7 +20,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.Closure;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis17;
import teetime.util.ListUtil;
import teetime.util.StatisticsUtil;
......@@ -51,9 +51,9 @@ public class MethodCallThoughputTimestampAnalysis17Test {
final MethodCallThroughputAnalysis17 analysis = new MethodCallThroughputAnalysis17();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Closure<Void, TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject execute(final Void element) {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis1;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis1Test {
final MethodCallThroughputAnalysis1 analysis = new MethodCallThroughputAnalysis1();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis2;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis2Test {
final MethodCallThroughputAnalysis2 analysis = new MethodCallThroughputAnalysis2();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis3;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis3Test {
final MethodCallThroughputAnalysis3 analysis = new MethodCallThroughputAnalysis3();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis4;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis4Test {
final MethodCallThroughputAnalysis4 analysis = new MethodCallThroughputAnalysis4();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis5;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis5Test {
final MethodCallThroughputAnalysis5 analysis = new MethodCallThroughputAnalysis5();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis6;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis6Test {
final MethodCallThroughputAnalysis6 analysis = new MethodCallThroughputAnalysis6();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis7;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -56,9 +56,9 @@ public class MethodCallThoughputTimestampAnalysis7Test {
final MethodCallThroughputAnalysis7 analysis = new MethodCallThroughputAnalysis7();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis8;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis8Test {
final MethodCallThroughputAnalysis8 analysis = new MethodCallThroughputAnalysis8();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
......@@ -17,11 +17,11 @@ package teetime.examples.throughput;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import teetime.examples.throughput.methodcall.ConstructorClosure;
import teetime.examples.throughput.methodcall.MethodCallThroughputAnalysis9;
import teetime.util.StatisticsUtil;
import teetime.util.StopWatch;
......@@ -53,9 +53,9 @@ public class MethodCallThoughputTimestampAnalysis9Test {
final MethodCallThroughputAnalysis9 analysis = new MethodCallThroughputAnalysis9();
analysis.setNumNoopFilters(NUM_NOOP_FILTERS);
analysis.setTimestampObjects(timestampObjects);
analysis.setInput(NUM_OBJECTS_TO_CREATE, new Callable<TimestampObject>() {
analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() {
@Override
public TimestampObject call() throws Exception {
public TimestampObject create() {
return new TimestampObject();
}
});
......
package teetime.examples.throughput.methodcall;
public interface Closure<I, O> {
public interface ConstructorClosure<O> {
public abstract O execute(I element);
// O create();
O create();
}
......@@ -2,7 +2,7 @@ package teetime.examples.throughput.methodcall;
public class InputPort<T> {
public IPipe<T> pipe;
private IPipe<T> pipe;
public T receive() {
T element = this.pipe.removeLast();
......@@ -14,4 +14,12 @@ public class InputPort<T> {
return element;
}
public IPipe<T> getPipe() {
return this.pipe;
}
public void setPipe(final IPipe<T> pipe) {
this.pipe = pipe;
}
}
......@@ -16,7 +16,6 @@
package teetime.examples.throughput.methodcall;
import java.util.List;
import java.util.concurrent.Callable;
import teetime.examples.throughput.TimestampObject;
import teetime.examples.throughput.methodcall.stage.CollectorSink;
......@@ -34,7 +33,7 @@ import teetime.framework.core.Analysis;
public class MethodCallThroughputAnalysis1 extends Analysis {
private long numInputObjects;
private Callable<TimestampObject> inputObjectCreator;
private ConstructorClosure<TimestampObject> inputObjectCreator;
private int numNoopFilters;
private List<TimestampObject> timestampObjects;
private Runnable runnable;
......@@ -87,7 +86,7 @@ public class MethodCallThroughputAnalysis1 extends Analysis {
this.runnable.run();
}
public void setInput(final int numInputObjects, final Callable<TimestampObject> inputObjectCreator) {
public void setInput(final int numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {
this.numInputObjects = numInputObjects;
this.inputObjectCreator = inputObjectCreator;
}
......
......@@ -16,7 +16,6 @@
package teetime.examples.throughput.methodcall;
import java.util.List;
import java.util.concurrent.Callable;
import teetime.examples.throughput.TimestampObject;
import teetime.examples.throughput.methodcall.stage.CollectorSink;
......@@ -35,7 +34,7 @@ import teetime.framework.core.Analysis;
public class MethodCallThroughputAnalysis10 extends Analysis {
private long numInputObjects;
private Callable<TimestampObject> inputObjectCreator;
private ConstructorClosure<TimestampObject> inputObjectCreator;
private int numNoopFilters;
private List<TimestampObject> timestampObjects;
private Runnable runnable;
......@@ -86,7 +85,7 @@ public class MethodCallThroughputAnalysis10 extends Analysis {
this.runnable.run();
}
public void setInput(final int numInputObjects, final Callable<TimestampObject> inputObjectCreator) {
public void setInput(final int numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {
this.numInputObjects = numInputObjects;
this.inputObjectCreator = inputObjectCreator;
}
......
......@@ -34,7 +34,7 @@ import teetime.framework.core.Analysis;
public class MethodCallThroughputAnalysis11 extends Analysis {
private long numInputObjects;
private Closure<Void, TimestampObject> inputObjectCreator;
private ConstructorClosure<TimestampObject> inputObjectCreator;
private int numNoopFilters;
private List<TimestampObject> timestampObjects;
private Runnable runnable;
......@@ -50,11 +50,13 @@ public class MethodCallThroughputAnalysis11 extends Analysis {
* @param numNoopFilters
* @since 1.10
*/
private Pipeline<Void, Object> buildPipeline(final long numInputObjects, final Closure<Void, TimestampObject> inputObjectCreator) {
private Pipeline<Void, Object> buildPipeline(final long numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {
@SuppressWarnings("unchecked")
final NoopFilter<TimestampObject>[] noopFilters = new NoopFilter[this.numNoopFilters];
// create stages
final ObjectProducer<TimestampObject> objectProducer = new ObjectProducer<TimestampObject>(numInputObjects, inputObjectCreator);
// Relay<TimestampObject> relay = new Relay<TimestampObject>();
// NoopFilter<TimestampObject> relayFake = new NoopFilter<TimestampObject>();
final StartTimestampFilter startTimestampFilter = new StartTimestampFilter();
for (int i = 0; i < noopFilters.length; i++) {
noopFilters[i] = new NoopFilter<TimestampObject>();
......@@ -62,19 +64,17 @@ public class MethodCallThroughputAnalysis11 extends Analysis {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(this.timestampObjects);
// Relay<TimestampObject> relay = new Relay<TimestampObject>();
final Pipeline<Void, Object> pipeline = new Pipeline<Void, Object>();
pipeline.setFirstStage(objectProducer);
// pipeline.addIntermediateStage(relay);
// pipeline.addIntermediateStage(relayFake);
pipeline.addIntermediateStage(startTimestampFilter);
pipeline.addIntermediateStages(noopFilters);
pipeline.addIntermediateStage(stopTimestampFilter);
pipeline.setLastStage(collectorSink);
UnorderedGrowablePipe.connect(objectProducer.getOutputPort(), startTimestampFilter.getInputPort());
// UnorderedGrowablePipe.connect(objectProducer.getOutputPort(), relay.getInputPort());
// UnorderedGrowablePipe.connect(relay.getOutputPort(), startTimestampFilter.getInputPort());
// UnorderedGrowablePipe.connect(objectProducer.getOutputPort(), relayFake.getInputPort());
// UnorderedGrowablePipe.connect(relayFake.getOutputPort(), startTimestampFilter.getInputPort());
UnorderedGrowablePipe.connect(startTimestampFilter.getOutputPort(), noopFilters[0].getInputPort());
for (int i = 0; i < noopFilters.length - 1; i++) {
......@@ -92,7 +92,7 @@ public class MethodCallThroughputAnalysis11 extends Analysis {
this.runnable.run();
}
public void setInput(final int numInputObjects, final Closure<Void, TimestampObject> inputObjectCreator) {
public void setInput(final int numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {
this.numInputObjects = numInputObjects;
this.inputObjectCreator = inputObjectCreator;
}
......
......@@ -16,7 +16,6 @@
package teetime.examples.throughput.methodcall;
import java.util.List;
import java.util.concurrent.Callable;
import teetime.examples.throughput.TimestampObject;
import teetime.examples.throughput.methodcall.stage.CollectorSink;
......@@ -35,7 +34,7 @@ import teetime.framework.core.Analysis;
public class MethodCallThroughputAnalysis12 extends Analysis {
private long numInputObjects;
private Callable<TimestampObject> inputObjectCreator;
private ConstructorClosure<TimestampObject> inputObjectCreator;
private int numNoopFilters;
private List<TimestampObject> timestampObjects;
private Runnable runnable;
......@@ -90,7 +89,7 @@ public class MethodCallThroughputAnalysis12 extends Analysis {
this.runnable.run();
}
public void setInput(final int numInputObjects, final Callable<TimestampObject> inputObjectCreator) {
public void setInput(final int numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {
this.numInputObjects = numInputObjects;
this.inputObjectCreator = inputObjectCreator;
}
......
......@@ -18,7 +18,6 @@ package teetime.examples.throughput.methodcall;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import teetime.examples.throughput.TimestampObject;
import teetime.examples.throughput.methodcall.stage.AbstractStage;
......@@ -44,7 +43,7 @@ public class MethodCallThroughputAnalysis13 extends Analysis {
}
private long numInputObjects;
private Callable<TimestampObject> inputObjectCreator;
private ConstructorClosure<TimestampObject> inputObjectCreator;
private int numNoopFilters;
private List<TimestampObject> timestampObjects;
private Runnable runnable;
......@@ -115,7 +114,7 @@ public class MethodCallThroughputAnalysis13 extends Analysis {
this.runnable.run();
}
public void setInput(final int numInputObjects, final Callable<TimestampObject> inputObjectCreator) {
public void setInput(final int numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {
this.numInputObjects = numInputObjects;
this.inputObjectCreator = inputObjectCreator;
}
......
......@@ -16,7 +16,6 @@
package teetime.examples.throughput.methodcall;
import java.util.List;
import java.util.concurrent.Callable;
import teetime.examples.throughput.TimestampObject;
import teetime.examples.throughput.methodcall.stage.CollectorSink;
......@@ -35,7 +34,7 @@ import teetime.framework.core.Analysis;
public class MethodCallThroughputAnalysis14 extends Analysis {
private long numInputObjects;
private Callable<TimestampObject> inputObjectCreator;
private ConstructorClosure<TimestampObject> inputObjectCreator;
private int numNoopFilters;
private List<TimestampObject> timestampObjects;
private Runnable runnable;
......@@ -86,7 +85,7 @@ public class MethodCallThroughputAnalysis14 extends Analysis {
this.runnable.run();
}
public void setInput(final int numInputObjects, final Callable<TimestampObject> inputObjectCreator) {
public void setInput(final int numInputObjects, final ConstructorClosure<TimestampObject> inputObjectCreator) {