From 0216fcd8c1fbf0da7eb979178fef7f9e954e58ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Tue, 29 Mar 2016 12:36:23 +0200
Subject: [PATCH] cleaned up
---
.../graph/export/AbstractExporter.java | 34 -------------------
...porter.java => BlueprintsTransformer.java} | 14 ++++----
.../analysis/graph/export/Exporter.java | 10 ------
3 files changed, 7 insertions(+), 51 deletions(-)
delete mode 100644 src/main/java/kieker/analysis/graph/export/AbstractExporter.java
rename src/main/java/kieker/analysis/graph/export/{BlueprintsExporter.java => BlueprintsTransformer.java} (67%)
delete mode 100644 src/main/java/kieker/analysis/graph/export/Exporter.java
diff --git a/src/main/java/kieker/analysis/graph/export/AbstractExporter.java b/src/main/java/kieker/analysis/graph/export/AbstractExporter.java
deleted file mode 100644
index 16ece18e..00000000
--- a/src/main/java/kieker/analysis/graph/export/AbstractExporter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package kieker.analysis.graph.export;
-
-import kieker.analysis.graph.Edge;
-import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.Vertex;
-
-//TODO unused
-public abstract class AbstractExporter<O> {
-
- protected Graph graph;
-
- public AbstractExporter(final Graph graph) {
- this.graph = graph;
- }
-
- public final O export() {
-
- for (final Vertex vertex : graph.getVertices()) {
- mapVertex(vertex);
- }
-
- for (final Edge edge : graph.getEdges()) {
- mapEdge(edge);
- }
-
- return getExport();
- }
-
- protected abstract void mapVertex(Vertex vertex);
-
- protected abstract void mapEdge(Edge edge);
-
- protected abstract O getExport();
-}
diff --git a/src/main/java/kieker/analysis/graph/export/BlueprintsExporter.java b/src/main/java/kieker/analysis/graph/export/BlueprintsTransformer.java
similarity index 67%
rename from src/main/java/kieker/analysis/graph/export/BlueprintsExporter.java
rename to src/main/java/kieker/analysis/graph/export/BlueprintsTransformer.java
index 710777f0..8d179e58 100644
--- a/src/main/java/kieker/analysis/graph/export/BlueprintsExporter.java
+++ b/src/main/java/kieker/analysis/graph/export/BlueprintsTransformer.java
@@ -10,20 +10,20 @@ import kieker.analysis.graph.Edge;
import kieker.analysis.graph.Graph;
import kieker.analysis.graph.Vertex;
-public class BlueprintsExporter extends AbstractExporter<com.tinkerpop.blueprints.Graph> {
+public class BlueprintsTransformer extends AbstractTransformer<com.tinkerpop.blueprints.Graph> {
- private final com.tinkerpop.blueprints.Graph exportGraph = new TinkerGraph();
+ private final com.tinkerpop.blueprints.Graph transformedGraph = new TinkerGraph();
private final Map<Vertex, com.tinkerpop.blueprints.Vertex> mappedVertices = new HashMap<>();
private static final String LABEL_PROPERTY = "label";
- public BlueprintsExporter(final Graph graph) {
+ public BlueprintsTransformer(final Graph graph) {
super(graph);
}
@Override
protected void mapVertex(final Vertex vertex) {
- com.tinkerpop.blueprints.Vertex mappedVertex = exportGraph.addVertex(vertex.getId());
+ com.tinkerpop.blueprints.Vertex mappedVertex = transformedGraph.addVertex(vertex.getId());
mappedVertices.put(vertex, mappedVertex);
for (final String propertyKey : vertex.getPropertyKeys()) {
mappedVertex.setProperty(propertyKey, vertex.getProperty(propertyKey));
@@ -39,15 +39,15 @@ public class BlueprintsExporter extends AbstractExporter<com.tinkerpop.blueprint
if (label == null) {
label = "";
}
- com.tinkerpop.blueprints.Edge mappedEdge = exportGraph.addEdge(edge.getId(), mappedOutVertex, mappedInVertex, label);
+ com.tinkerpop.blueprints.Edge mappedEdge = transformedGraph.addEdge(edge.getId(), mappedOutVertex, mappedInVertex, label);
for (final String propertyKey : edge.getPropertyKeys()) {
mappedEdge.setProperty(propertyKey, edge.getProperty(propertyKey));
}
}
@Override
- protected com.tinkerpop.blueprints.Graph getExport() {
- return exportGraph;
+ protected com.tinkerpop.blueprints.Graph getTransformation() {
+ return transformedGraph;
}
}
diff --git a/src/main/java/kieker/analysis/graph/export/Exporter.java b/src/main/java/kieker/analysis/graph/export/Exporter.java
deleted file mode 100644
index 7acabe6c..00000000
--- a/src/main/java/kieker/analysis/graph/export/Exporter.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package kieker.analysis.graph.export;
-
-import kieker.analysis.graph.Graph;
-
-//TODO maybe no interface required
-public interface Exporter<O> {
-
- public O export(Graph graph);
-
-}
--
GitLab