You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/11 10:30:59 UTC
[isis] branch master updated: ISIS-2473: fix AsciiDocWriter when
writing to stdout (use flush)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ae4dc27 ISIS-2473: fix AsciiDocWriter when writing to stdout (use flush)
ae4dc27 is described below
commit ae4dc27e31c041247b75070ef14b890e5e14a45d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 11 11:30:47 2020 +0100
ISIS-2473: fix AsciiDocWriter when writing to stdout (use flush)
---
.../test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java | 5 +++--
.../main/java/org/apache/isis/tooling/model4adoc/AsciiDocWriter.java | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
index c8512ac..b475ad3 100644
--- a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
+++ b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/test/J2AdocTest.java
@@ -34,6 +34,7 @@ import org.apache.isis.commons.internal.functions._Predicates;
import org.apache.isis.tooling.j2adoc.J2AdocContext;
import org.apache.isis.tooling.j2adoc.util.AsciiDocIncludeTagFilter;
import org.apache.isis.tooling.javamodel.AnalyzerConfigFactory;
+import org.apache.isis.tooling.model4adoc.AsciiDocWriter;
import lombok.NonNull;
import lombok.val;
@@ -67,9 +68,9 @@ class J2AdocTest {
.map(unit->unit.toAsciiDoc(j2aContext))
.forEach(adoc->{
- System.out.println(adoc);
+ //System.out.println(adoc);
- //AsciiDocWriter.print(adoc);
+ AsciiDocWriter.print(adoc);
System.out.println();
});
diff --git a/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocWriter.java b/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocWriter.java
index c0d83ad..49e2997 100644
--- a/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocWriter.java
+++ b/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocWriter.java
@@ -104,7 +104,9 @@ public class AsciiDocWriter {
return;
}
val adocWriter = new AsciiDocWriter();
- adocWriter.write(doc, new PrintWriter(out));
+ try(val writer = new PrintWriter(out)) {
+ adocWriter.write(doc, writer);
+ }
}
/**
@@ -128,6 +130,7 @@ public class AsciiDocWriter {
val formatWriter = new FormatWriter(writer);
formatWriter.ifNonEmpty("= %s\n\n", doc.getTitle());
writeChildNodes(doc.getBlocks(), formatWriter);
+ writer.flush();
}
// -- CHILDREN