From 7f303a21c1b8d7dad02f167642dcf4e3f20cfdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Fri, 22 Apr 2016 10:34:30 +0200
Subject: [PATCH] removed deprecated files
---
.../trace/graphoutput/DotGraphWriter.java | 82 ----------
.../trace/graphoutput/GraphMLWriter.java | 43 -----
.../java/kieker/analysis/util/DotBuilder.java | 148 ------------------
3 files changed, 273 deletions(-)
delete mode 100644 src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java
delete mode 100644 src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java
delete mode 100644 src/main/java/kieker/analysis/util/DotBuilder.java
diff --git a/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java b/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java
deleted file mode 100644
index 47773756..00000000
--- a/src/main/java/kieker/analysis/trace/graphoutput/DotGraphWriter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package kieker.analysis.trace.graphoutput;
-
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.tinkerpop.blueprints.Direction;
-import com.tinkerpop.blueprints.Edge;
-import com.tinkerpop.blueprints.Graph;
-import com.tinkerpop.blueprints.Vertex;
-
-import kieker.analysis.util.DotBuilder;
-import kieker.analysis.util.blueprintsgraph.NamedGraph;
-import kieker.analysis.util.graph.export.dot.DotFileWriterStage;
-
-import teetime.framework.AbstractConsumerStage;
-
-/**
- * @deprecated use {@link DotFileWriterStage} instead.
- *
- * @author Sören Henning
- *
- */
-@Deprecated
-public class DotGraphWriter extends AbstractConsumerStage<NamedGraph<Graph>> {
-
- private final String outputDir;
-
- public DotGraphWriter(final String outputDir) {
- this.outputDir = outputDir;
- }
-
- @Override
- protected void execute(final NamedGraph<Graph> graph) {
- final String dotGraph = createDotGraph(graph);
- final String fileName = outputDir + "/" + graph.getFileName() + ".dot";
-
- try {
- writeDotGraphFile(dotGraph, fileName);
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }
-
- private String createDotGraph(final Graph graph) {
-
- DotBuilder dotGraph = new DotBuilder();
-
- Map<String, String> nodeProperties = new HashMap<>();
- nodeProperties.put("shape", "none");
-
- dotGraph.setDefaultNodeProperties(nodeProperties);
-
- for (Vertex vertex : graph.getVertices()) {
- String label = vertex.getProperty("label");
- dotGraph.addNode(String.valueOf(vertex.getId()), label);
- }
-
- for (Edge edge : graph.getEdges()) {
- String source = edge.getVertex(Direction.OUT).getId().toString();
- String target = edge.getVertex(Direction.IN).getId().toString();
- dotGraph.addEdge(source, target, edge.getLabel());
- }
-
- return dotGraph.get();
- }
-
- private void writeDotGraphFile(final String dotGraph, final String fileName) throws IOException {
-
- final OutputStream outputStream = new FileOutputStream(fileName);
-
- final Writer writer = new BufferedWriter(new OutputStreamWriter(outputStream, "utf-8"));
- writer.write(dotGraph);
- writer.close();
-
- }
-}
diff --git a/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java b/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java
deleted file mode 100644
index 8afe3d5c..00000000
--- a/src/main/java/kieker/analysis/trace/graphoutput/GraphMLWriter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package kieker.analysis.trace.graphoutput;
-
-import java.io.IOException;
-
-import com.tinkerpop.blueprints.Graph;
-
-import kieker.analysis.util.blueprintsgraph.NamedGraph;
-import kieker.analysis.util.graph.export.graphml.GraphMLFileWriterStage;
-
-import teetime.framework.AbstractConsumerStage;
-
-/**
- * @deprecated use {@link GraphMLFileWriterStage} instead.
- *
- * @author Sören Henning
- *
- */
-@Deprecated
-public class GraphMLWriter extends AbstractConsumerStage<NamedGraph<Graph>> {
-
- private final String outputDir;
-
- public GraphMLWriter(final String outputDir) {
- this.outputDir = outputDir;
- }
-
- @Override
- protected void execute(final NamedGraph<Graph> graph) {
-
- String outputFile = outputDir + "/" + graph.getFileName() + ".xml";
-
- com.tinkerpop.blueprints.util.io.graphml.GraphMLWriter writer = new com.tinkerpop.blueprints.util.io.graphml.GraphMLWriter(graph);
- writer.setNormalize(true);
-
- try {
- writer.outputGraph(outputFile);
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
-
- }
-
-}
diff --git a/src/main/java/kieker/analysis/util/DotBuilder.java b/src/main/java/kieker/analysis/util/DotBuilder.java
deleted file mode 100644
index c00f1cae..00000000
--- a/src/main/java/kieker/analysis/util/DotBuilder.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package kieker.analysis.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.google.common.base.Joiner;
-
-import kieker.analysis.util.graph.util.dot.DotGraphWriter;
-
-/**
- * Simple class for building and representing dot graph files.
- *
- * @deprecated use {@link DotGraphWriter} instead.
- *
- * @author Sören Henning
- *
- */
-@Deprecated
-public class DotBuilder {
-
- private final String start;
- private final String end;
- private final StringBuilder body = new StringBuilder();
-
- private Map<String, String> defaultNodeProperties;
- private Map<String, String> defaultEdgeProperties;
- private Map<String, String> defaultProperties;
-
- private static final String START_BRACKET = "{";
- private static final String END_BRACKET = "}";
- private static final String DEFAULT_GRAPH_NAME = "G";
- private static final String DEFAULT_GRAPH_TYPE = "digraph";
-
- public DotBuilder() {
- this(DEFAULT_GRAPH_NAME);
- }
-
- public DotBuilder(final String graphName) {
- this(graphName, DEFAULT_GRAPH_TYPE);
- }
-
- public DotBuilder(final String graphName, final String graphType) {
- start = graphType + " " + graphName + " " + START_BRACKET + "\n";
- end = END_BRACKET;
- }
-
- public DotBuilder(final String name, final Map<String, String> defaultNodeProperties, final Map<String, String> defaultEdgeProperties) {
- this(name);
- this.defaultNodeProperties = defaultNodeProperties;
- this.defaultEdgeProperties = defaultEdgeProperties;
- }
-
- public DotBuilder(final String name, final Map<String, String> defaultNodeProperties, final Map<String, String> defaultEdgeProperties,
- final Map<String, String> defaultProperties) {
- this(name, defaultNodeProperties, defaultEdgeProperties);
- this.defaultProperties = defaultProperties;
- }
-
- public void setDefaultNodeProperties(final Map<String, String> defaultNodeProperties) {
- this.defaultNodeProperties = defaultNodeProperties;
- }
-
- public void setDefaultEdgeProperties(final Map<String, String> defaultEdgeProperties) {
- this.defaultEdgeProperties = defaultEdgeProperties;
- }
-
- public void setDefaultProperties(final Map<String, String> defaultProperties) {
- this.defaultProperties = defaultProperties;
- }
-
- public String get() {
- return start + body.toString() + end;
- }
-
- @Override
- public String toString() {
- return get();
- }
-
- public void addNode(final String id) {
- addNode(id, new HashMap<>());
- }
-
- public void addNode(final String id, final String label) {
- Map<String, String> properties = new HashMap<String, String>();
- properties.put("label", label);
- addNode(id, properties);
- }
-
- public void addNode(final String id, final Map<String, String> properties) {
- addElement('"' + id + '"', extendNodeProperties(properties));
- }
-
- public void addEdge(final String source, final String target) {
- addEdge(source, target, new HashMap<>());
- }
-
- public void addEdge(final String source, final String target, final String label) {
- Map<String, String> properties = new HashMap<String, String>();
- properties.put("label", label);
- addEdge(source, target, properties);
- }
-
- public void addEdge(final String source, final String target, final Map<String, String> properties) {
- addElement('"' + source + '"' + " -> " + '"' + target + '"', extendEdgeProperties(properties));
- }
-
- public void addSubgraph(final String subgraph) {
- body.append(subgraph + '\n');
- }
-
- private void addElement(final String element, final Map<String, String> properties) {
- body.append(element);
- if (properties != null && !properties.isEmpty()) {
- body.append(" [");
- Joiner.on("\", ").withKeyValueSeparator("=\"").appendTo(body, properties);
- body.append("\"]");
- }
- body.append('\n');
- }
-
- private Map<String, String> extendNodeProperties(final Map<String, String> properties) {
- return extendElementProperties(properties, defaultNodeProperties);
- }
-
- private Map<String, String> extendEdgeProperties(final Map<String, String> properties) {
- return extendElementProperties(properties, defaultEdgeProperties);
- }
-
- private Map<String, String> extendElementProperties(final Map<String, String> properties, final Map<String, String> defaultElementProperties) {
-
- if (defaultElementProperties != null) {
- for (Entry<String, String> property : defaultElementProperties.entrySet()) {
- properties.putIfAbsent(property.getKey(), property.getValue());
- }
- }
-
- if (defaultProperties != null) {
- for (Entry<String, String> property : defaultProperties.entrySet()) {
- properties.putIfAbsent(property.getKey(), property.getValue());
- }
- }
-
- return properties;
- }
-
-}
--
GitLab