Skip to content
Snippets Groups Projects
Commit 3d3bb429 authored by Christian Wulf's avatar Christian Wulf
Browse files

replaced deprecated code

parent 24393490
No related branches found
No related tags found
No related merge requests found
...@@ -53,7 +53,6 @@ public class RecordReaderAnalysisTest { ...@@ -53,7 +53,6 @@ public class RecordReaderAnalysisTest {
@Test @Test
public void performAnalysis() { public void performAnalysis() {
final RecordReaderConfiguration configuration = new RecordReaderConfiguration(); final RecordReaderConfiguration configuration = new RecordReaderConfiguration();
configuration.buildConfiguration();
Analysis analysis = new Analysis(configuration); Analysis analysis = new Analysis(configuration);
analysis.init(); analysis.init();
......
...@@ -20,7 +20,7 @@ import java.util.LinkedList; ...@@ -20,7 +20,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import teetime.variant.methodcallWithPorts.framework.core.Configuration; import teetime.variant.methodcallWithPorts.framework.core.Configuration;
import teetime.variant.methodcallWithPorts.framework.core.HeadPipeline; import teetime.variant.methodcallWithPorts.framework.core.HeadStage;
import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory; import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory;
import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory.PipeOrdering; import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory.PipeOrdering;
import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory.ThreadCommunication; import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory.ThreadCommunication;
...@@ -41,12 +41,16 @@ public class RecordReaderConfiguration extends Configuration { ...@@ -41,12 +41,16 @@ public class RecordReaderConfiguration extends Configuration {
private final List<IMonitoringRecord> elementCollection = new LinkedList<IMonitoringRecord>(); private final List<IMonitoringRecord> elementCollection = new LinkedList<IMonitoringRecord>();
private final PipeFactory pipeFactory = PipeFactory.INSTANCE; private final PipeFactory pipeFactory = PipeFactory.INSTANCE;
public void buildConfiguration() { public RecordReaderConfiguration() {
HeadPipeline<?, ?> producerPipeline = this.buildProducerPipeline(); this.buildConfiguration();
}
private void buildConfiguration() {
HeadStage producerPipeline = this.buildProducerPipeline();
this.getFiniteProducerStages().add(producerPipeline); this.getFiniteProducerStages().add(producerPipeline);
} }
private HeadPipeline<?, ?> buildProducerPipeline() { private HeadStage buildProducerPipeline() {
ClassNameRegistryRepository classNameRegistryRepository = new ClassNameRegistryRepository(); ClassNameRegistryRepository classNameRegistryRepository = new ClassNameRegistryRepository();
File logDir = new File("src/test/data/bookstore-logs"); File logDir = new File("src/test/data/bookstore-logs");
// create stages // create stages
...@@ -54,17 +58,14 @@ public class RecordReaderConfiguration extends Configuration { ...@@ -54,17 +58,14 @@ public class RecordReaderConfiguration extends Configuration {
Dir2RecordsFilter dir2RecordsFilter = new Dir2RecordsFilter(classNameRegistryRepository); Dir2RecordsFilter dir2RecordsFilter = new Dir2RecordsFilter(classNameRegistryRepository);
CollectorSink<IMonitoringRecord> collector = new CollectorSink<IMonitoringRecord>(this.elementCollection); CollectorSink<IMonitoringRecord> collector = new CollectorSink<IMonitoringRecord>(this.elementCollection);
final HeadPipeline<InitialElementProducer<File>, CollectorSink<IMonitoringRecord>> pipeline = new HeadPipeline<InitialElementProducer<File>, CollectorSink<IMonitoringRecord>>(); // connect stages
pipeline.setFirstStage(initialElementProducer); this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
pipeline.setLastStage(collector); .create(initialElementProducer.getOutputPort(), dir2RecordsFilter.getInputPort(), 1);
this.pipeFactory.create(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false, 1)
.connectPorts(initialElementProducer.getOutputPort(), dir2RecordsFilter.getInputPort());
this.pipeFactory.create(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false, 1) this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.connectPorts(dir2RecordsFilter.getOutputPort(), collector.getInputPort()); .create(dir2RecordsFilter.getOutputPort(), collector.getInputPort(), 1);
return pipeline; return initialElementProducer;
} }
public List<IMonitoringRecord> getElementCollection() { public List<IMonitoringRecord> getElementCollection() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment