Skip to content
GitLab
Commit a53f0162 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Renamed all JSON transformations according to "TargetVersionV<major>_<minor>" naming scheme

parent de76d101
Hide whitespace changes
Inline Side-by-side
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV9ToV010.java → VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV0_10.java
View file @ a53f0162
......@@ -7,9 +7,9 @@ import org.vadere.simulator.projects.migration.MigrationException;
import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation;
@MigrationTransformation(targetVersionLabel = "0.10")
public class JsonTransformV9ToV010 extends SimpleJsonTransformation {
public class TargetVersionV0_10 extends SimpleJsonTransformation {
public JsonTransformV9ToV010() {
public TargetVersionV0_10() {
super(Version.V0_10);
}
......
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV7ToV8.java → VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV0_8.java
View file @ a53f0162
......@@ -15,11 +15,11 @@ import java.util.ArrayList;
import java.util.stream.Collectors;
@MigrationTransformation(targetVersionLabel = "0.8")
public class JsonTransformV7ToV8 extends SimpleJsonTransformation {
public class TargetVersionV0_8 extends SimpleJsonTransformation {
ObjectMapper mapper;
public JsonTransformV7ToV8() {
public TargetVersionV0_8() {
super(Version.V0_8);
this.mapper = StateJsonConverter.getMapper();
}
......@@ -165,7 +165,7 @@ public class JsonTransformV7ToV8 extends SimpleJsonTransformation {
String jsonStr = r.lines().collect(Collectors.joining("\n"));
ObjectMapper mapper = StateJsonConverter.getMapper();
JsonNode jsonNode = StateJsonConverter.deserializeToNode(jsonStr);
JsonTransformV7ToV8 transformation = new JsonTransformV7ToV8();
TargetVersionV0_8 transformation = new TargetVersionV0_8();
JsonNode newScenario = transformation.applyAll(jsonNode);
......
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV1_0ToV01_1.java → VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_1.java
View file @ a53f0162
......@@ -10,9 +10,9 @@ import org.vadere.simulator.projects.migration.MigrationException;
import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation;
@MigrationTransformation(targetVersionLabel = "1.1")
public class JsonTransformV1_0ToV01_1 extends SimpleJsonTransformation {
public class TargetVersionV1_1 extends SimpleJsonTransformation {
public JsonTransformV1_0ToV01_1() {
public TargetVersionV1_1() {
super(Version.V1_1);
}
......
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_1ToV1_2.java → VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_2.java
View file @ a53f0162
......@@ -8,9 +8,9 @@ import org.vadere.simulator.projects.migration.MigrationException;
import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation;
@MigrationTransformation(targetVersionLabel = "1.2")
public class JsonTransformationV1_1ToV1_2 extends SimpleJsonTransformation {
public class TargetVersionV1_2 extends SimpleJsonTransformation {
public JsonTransformationV1_1ToV1_2(){
public TargetVersionV1_2(){
super(Version.V1_2);
}
......
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_3ToV1_4.java → VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_4.java
View file @ a53f0162
......@@ -8,9 +8,9 @@ import org.vadere.simulator.projects.migration.MigrationException;
import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation;
@MigrationTransformation(targetVersionLabel = "1.4")
public class JsonTransformationV1_3ToV1_4 extends SimpleJsonTransformation {
public class TargetVersionV1_4 extends SimpleJsonTransformation {
public JsonTransformationV1_3ToV1_4(){
public TargetVersionV1_4(){
super(Version.V1_4);
}
......
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_4ToV1_5.java → VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_5.java
View file @ a53f0162
......@@ -48,9 +48,9 @@ import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTrans
* - "salientBehavior" in "dynamicElements" node
*/
@MigrationTransformation(targetVersionLabel = "1.5")
public class JsonTransformationV1_4ToV1_5 extends SimpleJsonTransformation {
public class TargetVersionV1_5 extends SimpleJsonTransformation {
public JsonTransformationV1_4ToV1_5(){
public TargetVersionV1_5(){
super(Version.V1_5);
}
......
VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_1ToV1_2Test.java → VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_2Test.java
View file @ a53f0162
......@@ -11,7 +11,7 @@ import java.nio.file.Path;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
public class JsonTransformationV1_1ToV1_2Test extends JsonTransformationTest {
public class TargetVersionV1_2Test extends JsonTransformationTest {
@Override
public Path getTestDir() {
......@@ -27,7 +27,7 @@ public class JsonTransformationV1_1ToV1_2Test extends JsonTransformationTest {
assertThat(typeOld, equalTo("CSV_CACHE"));
JsonTransformationV1_1ToV1_2 transform = factory.getJsonTransformationV1_1ToV1_2();
TargetVersionV1_2 transform = factory.getJsonTransformationV1_1ToV1_2();
JsonNode jsonNew = transform.applyAll(old);
String typeNew =pathMustExist(jsonNew, "scenario/attributesModel/org.vadere.state.attributes.models.AttributesFloorField/cacheType").asText();
......@@ -42,7 +42,7 @@ public class JsonTransformationV1_1ToV1_2Test extends JsonTransformationTest {
assertThat(typeOld, equalTo("BIN_CACHE"));
JsonTransformationV1_1ToV1_2 transform = factory.getJsonTransformationV1_1ToV1_2();
TargetVersionV1_2 transform = factory.getJsonTransformationV1_1ToV1_2();
JsonNode jsonNew = transform.applyAll(old);
String typeNew =pathMustExist(jsonNew, "scenario/attributesModel/org.vadere.state.attributes.models.AttributesFloorField/cacheType").asText();
......
VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_3ToV1_4Test.java → VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_4Test.java
View file @ a53f0162
......@@ -7,7 +7,7 @@ import org.vadere.simulator.projects.migration.jsontranformation.JsonTransformat
import java.nio.file.Path;
public class JsonTransformationV1_3ToV1_4Test extends JsonTransformationTest {
public class TargetVersionV1_4Test extends JsonTransformationTest {
@Override
public Path getTestDir() {
......@@ -25,7 +25,7 @@ public class JsonTransformationV1_3ToV1_4Test extends JsonTransformationTest {
pathMustExist(oldScenarioAsJson, oldJsonPath);
pathMustNotExist(oldScenarioAsJson, newJsonPath);
JsonTransformationV1_3ToV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
TargetVersionV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
JsonNode newScenarioAsJson = transform.applyAll(oldScenarioAsJson);
pathMustNotExist(newScenarioAsJson, oldJsonPath);
......@@ -43,7 +43,7 @@ public class JsonTransformationV1_3ToV1_4Test extends JsonTransformationTest {
pathMustExist(oldScenarioAsJson, oldJsonPath);
pathMustNotExist(oldScenarioAsJson, newJsonPath);
JsonTransformationV1_3ToV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
TargetVersionV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
JsonNode newScenarioAsJson = transform.applyAll(oldScenarioAsJson);
pathMustNotExist(newScenarioAsJson, oldJsonPath);
......@@ -61,7 +61,7 @@ public class JsonTransformationV1_3ToV1_4Test extends JsonTransformationTest {
pathMustExist(oldScenarioAsJson, oldJsonPath);
pathMustNotExist(oldScenarioAsJson, newJsonPath);
JsonTransformationV1_3ToV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
TargetVersionV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
JsonNode newScenarioAsJson = transform.applyAll(oldScenarioAsJson);
pathMustNotExist(newScenarioAsJson, oldJsonPath);
......@@ -86,7 +86,7 @@ public class JsonTransformationV1_3ToV1_4Test extends JsonTransformationTest {
}
}
JsonTransformationV1_3ToV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
TargetVersionV1_4 transform = factory.getJsonTransformationV1_3ToV1_4();
JsonNode newScenarioAsJson = transform.applyAll(oldScenarioAsJson);
// Assert that "attributes" node in "dynamicElements" is renamed here.
......
VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV7ToV8Test.java → VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/V07ToV08Test.java
View file @ a53f0162
......@@ -9,13 +9,12 @@ import org.vadere.simulator.projects.migration.jsontranformation.JsonTransformat
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Iterator;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.*;
public class JsonTransformV7ToV8Test extends JsonTransformationTest {
public class V07ToV08Test extends JsonTransformationTest {
// JsonNode jsonOld;
// JsonNode jsonNew;
......@@ -39,7 +38,7 @@ public class JsonTransformV7ToV8Test extends JsonTransformationTest {
String jsonStr = getTestFileAsString("typ1.scenario");
JsonNode jsonOld = getJsonFromString(jsonStr);
JsonNode jsonNew = getJsonFromString(jsonStr);
JsonTransformV7ToV8 transformation = factory.getJsonTransformV7ToV8();
TargetVersionV0_8 transformation = factory.getJsonTransformV7ToV8();
jsonNew = transformation.applyMeasurementAreaType1(jsonNew);
for (String type : processorTypes) {
......@@ -67,7 +66,7 @@ public class JsonTransformV7ToV8Test extends JsonTransformationTest {
String jsonStr = getTestFileAsString("typ2.scenario");
JsonNode jsonOld = getJsonFromString(jsonStr);
JsonNode jsonNew = getJsonFromString(jsonStr);
JsonTransformV7ToV8 transformation = factory.getJsonTransformV7ToV8();
TargetVersionV0_8 transformation = factory.getJsonTransformV7ToV8();
jsonNew = transformation.applyMeasurementAreaType2(jsonNew);
for (String type : processorTypes) {
......@@ -100,7 +99,7 @@ public class JsonTransformV7ToV8Test extends JsonTransformationTest {
String jsonStr = getTestFileAsString("typ4.scenario");
JsonNode jsonOld = getJsonFromString(jsonStr);
JsonNode jsonNew = getJsonFromString(jsonStr);
JsonTransformV7ToV8 transformation = factory.getJsonTransformV7ToV8();
TargetVersionV0_8 transformation = factory.getJsonTransformV7ToV8();
jsonNew = transformation.applyMeasurementAreaType4(jsonNew);
for (String type : processorTypes) {
......@@ -127,7 +126,7 @@ public class JsonTransformV7ToV8Test extends JsonTransformationTest {
String jsonStr = getTestFileAsString("typ4.scenario");
JsonNode jsonOld = getJsonFromString(jsonStr);
JsonNode jsonNew = getJsonFromString(jsonStr);
JsonTransformV7ToV8 transformation = factory.getJsonTransformV7ToV8();
TargetVersionV0_8 transformation = factory.getJsonTransformV7ToV8();
jsonNew = transformation.applyMeasurementAreaType5(jsonNew);
for (String type : processorTypes) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment