Add Yaml2Json command #13
Conversation
|
|
||
| private Path convertAndWrite(String filename, String content) { | ||
| log.info("Converting " + filename); | ||
| final var target = Path.of(this.output + "/" + filename + ".json"); |
There was a problem hiding this comment.
final var out = Path.of(output);
to do before the stream and pass it to convertAndWrite
here you just do out.resolve(filename + ".json")
| Files.walkFileTree(sourceDir.toAbsolutePath(), new SimpleFileVisitor<>() { | ||
| @Override | ||
| public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException { | ||
| if (file.getFileName().toString().endsWith(".yaml")) { |
There was a problem hiding this comment.
final var name = file.getFileName().toString();
if (name.endsWith(".yaml")) {
sources.put(name.substring(0, name.length() - ".yaml".length(), Files.readString(file));
}
will avoid to drop unexpected data and to recompile a Pattern for each file
| } | ||
| }); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); |
| } | ||
|
|
||
| private Path convertAndWrite(String filename, String content) { | ||
| log.info("Converting " + filename); |
There was a problem hiding this comment.
log.info(() -> "...") + add simple quotes around filename?
| final var target = Path.of(this.output + "/" + filename + ".json"); | ||
| try { | ||
| final var jsonString = jsonb.toJson(yaml2json.convert(JsonValue.class, content.trim())); | ||
| Files.deleteIfExists(target); |
There was a problem hiding this comment.
think write will truncate/overwrite by default so not needed?
| log.info("Converting " + filename); | ||
| final var target = Path.of(this.output + "/" + filename + ".json"); | ||
| try { | ||
| final var jsonString = jsonb.toJson(yaml2json.convert(JsonValue.class, content.trim())); |
There was a problem hiding this comment.
can need another round trip in a formatted json writer if you want to prettify it (maybe another option)
| final var logs = executor.wrap(null, INFO, () -> new BundleBee().launch("yaml2json", | ||
| "--bundlebee.yaml2json.input", "src/test/resources/bundlebee/kubernetes", | ||
| "--bundlebee.yaml2json.output", "target/")); | ||
| assertTrue |
There was a problem hiding this comment.
can need to assert the output and use @TempDir Path work to get a temporary dir instead of target/, then just assert the expected files are there and contains what you expected for a few of them (smoke test like)
|
|
||
| @Override | ||
| public CompletionStage<?> execute() { | ||
| final var sources = new HashMap<String, String>(); |
There was a problem hiding this comment.
I'm not sure we need the staging (map), maybe we can just convert directly?
If the staging makes sense we should probably stage the converted value before writing them all to allow to not do anything if one will fail.
| @Override | ||
| public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException { | ||
| if (file.getFileName().toString().endsWith(".yaml")) { | ||
| sources.put(file.getFileName().toString().replaceAll(".yaml", ""), Files.readString(file)); |
There was a problem hiding this comment.
don't think filename is what you want, sounds more like sourceDir.toAbsolutePath().relativize(file).toString() (+ substring to drop .yaml) - indeed keep the source path ref once for all the visitor.
Fix #12