SANTUARIO-522 - Remove unused methods from Serializer

git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1873204 13f79535-47bb-0310-9956-ffa450edef68

Author: coheigea

src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java

@@ -45,21 +45,6 @@ public void setCanonicalizer(Canonicalizer canon) {
         this.canon = canon;
     }
 
-    /**
-     * Returns a <code>String</code> representation of the specified
-     * <code>Element</code>.
-     * <p></p>
-     * Refer also to comments about setup of format.
-     *
-     * @param element the <code>Element</code> to serialize.
-     * @return the <code>String</code> representation of the serilaized
-     *   <code>Element</code>.
-     * @throws Exception
-     */
-    public String serialize(Element element) throws Exception {
-        return canonSerialize(element);
-    }
-
     /**
      * Returns a <code>byte[]</code> representation of the specified
      * <code>Element</code>.
@@ -70,39 +55,9 @@ public String serialize(Element element) throws Exception {
      * @throws Exception
      */
     public byte[] serializeToByteArray(Element element) throws Exception {
-        return canonSerializeToByteArray(element);
-    }
-
-    /**
-     * Returns a <code>String</code> representation of the specified
-     * <code>NodeList</code>.
-     * <p></p>
-     * This is a special case because the NodeList may represent a
-     * <code>DocumentFragment</code>. A document fragment may be a
-     * non-valid XML document (refer to appropriate description of
-     * W3C) because it my start with a non-element node, e.g. a text
-     * node.
-     * <p></p>
-     * The methods first converts the node list into a document fragment.
-     * Special care is taken to not destroy the current document, thus
-     * the method clones the nodes (deep cloning) before it appends
-     * them to the document fragment.
-     * <p></p>
-     * Refer also to comments about setup of format.
-     *
-     * @param content the <code>NodeList</code> to serialize.
-     * @return the <code>String</code> representation of the serialized
-     *   <code>NodeList</code>.
-     * @throws Exception
-     */
-    public String serialize(NodeList content) throws Exception {
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            for (int i = 0; i < content.getLength(); i++) {
-                canon.canonicalizeSubtree(content.item(i), baos);
-            }
-            String ret = baos.toString(StandardCharsets.UTF_8.name());
-            baos.reset();
-            return ret;
+            canon.canonicalizeSubtree(element, baos);
+            return baos.toByteArray();
         }
     }
 
@@ -124,34 +79,6 @@ public byte[] serializeToByteArray(NodeList content) throws Exception {
         }
     }
 
-    /**
-     * Use the Canonicalizer to serialize the node
-     * @param node
-     * @return the canonicalization of the node
-     * @throws Exception
-     */
-    public String canonSerialize(Node node) throws Exception {
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            canon.canonicalizeSubtree(node, baos);
-            String ret = baos.toString(StandardCharsets.UTF_8.name());
-            baos.reset();
-            return ret;
-        }
-    }
-
-    /**
-     * Use the Canonicalizer to serialize the node
-     * @param node
-     * @return the (byte[]) canonicalization of the node
-     * @throws Exception
-     */
-    public byte[] canonSerializeToByteArray(Node node) throws Exception {
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            canon.canonicalizeSubtree(node, baos);
-            return baos.toByteArray();
-        }
-    }
-
     protected static byte[] createContext(byte[] source, Node ctx) throws XMLEncryptionException {
         // Create the context to parse the document against
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
@@ -195,36 +122,4 @@ protected static byte[] createContext(byte[] source, Node ctx) throws XMLEncrypt
         }
     }
 
-    protected static String createContext(String source, Node ctx) {
-        // Create the context to parse the document against
-        StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?><dummy");
-
-        // Run through each node up to the document node and find any xmlns: nodes
-        Map<String, String> storedNamespaces = new HashMap<>();
-        Node wk = ctx;
-        while (wk != null) {
-            NamedNodeMap atts = wk.getAttributes();
-            if (atts != null) {
-                for (int i = 0; i < atts.getLength(); ++i) {
-                    Node att = atts.item(i);
-                    String nodeName = att.getNodeName();
-                    if (("xmlns".equals(nodeName) || nodeName.startsWith("xmlns:"))
-                        && !storedNamespaces.containsKey(att.getNodeName())) {
-                        sb.append(' ');
-                        sb.append(nodeName);
-                        sb.append("=\"");
-                        sb.append(att.getNodeValue());
-                        sb.append('\"');
-                        storedNamespaces.put(nodeName, att.getNodeValue());
-                    }
-                }
-            }
-            wk = wk.getParentNode();
-        }
-        sb.append('>');
-        sb.append(source);
-        sb.append("</dummy>");
-        return sb.toString();
-    }
-
 }

src/main/java/org/apache/xml/security/encryption/Serializer.java

@@ -40,7 +40,7 @@ public interface Serializer {
      * <code>Element</code>.
      *
      * @param element the <code>Element</code> to serialize.
-     * @return the <code>byte[]</code> representation of the serilaized
+     * @return the <code>byte[]</code> representation of the serialized
      *   <code>Element</code>.
      * @throws Exception
      */
@@ -57,14 +57,6 @@ public interface Serializer {
      */
     byte[] serializeToByteArray(NodeList content) throws Exception;
 
-    /**
-     * Use the Canonicalizer to serialize the node
-     * @param node
-     * @return the (byte[]) canonicalization of the node
-     * @throws Exception
-     */
-    byte[] canonSerializeToByteArray(Node node) throws Exception;
-
     /**
      * @param source
      * @param ctx