From 600f40d1fd9ee406bc2c45d445a6c983c3614352 Mon Sep 17 00:00:00 2001 From: Benedikt Zoennchen Date: Tue, 10 Oct 2017 17:08:28 +0200 Subject: [PATCH] improve IOException handling slightly --- .../src/org/vadere/simulator/projects/io/IOOutput.java | 2 +- .../src/org/vadere/simulator/projects/io/IOVadere.java | 2 +- .../src/org/vadere/simulator/projects/io/JsonConverter.java | 4 ++-- VadereState/src/org/vadere/state/util/StateJsonConverter.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/IOOutput.java b/VadereSimulator/src/org/vadere/simulator/projects/io/IOOutput.java index 919856da7..3ad48ec5e 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/IOOutput.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/IOOutput.java @@ -189,7 +189,7 @@ public abstract class IOOutput { try { final Path pathToSnapshot = getPathToOutputFile(project, directory.getName(), IOUtils.SCENARIO_FILE_EXTENSION); return Optional.of(IOVadere.fromJson(IOUtils.readTextFile(pathToSnapshot.toString()))); - } catch (IOException | VadereClassNotFoundException e) { + } catch (IOException | VadereClassNotFoundException | IllegalArgumentException e ) { logger.error("Error in output file " + directory.getName()); return Optional.empty(); } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/IOVadere.java b/VadereSimulator/src/org/vadere/simulator/projects/io/IOVadere.java index 4a13cfc86..6b9d02c29 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/IOVadere.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/IOVadere.java @@ -25,7 +25,7 @@ public class IOVadere { private static Logger logger = LogManager.getLogger(IOVadere.class); - public static Scenario fromJson(final String json) throws IOException { + public static Scenario fromJson(final String json) throws IOException, IllegalArgumentException { return JsonConverter.deserializeScenarioRunManager(json); } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index 44b006f9d..ae9104707 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; public class JsonConverter { - public static Scenario deserializeScenarioRunManager(String json) throws IOException { + public static Scenario deserializeScenarioRunManager(String json) throws IOException, IllegalArgumentException { return deserializeScenarioRunManagerFromNode(StateJsonConverter.readTree(json)); } - public static Scenario deserializeScenarioRunManagerFromNode(JsonNode node) throws IOException { + public static Scenario deserializeScenarioRunManagerFromNode(JsonNode node) throws IOException, IllegalArgumentException { JsonNode rootNode = node; String name = rootNode.get("name").asText(); JsonNode scenarioNode = rootNode.get(StateJsonConverter.SCENARIO_KEY); diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 9f617bc22..488bef6b2 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -119,7 +119,7 @@ public abstract class StateJsonConverter { return deserializeTopographyFromNode(mapper.readTree(json)); } - public static Topography deserializeTopographyFromNode(JsonNode node) { + public static Topography deserializeTopographyFromNode(JsonNode node) throws IllegalArgumentException { TopographyStore store = mapper.convertValue(node, TopographyStore.class); Topography topography = new Topography(store.attributes, store.attributesPedestrian, store.attributesCar); store.obstacles.forEach(obstacle -> topography.addObstacle(new Obstacle(obstacle))); -- GitLab