From 2a8fd7b0af11da732ca3ecea9a63fe3e5431eb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Fri, 22 Jan 2016 15:56:53 +0100
Subject: [PATCH] refactor domain package
---
.../java/kieker/analysis/TraceAnalysisConfiguration.java | 8 ++++----
.../analysis/dev/AggregatedTraceCallsDecorator.java | 8 ++++----
src/main/java/kieker/analysis/dev/DependencyCreator.java | 2 +-
.../java/kieker/analysis/dev/DependencyCreatorStage.java | 2 +-
.../analysis/dev/DependencyStatisticsDecorator.java | 2 +-
.../java/kieker/analysis/dev/OperationsDependency.java | 4 ++--
.../kieker/analysis/dev/OperationsDependencyRelation.java | 2 +-
.../AbstractOperationCall.java | 2 +-
.../{traceanalysisdomain => domain}/AbstractTrace.java | 2 +-
.../AggregatedOperationCall.java | 2 +-
.../{traceanalysisdomain => domain}/AggregatedTrace.java | 2 +-
.../{traceanalysisdomain => domain}/OperationCall.java | 2 +-
.../analysis/{traceanalysisdomain => domain}/Trace.java | 2 +-
.../AggregatedTraceStatisticsDecorator.java | 8 ++++----
.../stage/tracediagnosis/AllowedRecordsFilter.java | 4 +++-
.../stage/tracediagnosis/LegacyTraceReconstructor.java | 4 ++--
.../stage/tracediagnosis/OperationCallAggregator.java | 4 ++--
.../stage/tracediagnosis/OperationCallExtractor.java | 4 ++--
.../tracediagnosis/OperationCallHandlerComposite.java | 6 +++---
.../stage/tracediagnosis/TraceAggregationComposite.java | 4 ++--
.../analysis/stage/tracediagnosis/TraceAggregator.java | 6 +++---
.../tracediagnosis/TraceReconstructionComposite.java | 2 +-
.../analysis/stage/tracediagnosis/TraceReconstructor.java | 4 ++--
.../stage/tracediagnosis/TraceStatisticsDecorator.java | 4 ++--
.../trace/traversal/AbstractTraceToGraphTransformer.java | 2 +-
.../trace/traversal/AggrTraceToGraphTransformer.java | 2 +-
.../analysis/trace/traversal/AggrTraceTraverserStage.java | 4 ++--
.../analysis/trace/traversal/OperationCallVisitor.java | 2 +-
.../analysis/trace/traversal/TraceToGraphTransformer.java | 2 +-
.../kieker/analysis/trace/traversal/TraceTraverser.java | 4 ++--
.../analysis/trace/traversal/TraceTraverserStage.java | 4 ++--
31 files changed, 56 insertions(+), 54 deletions(-)
rename src/main/java/kieker/analysis/{traceanalysisdomain => domain}/AbstractOperationCall.java (95%)
rename src/main/java/kieker/analysis/{traceanalysisdomain => domain}/AbstractTrace.java (95%)
rename src/main/java/kieker/analysis/{traceanalysisdomain => domain}/AggregatedOperationCall.java (95%)
rename src/main/java/kieker/analysis/{traceanalysisdomain => domain}/AggregatedTrace.java (93%)
rename src/main/java/kieker/analysis/{traceanalysisdomain => domain}/OperationCall.java (95%)
rename src/main/java/kieker/analysis/{traceanalysisdomain => domain}/Trace.java (93%)
diff --git a/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java b/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
index ded06fcd..366a7ba0 100644
--- a/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
+++ b/src/main/java/kieker/analysis/TraceAnalysisConfiguration.java
@@ -11,6 +11,10 @@ import com.tinkerpop.blueprints.Graph;
import kieker.analysis.dev.DependencyCreatorStage;
import kieker.analysis.dev.DependencyStatisticsDecoratorStage;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.analysis.stage.tracediagnosis.AllowedRecordsFilter;
import kieker.analysis.stage.tracediagnosis.BeginEndOfMonitoringDetector;
import kieker.analysis.stage.tracediagnosis.OperationCallHandlerComposite;
@@ -22,10 +26,6 @@ import kieker.analysis.trace.graphoutput.GraphMLWriter;
import kieker.analysis.trace.traversal.AggrTraceTraverserStage;
import kieker.analysis.trace.traversal.NamedGraph;
import kieker.analysis.trace.traversal.TraceTraverserStage;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
import kieker.common.record.IMonitoringRecord;
import kieker.common.record.misc.KiekerMetadataRecord;
diff --git a/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java b/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java
index ebeaa804..96901493 100644
--- a/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java
+++ b/src/main/java/kieker/analysis/dev/AggregatedTraceCallsDecorator.java
@@ -2,10 +2,10 @@ package kieker.analysis.dev;
import java.util.Iterator;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/dev/DependencyCreator.java b/src/main/java/kieker/analysis/dev/DependencyCreator.java
index 85e4adca..70400484 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreator.java
+++ b/src/main/java/kieker/analysis/dev/DependencyCreator.java
@@ -1,7 +1,7 @@
package kieker.analysis.dev;
+import kieker.analysis.domain.AggregatedOperationCall;
import kieker.analysis.trace.traversal.OperationCallVisitor;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
public class DependencyCreator extends OperationCallVisitor<AggregatedOperationCall> {
diff --git a/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java b/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
index 8b5ca671..f41fdfe3 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
+++ b/src/main/java/kieker/analysis/dev/DependencyCreatorStage.java
@@ -1,7 +1,7 @@
package kieker.analysis.dev;
+import kieker.analysis.domain.AggregatedTrace;
import kieker.analysis.trace.traversal.TraceTraverser;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
index 397bf945..ba60606e 100644
--- a/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/dev/DependencyStatisticsDecorator.java
@@ -3,7 +3,7 @@ package kieker.analysis.dev;
import java.util.List;
import java.util.stream.Collectors;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
import kieker.analysis.traceanalysisutil.Statistics;
import kieker.analysis.traceanalysisutil.StatisticsUtility;
diff --git a/src/main/java/kieker/analysis/dev/OperationsDependency.java b/src/main/java/kieker/analysis/dev/OperationsDependency.java
index 78a82a7c..2d1743bb 100644
--- a/src/main/java/kieker/analysis/dev/OperationsDependency.java
+++ b/src/main/java/kieker/analysis/dev/OperationsDependency.java
@@ -5,8 +5,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.OperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationCall;
/**
* This class represents an aggregated aggregated-trace. It connects
diff --git a/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java b/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
index d9ad5d24..696685c8 100644
--- a/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
+++ b/src/main/java/kieker/analysis/dev/OperationsDependencyRelation.java
@@ -1,6 +1,6 @@
package kieker.analysis.dev;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
/**
* Relation between two {@link AggregatedOperationCall}. Further it stores
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractOperationCall.java b/src/main/java/kieker/analysis/domain/AbstractOperationCall.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AbstractOperationCall.java
rename to src/main/java/kieker/analysis/domain/AbstractOperationCall.java
index d5716dc9..2ebd2805 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractOperationCall.java
+++ b/src/main/java/kieker/analysis/domain/AbstractOperationCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractTrace.java b/src/main/java/kieker/analysis/domain/AbstractTrace.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AbstractTrace.java
rename to src/main/java/kieker/analysis/domain/AbstractTrace.java
index d387df6e..056d6c79 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AbstractTrace.java
+++ b/src/main/java/kieker/analysis/domain/AbstractTrace.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
/**
* This is an abstract base for classes representing traces (a tree of operation calls) within this application. Technically this class is just a container for a
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedOperationCall.java b/src/main/java/kieker/analysis/domain/AggregatedOperationCall.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AggregatedOperationCall.java
rename to src/main/java/kieker/analysis/domain/AggregatedOperationCall.java
index 272a9b7a..a483a0e3 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedOperationCall.java
+++ b/src/main/java/kieker/analysis/domain/AggregatedOperationCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
import java.util.LinkedList;
import java.util.List;
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedTrace.java b/src/main/java/kieker/analysis/domain/AggregatedTrace.java
similarity index 93%
rename from src/main/java/kieker/analysis/traceanalysisdomain/AggregatedTrace.java
rename to src/main/java/kieker/analysis/domain/AggregatedTrace.java
index 68d80455..bca7c81b 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/AggregatedTrace.java
+++ b/src/main/java/kieker/analysis/domain/AggregatedTrace.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
import java.util.List;
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/OperationCall.java b/src/main/java/kieker/analysis/domain/OperationCall.java
similarity index 95%
rename from src/main/java/kieker/analysis/traceanalysisdomain/OperationCall.java
rename to src/main/java/kieker/analysis/domain/OperationCall.java
index 05099f2a..dd0c7511 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/OperationCall.java
+++ b/src/main/java/kieker/analysis/domain/OperationCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
/**
* This class represents a concrete operation call within this application. It adds some properties that are only required for concrete operation calls, like the
diff --git a/src/main/java/kieker/analysis/traceanalysisdomain/Trace.java b/src/main/java/kieker/analysis/domain/Trace.java
similarity index 93%
rename from src/main/java/kieker/analysis/traceanalysisdomain/Trace.java
rename to src/main/java/kieker/analysis/domain/Trace.java
index 7a0f4e5e..eaafb6ba 100644
--- a/src/main/java/kieker/analysis/traceanalysisdomain/Trace.java
+++ b/src/main/java/kieker/analysis/domain/Trace.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.analysis.traceanalysisdomain;
+package kieker.analysis.domain;
/**
* This class represents a concrete trace within this application. It adds some properties that are only required for concrete traces, like the trace ID.
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java
index b54290c1..ad32e0d5 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/AggregatedTraceStatisticsDecorator.java
@@ -19,10 +19,10 @@ package kieker.analysis.stage.tracediagnosis;
import java.util.ArrayList;
import java.util.List;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.analysis.traceanalysisutil.Statistics;
import kieker.analysis.traceanalysisutil.StatisticsUtility;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java b/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java
index 113dc194..d5971a75 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/AllowedRecordsFilter.java
@@ -22,6 +22,7 @@ import kieker.common.record.flow.trace.TraceMetadata;
import kieker.common.record.flow.trace.operation.AfterOperationEvent;
import kieker.common.record.flow.trace.operation.BeforeOperationEvent;
import kieker.common.record.misc.KiekerMetadataRecord;
+
import teetime.stage.basic.AbstractTransformation;
/**
@@ -33,7 +34,8 @@ public final class AllowedRecordsFilter extends AbstractTransformation<IMonitori
@Override
protected void execute(final IMonitoringRecord element) {
- if (element instanceof TraceMetadata || element instanceof BeforeOperationEvent || element instanceof AfterOperationEvent || element instanceof KiekerMetadataRecord || element instanceof OperationExecutionRecord) {
+ if (element instanceof TraceMetadata || element instanceof BeforeOperationEvent || element instanceof AfterOperationEvent
+ || element instanceof KiekerMetadataRecord || element instanceof OperationExecutionRecord) {
super.getOutputPort().send(element);
} else {
ignoredRecords++;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java b/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java
index 81ce6a92..2d97e6dc 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/LegacyTraceReconstructor.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.common.record.controlflow.OperationExecutionRecord;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java
index be13a085..442dfc53 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallAggregator.java
@@ -21,8 +21,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.OperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationCall;
import kieker.analysis.traceanalysisutil.Statistics;
import kieker.analysis.traceanalysisutil.StatisticsUtility;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java
index edf4d8cb..159ead01 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallExtractor.java
@@ -16,8 +16,8 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java
index 2d24d489..1df76fda 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/OperationCallHandlerComposite.java
@@ -18,9 +18,9 @@ package kieker.analysis.stage.tracediagnosis;
import java.util.List;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.framework.AbstractCompositeStage;
import teetime.framework.InputPort;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java
index a7d35e34..8f38d859 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregationComposite.java
@@ -17,8 +17,8 @@
package kieker.analysis.stage.tracediagnosis;
import kieker.analysis.dev.AggregatedTraceCallsDecorator;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.Trace;
import teetime.framework.AbstractCompositeStage;
import teetime.framework.InputPort;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java
index 3954532d..9ac3ab79 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceAggregator.java
@@ -16,14 +16,14 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
-import kieker.analysis.traceanalysisdomain.Trace;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import kieker.analysis.domain.AggregatedTrace;
+import kieker.analysis.domain.Trace;
+
import teetime.stage.basic.AbstractTransformation;
/**
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java
index 8d13a6b2..c731e116 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructionComposite.java
@@ -16,7 +16,7 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.Trace;
import kieker.common.record.IMonitoringRecord;
import kieker.common.record.controlflow.OperationExecutionRecord;
import kieker.common.record.flow.IFlowRecord;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java
index 3691c714..9bd6f2ae 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceReconstructor.java
@@ -23,8 +23,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import kieker.common.record.flow.IFlowRecord;
import kieker.common.record.flow.trace.TraceMetadata;
import kieker.common.record.flow.trace.operation.AbstractOperationEvent;
diff --git a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java
index ba1d6c97..547b5af3 100644
--- a/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java
+++ b/src/main/java/kieker/analysis/stage/tracediagnosis/TraceStatisticsDecorator.java
@@ -16,8 +16,8 @@
package kieker.analysis.stage.tracediagnosis;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
index d7cec93d..b2972fb4 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AbstractTraceToGraphTransformer.java
@@ -5,7 +5,7 @@ import com.tinkerpop.blueprints.Graph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
-import kieker.analysis.traceanalysisdomain.AbstractOperationCall;
+import kieker.analysis.domain.AbstractOperationCall;
public abstract class AbstractTraceToGraphTransformer<C extends AbstractOperationCall<C>> extends OperationCallVisitor<C> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
index 2dab2aef..d918fd97 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AggrTraceToGraphTransformer.java
@@ -3,7 +3,7 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Vertex;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedOperationCall;
import kieker.analysis.util.NameConverter;
public class AggrTraceToGraphTransformer extends AbstractTraceToGraphTransformer<AggregatedOperationCall> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java b/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
index d570e418..56a8eee6 100644
--- a/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
+++ b/src/main/java/kieker/analysis/trace/traversal/AggrTraceTraverserStage.java
@@ -2,8 +2,8 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Graph;
-import kieker.analysis.traceanalysisdomain.AggregatedOperationCall;
-import kieker.analysis.traceanalysisdomain.AggregatedTrace;
+import kieker.analysis.domain.AggregatedOperationCall;
+import kieker.analysis.domain.AggregatedTrace;
import teetime.stage.basic.AbstractTransformation;
diff --git a/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java b/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java
index 50864506..a035d00f 100644
--- a/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java
+++ b/src/main/java/kieker/analysis/trace/traversal/OperationCallVisitor.java
@@ -1,6 +1,6 @@
package kieker.analysis.trace.traversal;
-import kieker.analysis.traceanalysisdomain.AbstractOperationCall;
+import kieker.analysis.domain.AbstractOperationCall;
public abstract class OperationCallVisitor<C extends AbstractOperationCall<C>> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java b/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
index cde5155b..594e51c1 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceToGraphTransformer.java
@@ -3,7 +3,7 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Vertex;
-import kieker.analysis.traceanalysisdomain.OperationCall;
+import kieker.analysis.domain.OperationCall;
import kieker.analysis.util.NameConverter;
public class TraceToGraphTransformer extends AbstractTraceToGraphTransformer<OperationCall> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java b/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java
index 989f5a74..fb031a6f 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceTraverser.java
@@ -3,8 +3,8 @@ package kieker.analysis.trace.traversal;
import java.util.ArrayList;
import java.util.List;
-import kieker.analysis.traceanalysisdomain.AbstractOperationCall;
-import kieker.analysis.traceanalysisdomain.AbstractTrace;
+import kieker.analysis.domain.AbstractOperationCall;
+import kieker.analysis.domain.AbstractTrace;
public class TraceTraverser<T extends AbstractTrace<C>, C extends AbstractOperationCall<C>> {
diff --git a/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java b/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
index bae43357..fc37ae7e 100644
--- a/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
+++ b/src/main/java/kieker/analysis/trace/traversal/TraceTraverserStage.java
@@ -2,8 +2,8 @@ package kieker.analysis.trace.traversal;
import com.tinkerpop.blueprints.Graph;
-import kieker.analysis.traceanalysisdomain.OperationCall;
-import kieker.analysis.traceanalysisdomain.Trace;
+import kieker.analysis.domain.OperationCall;
+import kieker.analysis.domain.Trace;
import teetime.stage.basic.AbstractTransformation;
--
GitLab