From 7b763979d9419f1d6be0f71053f51b63b3e7a4b1 Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Sat, 7 Jul 2018 16:00:37 +0200 Subject: [PATCH] clean up non-functioning and duplicate files --- .../jastadd/driver/JastaddDriverFactory.java | 0 .../DeserializationException.java | 0 .../driver/deserializer/JsonDeserializer.java | 0 .../driver/serializer/ASTNodeSerializer.java | 62 ------------------- .../driver/serializer/JsonSerializer.java | 35 ----------- .../driver/serializer/ListSerializer.java | 35 ----------- .../driver/serializer/OptSerializer.java | 36 ----------- .../jastadd/driver/JastaddDriverFactory.java | 31 ---------- .../DeserializationException.java | 22 ------- .../driver/deserializer/JsonDeserializer.java | 37 ----------- .../driver/serializer/ASTNodeSerializer.java | 62 ------------------- .../driver/serializer/JsonSerializer.java | 35 ----------- .../driver/serializer/ListSerializer.java | 35 ----------- .../driver/serializer/OptSerializer.java | 36 ----------- .../jastadd/driver/JastaddDriverFactory.java | 31 ---------- .../DeserializationException.java | 22 ------- .../driver/deserializer/JsonDeserializer.java | 37 ----------- 17 files changed, 516 deletions(-) rename {trainbenchmark-tool-jastadd-namelookup-base => trainbenchmark-tool-jastadd-base}/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java (100%) rename {trainbenchmark-tool-jastadd-namelookup-base => trainbenchmark-tool-jastadd-base}/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java (100%) rename {trainbenchmark-tool-jastadd-namelookup-base => trainbenchmark-tool-jastadd-base}/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java (100%) delete mode 100644 trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java delete mode 100644 trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java delete mode 100644 trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java delete mode 100644 trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java b/trainbenchmark-tool-jastadd-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java similarity index 100% rename from trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java rename to trainbenchmark-tool-jastadd-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java b/trainbenchmark-tool-jastadd-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java similarity index 100% rename from trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java rename to trainbenchmark-tool-jastadd-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java b/trainbenchmark-tool-jastadd-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java similarity index 100% rename from trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java rename to trainbenchmark-tool-jastadd-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java b/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java deleted file mode 100644 index a4ec03f13..000000000 --- a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.Child; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.ListChild; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.OptChild; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.Token; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class ASTNodeSerializer extends StdSerializer<ASTNode> { - - public ASTNodeSerializer() { - this(null); - } - - public ASTNodeSerializer(Class<ASTNode> t) { - super(t); - } - - @Override - public void serialize( - ASTNode value, JsonGenerator jgen, SerializerProvider provider) - throws IOException { - - jgen.writeStartObject(); - jgen.writeStringField("k", "NT"); - jgen.writeStringField("t", value.getClass().getSimpleName()); - jgen.writeObjectFieldStart("c"); - for (Method m : value.getClass().getMethods()) { - try { - if (m.getAnnotation(Child.class) != null) { - jgen.writeFieldName(m.getAnnotation(Child.class).name()); - provider.defaultSerializeValue(m.invoke(value), jgen); - } else if (m.getAnnotation(Token.class) != null) { - jgen.writeFieldName(m.getAnnotation(Token.class).name()); - jgen.writeStartObject(); - jgen.writeStringField("k", m.getReturnType().isEnum() ? "enum" : "t"); - jgen.writeStringField("t", m.getReturnType().getName()); - jgen.writeFieldName("v"); - provider.defaultSerializeValue(m.invoke(value), jgen); - jgen.writeEndObject(); - } else if (m.getAnnotation(ListChild.class) != null) { - jgen.writeFieldName(m.getAnnotation(ListChild.class).name()); - provider.defaultSerializeValue(m.invoke(value), jgen); - } else if (m.getAnnotation(OptChild.class) != null) { - jgen.writeFieldName(m.getAnnotation(OptChild.class).name()); - provider.defaultSerializeValue(m.invoke(value), jgen); - } - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); - } - } - jgen.writeEndObject(); - jgen.writeEndObject(); - } -} diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java b/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java deleted file mode 100644 index 34e9f725a..000000000 --- a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.module.SimpleModule; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.List; -import de.tudresden.inf.st.train.jastadd.ast.Opt; -import de.tudresden.inf.st.train.jastadd.ast.RailwayContainer; - -import java.io.File; -import java.io.IOException; - - -public class JsonSerializer { - - public static void write(RailwayContainer r, String fileName) { - ObjectMapper mapper = new ObjectMapper(); - mapper.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS); - mapper.enable(SerializationFeature.INDENT_OUTPUT); - - SimpleModule module = new SimpleModule(); - module.addSerializer(ASTNode.class, new ASTNodeSerializer()); - module.addSerializer(List.class, new ListSerializer()); - module.addSerializer(Opt.class, new OptSerializer()); - mapper.registerModule(module); - - try { - mapper.writeValue(new File(fileName), r); - } catch (IOException e) { - e.printStackTrace(); - } - - } -} diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java b/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java deleted file mode 100644 index 9282bcc81..000000000 --- a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.List; - -import java.io.IOException; - -public class ListSerializer extends StdSerializer<List> { - - public ListSerializer() { - this(null); - } - - public ListSerializer(Class<List> t) { - super(t); - } - - @Override - public void serialize( - List value, JsonGenerator jgen, SerializerProvider provider) - throws IOException { - - jgen.writeStartObject(); - jgen.writeStringField("k", "List"); - jgen.writeArrayFieldStart("c"); - for (ASTNode child : (Iterable<ASTNode>) value.astChildren()) { - provider.defaultSerializeValue(child, jgen); - } - jgen.writeEndArray(); - jgen.writeEndObject(); - } -} diff --git a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java b/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java deleted file mode 100644 index 138a9c4d6..000000000 --- a/trainbenchmark-tool-jastadd-namelookup-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.Opt; - -import java.io.IOException; - -public class OptSerializer extends StdSerializer<Opt> { - - public OptSerializer() { - this(null); - } - - public OptSerializer(Class<Opt> t) { - super(t); - } - - @Override - public void serialize( - Opt value, JsonGenerator jgen, SerializerProvider provider) - throws IOException { - - jgen.writeStartObject(); - jgen.writeStringField("k", "Opt"); - if (value.getNumChild() > 0) { - jgen.writeFieldName("c"); - for (ASTNode child : (Iterable<ASTNode>) value.astChildren()) { - provider.defaultSerializeValue(child, jgen); - } - } - jgen.writeEndObject(); - } -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java deleted file mode 100644 index 1224c17a9..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver; - -import de.tudresden.inf.st.train.jastadd.ast.ASTState; -import hu.bme.mit.trainbenchmark.benchmark.driver.DriverFactory; - -public class JastaddDriverFactory extends DriverFactory<JastaddDriver> { - - protected final boolean flushCaches; - - public ASTState.Trace.Receiver getReceiver() { - return receiver; - } - - public void setReceiver(ASTState.Trace.Receiver receiver) { - this.receiver = receiver; - } - - private ASTState.Trace.Receiver receiver; - - public JastaddDriverFactory(boolean flushCaches) { - super(); - this.flushCaches = flushCaches; - } - - - @Override - public JastaddDriver createInstance() throws Exception { - return new JastaddDriver(flushCaches, receiver); - } - -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java deleted file mode 100644 index b85452702..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.deserializer; - -public class DeserializationException extends RuntimeException { - public DeserializationException() { - } - - public DeserializationException(String message) { - super(message); - } - - public DeserializationException(String message, Throwable cause) { - super(message, cause); - } - - public DeserializationException(Throwable cause) { - super(cause); - } - - public DeserializationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java deleted file mode 100644 index 76d8a0241..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.deserializer; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.RailwayContainer; - -import java.io.File; -import java.io.IOException; - -/** - * Created by jm on 5/15/17. - */ -public class JsonDeserializer { - - public static RailwayContainer read(File file) { - ObjectMapper mapper = new ObjectMapper(); - SimpleModule module = new SimpleModule(); - module.addDeserializer(ASTNode.class, new ASTNodeDeserializer()); - mapper.registerModule(module); - - try { - ASTNode readValue = mapper.readValue(file, ASTNode.class); - - if (readValue instanceof RailwayContainer) { - return (RailwayContainer) readValue; - } else { - throw new RuntimeException("Cound not read a complete model"); - } - - } catch (IOException e) { - e.printStackTrace(); - } - throw new RuntimeException("Cound not read the model file " + file.getName()); - } - -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java deleted file mode 100644 index a4ec03f13..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ASTNodeSerializer.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.Child; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.ListChild; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.OptChild; -import de.tudresden.inf.st.train.jastadd.ast.ASTNodeAnnotation.Token; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class ASTNodeSerializer extends StdSerializer<ASTNode> { - - public ASTNodeSerializer() { - this(null); - } - - public ASTNodeSerializer(Class<ASTNode> t) { - super(t); - } - - @Override - public void serialize( - ASTNode value, JsonGenerator jgen, SerializerProvider provider) - throws IOException { - - jgen.writeStartObject(); - jgen.writeStringField("k", "NT"); - jgen.writeStringField("t", value.getClass().getSimpleName()); - jgen.writeObjectFieldStart("c"); - for (Method m : value.getClass().getMethods()) { - try { - if (m.getAnnotation(Child.class) != null) { - jgen.writeFieldName(m.getAnnotation(Child.class).name()); - provider.defaultSerializeValue(m.invoke(value), jgen); - } else if (m.getAnnotation(Token.class) != null) { - jgen.writeFieldName(m.getAnnotation(Token.class).name()); - jgen.writeStartObject(); - jgen.writeStringField("k", m.getReturnType().isEnum() ? "enum" : "t"); - jgen.writeStringField("t", m.getReturnType().getName()); - jgen.writeFieldName("v"); - provider.defaultSerializeValue(m.invoke(value), jgen); - jgen.writeEndObject(); - } else if (m.getAnnotation(ListChild.class) != null) { - jgen.writeFieldName(m.getAnnotation(ListChild.class).name()); - provider.defaultSerializeValue(m.invoke(value), jgen); - } else if (m.getAnnotation(OptChild.class) != null) { - jgen.writeFieldName(m.getAnnotation(OptChild.class).name()); - provider.defaultSerializeValue(m.invoke(value), jgen); - } - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); - } - } - jgen.writeEndObject(); - jgen.writeEndObject(); - } -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java deleted file mode 100644 index 34e9f725a..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/JsonSerializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.module.SimpleModule; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.List; -import de.tudresden.inf.st.train.jastadd.ast.Opt; -import de.tudresden.inf.st.train.jastadd.ast.RailwayContainer; - -import java.io.File; -import java.io.IOException; - - -public class JsonSerializer { - - public static void write(RailwayContainer r, String fileName) { - ObjectMapper mapper = new ObjectMapper(); - mapper.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS); - mapper.enable(SerializationFeature.INDENT_OUTPUT); - - SimpleModule module = new SimpleModule(); - module.addSerializer(ASTNode.class, new ASTNodeSerializer()); - module.addSerializer(List.class, new ListSerializer()); - module.addSerializer(Opt.class, new OptSerializer()); - mapper.registerModule(module); - - try { - mapper.writeValue(new File(fileName), r); - } catch (IOException e) { - e.printStackTrace(); - } - - } -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java deleted file mode 100644 index 9282bcc81..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/ListSerializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.List; - -import java.io.IOException; - -public class ListSerializer extends StdSerializer<List> { - - public ListSerializer() { - this(null); - } - - public ListSerializer(Class<List> t) { - super(t); - } - - @Override - public void serialize( - List value, JsonGenerator jgen, SerializerProvider provider) - throws IOException { - - jgen.writeStartObject(); - jgen.writeStringField("k", "List"); - jgen.writeArrayFieldStart("c"); - for (ASTNode child : (Iterable<ASTNode>) value.astChildren()) { - provider.defaultSerializeValue(child, jgen); - } - jgen.writeEndArray(); - jgen.writeEndObject(); - } -} diff --git a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java b/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java deleted file mode 100644 index 138a9c4d6..000000000 --- a/trainbenchmark-tool-jastadd-optimized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/serializer/OptSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.serializer; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.Opt; - -import java.io.IOException; - -public class OptSerializer extends StdSerializer<Opt> { - - public OptSerializer() { - this(null); - } - - public OptSerializer(Class<Opt> t) { - super(t); - } - - @Override - public void serialize( - Opt value, JsonGenerator jgen, SerializerProvider provider) - throws IOException { - - jgen.writeStartObject(); - jgen.writeStringField("k", "Opt"); - if (value.getNumChild() > 0) { - jgen.writeFieldName("c"); - for (ASTNode child : (Iterable<ASTNode>) value.astChildren()) { - provider.defaultSerializeValue(child, jgen); - } - } - jgen.writeEndObject(); - } -} diff --git a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java deleted file mode 100644 index 1224c17a9..000000000 --- a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/JastaddDriverFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver; - -import de.tudresden.inf.st.train.jastadd.ast.ASTState; -import hu.bme.mit.trainbenchmark.benchmark.driver.DriverFactory; - -public class JastaddDriverFactory extends DriverFactory<JastaddDriver> { - - protected final boolean flushCaches; - - public ASTState.Trace.Receiver getReceiver() { - return receiver; - } - - public void setReceiver(ASTState.Trace.Receiver receiver) { - this.receiver = receiver; - } - - private ASTState.Trace.Receiver receiver; - - public JastaddDriverFactory(boolean flushCaches) { - super(); - this.flushCaches = flushCaches; - } - - - @Override - public JastaddDriver createInstance() throws Exception { - return new JastaddDriver(flushCaches, receiver); - } - -} diff --git a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java deleted file mode 100644 index b85452702..000000000 --- a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/DeserializationException.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.deserializer; - -public class DeserializationException extends RuntimeException { - public DeserializationException() { - } - - public DeserializationException(String message) { - super(message); - } - - public DeserializationException(String message, Throwable cause) { - super(message, cause); - } - - public DeserializationException(Throwable cause) { - super(cause); - } - - public DeserializationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} diff --git a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java b/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java deleted file mode 100644 index 76d8a0241..000000000 --- a/trainbenchmark-tool-jastadd-specialized-base/src/main/java/de/tudresden/inf/st/train/jastadd/driver/deserializer/JsonDeserializer.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.driver.deserializer; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import de.tudresden.inf.st.train.jastadd.ast.ASTNode; -import de.tudresden.inf.st.train.jastadd.ast.RailwayContainer; - -import java.io.File; -import java.io.IOException; - -/** - * Created by jm on 5/15/17. - */ -public class JsonDeserializer { - - public static RailwayContainer read(File file) { - ObjectMapper mapper = new ObjectMapper(); - SimpleModule module = new SimpleModule(); - module.addDeserializer(ASTNode.class, new ASTNodeDeserializer()); - mapper.registerModule(module); - - try { - ASTNode readValue = mapper.readValue(file, ASTNode.class); - - if (readValue instanceof RailwayContainer) { - return (RailwayContainer) readValue; - } else { - throw new RuntimeException("Cound not read a complete model"); - } - - } catch (IOException e) { - e.printStackTrace(); - } - throw new RuntimeException("Cound not read the model file " + file.getName()); - } - -} -- GitLab