Use caching writers when writing xsd / xdoc

Author: gnodet

modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java

@@ -28,6 +28,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -56,9 +57,9 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlModelMetadata;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.io.CachingWriter;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
-import org.codehaus.plexus.util.xml.XmlStreamWriter;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
@@ -115,7 +116,7 @@ private void generateXdoc(Properties parameters) throws IOException {
             f = new File(directory, xdocFileName);
         }
 
-        Writer writer = new XmlStreamWriter(f);
+        Writer writer = new CachingWriter(f, StandardCharsets.UTF_8);
 
         XMLWriter w = new PrettyPrintXMLWriter(writer);
 

modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java

@@ -27,6 +27,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
@@ -43,9 +44,9 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.io.CachingWriter;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
-import org.codehaus.plexus.util.xml.XmlStreamWriter;
 
 /**
  * @author <a href="mailto:[email protected]">Brett Porter</a>
@@ -93,7 +94,7 @@ private void generateXsd(Properties parameters) throws IOException, ModelloExcep
             f = new File(directory, xsdFileName);
         }
 
-        Writer writer = new XmlStreamWriter(f);
+        Writer writer = new CachingWriter(f, StandardCharsets.UTF_8);
 
         try {
             XMLWriter w = new PrettyPrintXMLWriter(writer);