X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxml%2FDomUtils.java;h=f283ee07d9d51ff344d9f803fede157a70eba521;hb=2136b85d7bde33a277d1dfd58b048ee6e5f5db8b;hp=a0a118c1062cd82e8fd0aac29bb84fb01a371fb3;hpb=df850821cf26ca07ef2474d4d2cabb61e9104291;p=utils diff --git a/support/general/src/main/java/org/wamblee/xml/DomUtils.java b/support/general/src/main/java/org/wamblee/xml/DomUtils.java index a0a118c1..f283ee07 100644 --- a/support/general/src/main/java/org/wamblee/xml/DomUtils.java +++ b/support/general/src/main/java/org/wamblee/xml/DomUtils.java @@ -71,50 +71,6 @@ public final class DomUtils { // Empty. } - /** - * Parses an XML document from a string. - * - * @param aDocument - * document. - * - * @return - * - */ - public static Document read(String aDocument) throws XMLException { - ByteArrayInputStream is = new ByteArrayInputStream(aDocument.getBytes()); - - return read(is); - } - - /** - * Parses an XML document from a stream. - * - * @param aIs - * Input stream. - * - * @return - * - */ - public static Document read(InputStream aIs) throws XMLException { - try { - DOMImplementationLS impl = getDomImplementationLS(); - - LSParser builder = impl.createLSParser( - DOMImplementationLS.MODE_SYNCHRONOUS, null); - LSInput input = impl.createLSInput(); - input.setByteStream(aIs); - return builder.parse(input); - } catch (LSException e) { - throw new XMLException(e.getMessage(), e); - } finally { - try { - aIs.close(); - } catch (Exception e) { - LOG.log(Level.WARNING, "Error closing XML file", e); - } - } - } - /** * Gets a dom level 3 implementation. * @return Dom implementation. @@ -142,85 +98,6 @@ public final class DomUtils { } } - /** - * Reads and validates a document against a schema. - * - * @param aIs - * Input stream. - * @param aSchema - * Schema. - * - * @return Parsed and validated document. - * - */ - public static Document readAndValidate(InputStream aIs, InputStream aSchema) - throws XMLException { - try { - Document doc = read(aIs); - final Schema schema = SchemaFactory.newInstance( - XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema( - new StreamSource(aSchema)); - Validator validator = schema.newValidator(); - validator.validate(new DOMSource(doc)); - - return doc; - } catch (SAXException e) { - throw new XMLException(e.getMessage(), e); - } catch (IOException e) { - throw new XMLException(e.getMessage(), e); - } finally { - try { - aSchema.close(); - } catch (Exception e) { - LOG.log(Level.WARNING, "Error closing schema", e); - } - - try { - aIs.close(); - } catch (Exception e) { - LOG.log(Level.WARNING, "Error closing XML file", e); - } - } - } - - /** - * Serializes an XML document to a stream. - * - * @param aDocument - * Document to serialize. - * @param aOs - * Output stream. - * - */ - public static void serialize(Document aDocument, OutputStream aOs) - throws IOException { - try { - TransformerFactory factory = TransformerFactory.newInstance(); - Transformer identityTransform = factory.newTransformer(); - DOMSource source = new DOMSource(aDocument); - StreamResult result = new StreamResult(aOs); - identityTransform.transform(source, result); - } catch (TransformerException e) { - throw new IOException(e.getMessage(), e); - } - } - - /** - * Serializes an XML document. - * - * @param aDocument - * Document to serialize. - * - * @return Serialized document. - * - */ - public static String serialize(Document aDocument) throws IOException { - ByteArrayOutputStream os = new ByteArrayOutputStream(); - serialize(aDocument, os); - - return os.toString(); - } - /** * Removes duplicate attributes from a DOM tree.This is useful for * postprocessing the output of JTidy as a workaround for a bug in JTidy.