improved package structure

src/main/java/teetime/stage/kieker/className/ClassNameRegistry.java → src/main/java/teetime/stage/className/ClassNameRegistry.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.className;
+package teetime.stage.className;
 
 import java.util.HashMap;
 

src/main/java/teetime/stage/kieker/className/ClassNameRegistryCreationFilter.java → src/main/java/teetime/stage/className/ClassNameRegistryCreationFilter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.className;
+package teetime.stage.className;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/teetime/stage/kieker/className/ClassNameRegistryRepository.java → src/main/java/teetime/stage/className/ClassNameRegistryRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.className;
+package teetime.stage.className;
 
 import java.io.File;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/teetime/stage/kieker/className/MappingFileParser.java → src/main/java/teetime/stage/className/MappingFileParser.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.className;
+package teetime.stage.className;
 
 import java.io.BufferedReader;
 import java.io.File;

src/main/java/teetime/stage/io/IRecordFactoryMethod.java

-package teetime.stage.io;
-
-import java.nio.ByteBuffer;
-
-import kieker.common.record.IMonitoringRecord;
-import kieker.common.util.registry.ILookup;
-
-public interface IRecordFactoryMethod {
-
-	IMonitoringRecord create(ByteBuffer buffer, ILookup<String> stringRegistry);
-
-}

src/main/java/teetime/stage/io/RecordFactory.java

-package teetime.stage.io;
-
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
-import kieker.common.exception.MonitoringRecordException;
-import kieker.common.record.IMonitoringRecord;
-import kieker.common.util.registry.ILookup;
-
-public final class RecordFactory {
-
-	private final Map<String, IRecordFactoryMethod> recordFactoryMethods = new HashMap<String, IRecordFactoryMethod>();
-
-	public IMonitoringRecord create(final int clazzId, final ByteBuffer buffer, final ILookup<String> stringRegistry) throws MonitoringRecordException {
-		String recordClassName = stringRegistry.get(clazzId);
-		IRecordFactoryMethod recordFactoryMethod = this.recordFactoryMethods.get(recordClassName);
-		if (recordFactoryMethod == null) {
-			throw new IllegalStateException("recordClassName: " + recordClassName);
-		}
-		return recordFactoryMethod.create(buffer, stringRegistry);
-	}
-
-	public void register(final String recordClassName, final IRecordFactoryMethod recordFactoryMethod) {
-		this.recordFactoryMethods.put(recordClassName, recordFactoryMethod);
-	}
-}

src/main/java/teetime/stage/io/DbReader.java → src/main/java/teetime/stage/io/database/DbReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package teetime.stage.io;
+package teetime.stage.io.database;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

src/main/java/teetime/stage/kieker/Dir2RecordsFilter.java → src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker;
+package teetime.stage.io.filesystem;
 
 import java.io.File;
 
@@ -26,11 +26,11 @@ import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
 import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
 import teetime.stage.FileExtensionSwitch;
 import teetime.stage.basic.merger.Merger;
+import teetime.stage.className.ClassNameRegistryCreationFilter;
+import teetime.stage.className.ClassNameRegistryRepository;
 import teetime.stage.io.Directory2FilesFilter;
-import teetime.stage.kieker.className.ClassNameRegistryCreationFilter;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
-import teetime.stage.kieker.fileToRecord.BinaryFile2RecordFilter;
-import teetime.stage.kieker.fileToRecord.DatFile2RecordFilter;
+import teetime.stage.io.filesystem.format.binary.file.BinaryFile2RecordFilter;
+import teetime.stage.io.filesystem.format.text.file.DatFile2RecordFilter;
 
 import kieker.common.record.IMonitoringRecord;
 import kieker.common.util.filesystem.BinaryCompressionMethod;

src/main/java/teetime/stage/kieker/DirWithBin2RecordFilter.java → src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java

-package teetime.stage.kieker;
+package teetime.stage.io.filesystem.format.binary;
 
 import java.io.File;
 
 import teetime.framework.InputPort;
 import teetime.framework.OldPipeline;
 import teetime.framework.OutputPort;
-import teetime.stage.kieker.className.ClassNameRegistryCreationFilter;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
-import teetime.stage.kieker.fileToRecord.BinaryFile2RecordFilter;
+import teetime.stage.className.ClassNameRegistryCreationFilter;
+import teetime.stage.className.ClassNameRegistryRepository;
+import teetime.stage.io.filesystem.format.binary.file.BinaryFile2RecordFilter;
 
 import kieker.common.record.IMonitoringRecord;
 

src/main/java/teetime/stage/kieker/fileToRecord/BinaryFile2RecordFilter.java → src/main/java/teetime/stage/io/filesystem/format/binary/file/BinaryFile2RecordFilter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.fileToRecord;
+package teetime.stage.io.filesystem.format.binary.file;
 
 import java.io.DataInputStream;
 import java.io.File;
@@ -22,7 +22,7 @@ import java.io.IOException;
 import teetime.framework.ConsumerStage;
 import teetime.framework.OutputPort;
 import teetime.framework.signal.OnStartingException;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
+import teetime.stage.className.ClassNameRegistryRepository;
 
 import kieker.common.exception.MonitoringRecordException;
 import kieker.common.record.IMonitoringRecord;

