From 7f71a06a27fe3a964c890773173319607b95a4e4 Mon Sep 17 00:00:00 2001 From: David Scourfield Date: Wed, 30 Jun 2021 11:51:18 +0100 Subject: [PATCH 1/2] #205 Fix uncompilable mock generated from unbundled example file --- .../oss/boat/transformers/bundler/ExamplesProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boat-engine/src/main/java/com/backbase/oss/boat/transformers/bundler/ExamplesProcessor.java b/boat-engine/src/main/java/com/backbase/oss/boat/transformers/bundler/ExamplesProcessor.java index 6c0e9bd49..98b8a4708 100644 --- a/boat-engine/src/main/java/com/backbase/oss/boat/transformers/bundler/ExamplesProcessor.java +++ b/boat-engine/src/main/java/com/backbase/oss/boat/transformers/bundler/ExamplesProcessor.java @@ -253,7 +253,7 @@ private void dereferenceExample(ExampleHolder exampleHolder) { private Object convertExampleContent(ExampleHolder exampleHolder, String refPath) { try { if (exampleHolder.getRef().endsWith("json") || refPath.endsWith("json")) { - return Json.mapper().readValue(exampleHolder.getContent(), Object.class); + return Json.mapper().readValue(exampleHolder.getContent(), JsonNode.class); } return exampleHolder.getContent(); } catch (JsonProcessingException | RuntimeException e) { From bb70bc3dab2e223a39054b9ba965d81851f04dc3 Mon Sep 17 00:00:00 2001 From: David Scourfield Date: Wed, 30 Jun 2021 11:53:24 +0100 Subject: [PATCH 2/2] #204 Guard against NPE in BoatExample.java --- .../src/main/java/com/backbase/oss/codegen/doc/BoatExample.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/doc/BoatExample.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/doc/BoatExample.java index 5e21f86b1..ad91c37a5 100644 --- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/doc/BoatExample.java +++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/doc/BoatExample.java @@ -38,6 +38,8 @@ public String getPrettyPrintValue() { if (example.getValue() instanceof JsonNode || example.getValue() instanceof HashMap) { return Json.pretty(example.getValue()); + } else if (example.getValue() == null) { + return ""; } else { return example.getValue().toString(); }