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

Merge branch 'checkstyle-solved' into 'master'

Checkstyle solved

Solved a whole bunch of issues regarding checkstyle. For e.g. renamed interfaces to match I[A-Z0-9].* and abstract classes to match Abstract[A-Z0-9].*

See merge request !16
parents 6ff65096 bec9f5bc
No related branches found
No related tags found
No related merge requests found
Showing
with 44 additions and 44 deletions
package teetime.stage; package teetime.stage;
import teetime.framework.ProducerStage; import teetime.framework.AbstractProducerStage;
public class InitialElementProducer<T> extends ProducerStage<T> { public class InitialElementProducer<T> extends AbstractProducerStage<T> {
private final T[] elements; private final T[] elements;
......
package teetime.stage; package teetime.stage;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
public class InstanceCounter<T, C extends T> extends ConsumerStage<T> { public class InstanceCounter<T, C extends T> extends AbstractConsumerStage<T> {
private final OutputPort<T> outputPort = this.createOutputPort(); private final OutputPort<T> outputPort = this.createOutputPort();
......
package teetime.stage; package teetime.stage;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
/** /**
* @author Jan Waller, Nils Christian Ehmke, Christian Wulf * @author Jan Waller, Nils Christian Ehmke, Christian Wulf
* *
*/ */
public class InstanceOfFilter<I, O> extends ConsumerStage<I> { public class InstanceOfFilter<I, O> extends AbstractConsumerStage<I> {
private final OutputPort<O> outputPort = this.createOutputPort(); private final OutputPort<O> outputPort = this.createOutputPort();
......
package teetime.stage; package teetime.stage;
import teetime.framework.ProducerStage; import teetime.framework.AbstractProducerStage;
public class IterableProducer<O extends Iterable<T>, T> extends ProducerStage<T> { public class IterableProducer<O extends Iterable<T>, T> extends AbstractProducerStage<T> {
private O iter = null; private O iter = null;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
***************************************************************************/ ***************************************************************************/
package teetime.stage; package teetime.stage;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
/** /**
...@@ -23,7 +23,7 @@ import teetime.framework.OutputPort; ...@@ -23,7 +23,7 @@ import teetime.framework.OutputPort;
* *
* @since 1.10 * @since 1.10
*/ */
public class NoopFilter<T> extends ConsumerStage<T> { public class NoopFilter<T> extends AbstractConsumerStage<T> {
private final OutputPort<T> outputPort = this.createOutputPort(); private final OutputPort<T> outputPort = this.createOutputPort();
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
***************************************************************************/ ***************************************************************************/
package teetime.stage; package teetime.stage;
import teetime.framework.ProducerStage; import teetime.framework.AbstractProducerStage;
import teetime.util.ConstructorClosure; import teetime.util.ConstructorClosure;
/** /**
...@@ -23,7 +23,7 @@ import teetime.util.ConstructorClosure; ...@@ -23,7 +23,7 @@ import teetime.util.ConstructorClosure;
* *
* @since 1.10 * @since 1.10
*/ */
public class ObjectProducer<T> extends ProducerStage<T> { public class ObjectProducer<T> extends AbstractProducerStage<T> {
private long numInputObjects; private long numInputObjects;
private ConstructorClosure<T> inputObjectCreator; private ConstructorClosure<T> inputObjectCreator;
......
package teetime.stage; package teetime.stage;
import teetime.framework.InputPort; import teetime.framework.InputPort;
import teetime.framework.ProducerStage; import teetime.framework.AbstractProducerStage;
import teetime.framework.pipe.InterThreadPipe; import teetime.framework.pipe.AbstractInterThreadPipe;
import teetime.framework.signal.TerminatingSignal; import teetime.framework.signal.TerminatingSignal;
public class Relay<T> extends ProducerStage<T> { public class Relay<T> extends AbstractProducerStage<T> {
private final InputPort<T> inputPort = this.createInputPort(); private final InputPort<T> inputPort = this.createInputPort();
private InterThreadPipe cachedCastedInputPipe; private AbstractInterThreadPipe cachedCastedInputPipe;
@Override @Override
public void execute() { public void execute() {
...@@ -27,7 +27,7 @@ public class Relay<T> extends ProducerStage<T> { ...@@ -27,7 +27,7 @@ public class Relay<T> extends ProducerStage<T> {
@Override @Override
public void onStarting() throws Exception { public void onStarting() throws Exception {
super.onStarting(); super.onStarting();
this.cachedCastedInputPipe = (InterThreadPipe) this.inputPort.getPipe(); this.cachedCastedInputPipe = (AbstractInterThreadPipe) this.inputPort.getPipe();
} }
public InputPort<T> getInputPort() { public InputPort<T> getInputPort() {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
***************************************************************************/ ***************************************************************************/
package teetime.stage; package teetime.stage;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
import teetime.util.TimestampObject; import teetime.util.TimestampObject;
...@@ -24,7 +24,7 @@ import teetime.util.TimestampObject; ...@@ -24,7 +24,7 @@ import teetime.util.TimestampObject;
* *
* @since 1.10 * @since 1.10
*/ */
public class StartTimestampFilter extends ConsumerStage<TimestampObject> { public class StartTimestampFilter extends AbstractConsumerStage<TimestampObject> {
private final OutputPort<TimestampObject> outputPort = this.createOutputPort(); private final OutputPort<TimestampObject> outputPort = this.createOutputPort();
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
***************************************************************************/ ***************************************************************************/
package teetime.stage; package teetime.stage;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
import teetime.util.TimestampObject; import teetime.util.TimestampObject;
...@@ -24,7 +24,7 @@ import teetime.util.TimestampObject; ...@@ -24,7 +24,7 @@ import teetime.util.TimestampObject;
* *
* @since 1.10 * @since 1.10
*/ */
public class StopTimestampFilter extends ConsumerStage<TimestampObject> { public class StopTimestampFilter extends AbstractConsumerStage<TimestampObject> {
private final OutputPort<TimestampObject> outputPort = this.createOutputPort(); private final OutputPort<TimestampObject> outputPort = this.createOutputPort();
......
...@@ -2,10 +2,10 @@ package teetime.stage; ...@@ -2,10 +2,10 @@ package teetime.stage;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
public class Tokenizer extends ConsumerStage<String> { public class Tokenizer extends AbstractConsumerStage<String> {
private final OutputPort<String> outputPort = this.createOutputPort(); private final OutputPort<String> outputPort = this.createOutputPort();
private final String regex; private final String regex;
......
...@@ -6,7 +6,7 @@ import java.util.zip.DataFormatException; ...@@ -6,7 +6,7 @@ import java.util.zip.DataFormatException;
import java.util.zip.Deflater; import java.util.zip.Deflater;
import java.util.zip.Inflater; import java.util.zip.Inflater;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
/** /**
...@@ -15,7 +15,7 @@ import teetime.framework.OutputPort; ...@@ -15,7 +15,7 @@ import teetime.framework.OutputPort;
* @author Nelson Tavares de Sousa * @author Nelson Tavares de Sousa
* *
*/ */
public class ZipByteArray extends ConsumerStage<byte[]> { public class ZipByteArray extends AbstractConsumerStage<byte[]> {
private final OutputPort<byte[]> outputPort = this.createOutputPort(); private final OutputPort<byte[]> outputPort = this.createOutputPort();
private final ZipMode mode; private final ZipMode mode;
......
package teetime.stage.basic; package teetime.stage.basic;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
public class Sink<T> extends ConsumerStage<T> { public class Sink<T> extends AbstractConsumerStage<T> {
// PERFORMANCE let the sink remove all available input at once by using a new method receiveAll() that clears the pipe's buffer // PERFORMANCE let the sink remove all available input at once by using a new method receiveAll() that clears the pipe's buffer
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
package teetime.stage.basic.distributor; package teetime.stage.basic.distributor;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
/** /**
...@@ -27,7 +27,7 @@ import teetime.framework.OutputPort; ...@@ -27,7 +27,7 @@ import teetime.framework.OutputPort;
* @param T * @param T
* the type of the input port and the output ports * the type of the input port and the output ports
*/ */
public class Distributor<T> extends ConsumerStage<T> { public class Distributor<T> extends AbstractConsumerStage<T> {
private IDistributorStrategy<T> strategy = new RoundRobinStrategy<T>(); private IDistributorStrategy<T> strategy = new RoundRobinStrategy<T>();
......
...@@ -7,9 +7,9 @@ import java.nio.ByteBuffer; ...@@ -7,9 +7,9 @@ import java.nio.ByteBuffer;
import java.nio.channels.ServerSocketChannel; import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import teetime.framework.ProducerStage; import teetime.framework.AbstractProducerStage;
public abstract class AbstractTcpReader<T> extends ProducerStage<T> { public abstract class AbstractTcpReader<T> extends AbstractProducerStage<T> {
private final int port; private final int port;
private final int bufferCapacity; private final int bufferCapacity;
......
...@@ -4,11 +4,11 @@ import java.io.File; ...@@ -4,11 +4,11 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import com.google.common.io.Files; import com.google.common.io.Files;
public class ByteArrayFileWriter extends ConsumerStage<byte[]> { public class ByteArrayFileWriter extends AbstractConsumerStage<byte[]> {
private final File file; private final File file;
private FileOutputStream fo; private FileOutputStream fo;
......
...@@ -21,7 +21,7 @@ import java.io.FileFilter; ...@@ -21,7 +21,7 @@ import java.io.FileFilter;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
/** /**
...@@ -29,7 +29,7 @@ import teetime.framework.OutputPort; ...@@ -29,7 +29,7 @@ import teetime.framework.OutputPort;
* *
* @since 1.10 * @since 1.10
*/ */
public class Directory2FilesFilter extends ConsumerStage<File> { public class Directory2FilesFilter extends AbstractConsumerStage<File> {
private final OutputPort<File> outputPort = this.createOutputPort(); private final OutputPort<File> outputPort = this.createOutputPort();
......
...@@ -3,13 +3,13 @@ package teetime.stage.io; ...@@ -3,13 +3,13 @@ package teetime.stage.io;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
import teetime.framework.Stage; import teetime.framework.IStage;
import com.google.common.io.Files; import com.google.common.io.Files;
public class File2ByteArray extends ConsumerStage<File> implements Stage { public class File2ByteArray extends AbstractConsumerStage<File> implements IStage {
private final OutputPort<byte[]> outputPort = this.createOutputPort(); private final OutputPort<byte[]> outputPort = this.createOutputPort();
......
...@@ -23,7 +23,7 @@ import java.io.FileNotFoundException; ...@@ -23,7 +23,7 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
import teetime.stage.util.TextLine; import teetime.stage.util.TextLine;
...@@ -31,7 +31,7 @@ import teetime.stage.util.TextLine; ...@@ -31,7 +31,7 @@ import teetime.stage.util.TextLine;
* @author Christian Wulf * @author Christian Wulf
* *
*/ */
public class File2TextLinesFilter extends ConsumerStage<File> { public class File2TextLinesFilter extends AbstractConsumerStage<File> {
private final OutputPort<TextLine> outputPort = this.createOutputPort(); private final OutputPort<TextLine> outputPort = this.createOutputPort();
......
...@@ -20,7 +20,7 @@ import java.io.FileOutputStream; ...@@ -20,7 +20,7 @@ import java.io.FileOutputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
/** /**
* A filter to print objects to a configured stream * A filter to print objects to a configured stream
...@@ -29,7 +29,7 @@ import teetime.framework.ConsumerStage; ...@@ -29,7 +29,7 @@ import teetime.framework.ConsumerStage;
* *
* @since 1.10 * @since 1.10
*/ */
public class Printer<T> extends ConsumerStage<T> { public class Printer<T> extends AbstractConsumerStage<T> {
public static final String STREAM_STDOUT = "STDOUT"; public static final String STREAM_STDOUT = "STDOUT";
public static final String STREAM_STDERR = "STDERR"; public static final String STREAM_STDERR = "STDERR";
......
...@@ -18,7 +18,7 @@ package teetime.stage.stringBuffer; ...@@ -18,7 +18,7 @@ package teetime.stage.stringBuffer;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import teetime.framework.ConsumerStage; import teetime.framework.AbstractConsumerStage;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
import teetime.stage.stringBuffer.handler.AbstractDataTypeHandler; import teetime.stage.stringBuffer.handler.AbstractDataTypeHandler;
import teetime.stage.stringBuffer.util.KiekerHashMap; import teetime.stage.stringBuffer.util.KiekerHashMap;
...@@ -28,7 +28,7 @@ import teetime.stage.stringBuffer.util.KiekerHashMap; ...@@ -28,7 +28,7 @@ import teetime.stage.stringBuffer.util.KiekerHashMap;
* *
* @since 1.10 * @since 1.10
*/ */
public class StringBufferFilter<T> extends ConsumerStage<T> { public class StringBufferFilter<T> extends AbstractConsumerStage<T> {
private final OutputPort<T> outputPort = this.createOutputPort(); private final OutputPort<T> outputPort = this.createOutputPort();
......
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