src/main/java/teetime/stage/kieker/fileToRecord/RecordFromBinaryFileCreator.java → src/main/java/teetime/stage/io/filesystem/format/binary/file/RecordFromBinaryFileCreator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.fileToRecord;
+package teetime.stage.io.filesystem.format.binary.file;
 
 import java.io.DataInputStream;
 import java.io.EOFException;
@@ -22,8 +22,8 @@ import java.io.IOException;
 
 import org.slf4j.Logger;
 
-import teetime.stage.kieker.className.ClassNameRegistry;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
+import teetime.stage.className.ClassNameRegistry;
+import teetime.stage.className.ClassNameRegistryRepository;
 
 import kieker.common.exception.MonitoringRecordException;
 import kieker.common.record.AbstractMonitoringRecord;

src/main/java/teetime/stage/kieker/DirWithDat2RecordFilter.java → src/main/java/teetime/stage/io/filesystem/format/text/DirWithDat2RecordFilter.java

-package teetime.stage.kieker;
+package teetime.stage.io.filesystem.format.text;
 
 import java.io.File;
 
 import teetime.framework.InputPort;
 import teetime.framework.OldPipeline;
 import teetime.framework.OutputPort;
-import teetime.stage.kieker.className.ClassNameRegistryCreationFilter;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
-import teetime.stage.kieker.fileToRecord.DatFile2RecordFilter;
+import teetime.stage.className.ClassNameRegistryCreationFilter;
+import teetime.stage.className.ClassNameRegistryRepository;
+import teetime.stage.io.filesystem.format.text.file.DatFile2RecordFilter;
 
 import kieker.common.record.IMonitoringRecord;
 

src/main/java/teetime/stage/kieker/fileToRecord/DatFile2RecordFilter.java → src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.fileToRecord;
+package teetime.stage.io.filesystem.format.text.file;
 
 import java.io.File;
 
@@ -21,9 +21,8 @@ import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.OldPipeline;
 import teetime.framework.pipe.SingleElementPipe;
+import teetime.stage.className.ClassNameRegistryRepository;
 import teetime.stage.io.File2TextLinesFilter;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
-import teetime.stage.kieker.fileToRecord.textLine.TextLine2RecordFilter;
 
 import kieker.common.record.IMonitoringRecord;
 

src/main/java/teetime/stage/kieker/fileToRecord/RecordFromTextLineCreator.java → src/main/java/teetime/stage/io/filesystem/format/text/file/RecordFromTextLineCreator.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.fileToRecord;
+package teetime.stage.io.filesystem.format.text.file;
 
 import java.io.File;
 
-import teetime.stage.kieker.className.ClassNameRegistry;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
+import teetime.stage.className.ClassNameRegistry;
+import teetime.stage.className.ClassNameRegistryRepository;
 import teetime.stage.util.MappingException;
 
 import kieker.common.exception.IllegalRecordFormatException;

src/main/java/teetime/stage/kieker/fileToRecord/textLine/TextLine2MappingRegistryFilter.java → src/main/java/teetime/stage/io/filesystem/format/text/file/TextLine2MappingRegistryFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package teetime.stage.kieker.fileToRecord.textLine;
+package teetime.stage.io.filesystem.format.text.file;
 
 import java.util.Map;
 

src/main/java/teetime/stage/kieker/fileToRecord/textLine/TextLine2RecordFilter.java → src/main/java/teetime/stage/io/filesystem/format/text/file/TextLine2RecordFilter.java

@@ -14,15 +14,14 @@
  * limitations under the License.
  ***************************************************************************/
 
-package teetime.stage.kieker.fileToRecord.textLine;
+package teetime.stage.io.filesystem.format.text.file;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import teetime.framework.ConsumerStage;
 import teetime.framework.OutputPort;
-import teetime.stage.kieker.className.ClassNameRegistryRepository;
-import teetime.stage.kieker.fileToRecord.RecordFromTextLineCreator;
+import teetime.stage.className.ClassNameRegistryRepository;
 import teetime.stage.util.MappingException;
 import teetime.stage.util.TextLine;
 

src/main/java/teetime/stage/io/TCPReader.java → src/main/java/teetime/stage/io/network/TCPReader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.io;
+package teetime.stage.io.network;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

src/main/java/teetime/stage/kieker/traceReconstruction/TraceReconstructionFilter.java → src/main/java/teetime/stage/trace/traceReconstruction/TraceReconstructionFilter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package teetime.stage.kieker.traceReconstruction;
+package teetime.stage.trace.traceReconstruction;
 
 import java.util.concurrent.TimeUnit;
 

src/main/java/teetime/stage/kieker/traceReduction/TraceAggregationBuffer.java → src/main/java/teetime/stage/trace/traceReduction/TraceAggregationBuffer.java

-package teetime.stage.kieker.traceReduction;
+package teetime.stage.trace.traceReduction;
 
 import kieker.analysis.plugin.filter.flow.TraceEventRecords;
 

src/main/java/teetime/stage/kieker/traceReduction/TraceComperator.java → src/main/java/teetime/stage/trace/traceReduction/TraceComperator.java

-package teetime.stage.kieker.traceReduction;
+package teetime.stage.trace.traceReduction;
 
 import java.io.Serializable;
 import java.util.Comparator;