nokogiri 1.11.1-java → 1.11.2-java

data/ext/java/nokogiri/internals/c14n/CanonicalFilter.java

@@ -8,30 +8,36 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Node;
 
-public class CanonicalFilter {
-    private final Block block;
-    private final ThreadContext context;
-
-    public CanonicalFilter(ThreadContext context, Block block) {
-        this.context = context;
-        this.block = block;
+public class CanonicalFilter
+{
+  private final Block block;
+  private final ThreadContext context;
+
+  public
+  CanonicalFilter(ThreadContext context, Block block)
+  {
+    this.context = context;
+    this.block = block;
+  }
+
+  public boolean
+  includeNodes(Node currentNode, Node parentNode)
+  {
+    if (block == null || !block.isGiven()) {
+      return true;
     }
 
-    public boolean includeNodes(Node currentNode, Node parentNode) {
-        if (block == null || !block.isGiven())
-            return true;
-
-        IRubyObject current = NokogiriHelpers.getCachedNodeOrCreate(context.getRuntime(), currentNode);
-        IRubyObject parent = NokogiriHelpers.getCachedNodeOrCreate(context.getRuntime(), parentNode);
+    IRubyObject current = NokogiriHelpers.getCachedNodeOrCreate(context.getRuntime(), currentNode);
+    IRubyObject parent = NokogiriHelpers.getCachedNodeOrCreate(context.getRuntime(), parentNode);
 
-        if (parent.isNil()) {
-            IRubyObject doc = ((XmlNode) current).document(context);
-            boolean returnValue = block.call(context, current, doc).isTrue();
-            block.call(context, doc, context.nil);
-            return returnValue;
-        }
-
-        return block.call(context, current, parent).isTrue();
+    if (parent.isNil()) {
+      IRubyObject doc = ((XmlNode) current).document(context);
+      boolean returnValue = block.call(context, current, doc).isTrue();
+      block.call(context, doc, context.nil);
+      return returnValue;
     }
 
+    return block.call(context, current, parent).isTrue();
+  }
+
 }

data/ext/java/nokogiri/internals/c14n/CanonicalizationException.java

@@ -24,70 +24,83 @@ package nokogiri.internals.c14n;
  *
  * @author Christian Geuer-Pollmann
  */
-public class CanonicalizationException extends Exception {
+public class CanonicalizationException extends Exception
+{
 
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
+  /**
+   *
+   */
+  private static final long serialVersionUID = 1L;
 
-    /**
-     * Constructor CanonicalizationException
-     *
-     */
-    public CanonicalizationException() {
-        super();
-    }
+  /**
+   * Constructor CanonicalizationException
+   *
+   */
+  public
+  CanonicalizationException()
+  {
+    super();
+  }
 
-    /**
-     * Constructor CanonicalizationException
-     *
-     * @param message
-     */
-    public CanonicalizationException(String message) {
-        super(message);
-    }
-    
-    /**
-     * Constructor CanonicalizationException
-     *
-     * @param message
-     * @param rootCause
-     */
-    public CanonicalizationException(Exception rootCause) {
-        super(rootCause);
-    }
+  /**
+   * Constructor CanonicalizationException
+   *
+   * @param message
+   */
+  public
+  CanonicalizationException(String message)
+  {
+    super(message);
+  }
+
+  /**
+   * Constructor CanonicalizationException
+   *
+   * @param message
+   * @param rootCause
+   */
+  public
+  CanonicalizationException(Exception rootCause)
+  {
+    super(rootCause);
+  }
+
+  /**
+   * Constructor CanonicalizationException
+   *
+   * @param msgID
+   * @param exArgs
+   */
+  public
+  CanonicalizationException(String message, Object... exArgs)
+  {
+    super(C14nHelper.getErrorMessage(message, exArgs));
+  }
+
+  /**
+   * Constructor CanonicalizationException
+   *
+   * @param message
+   * @param rootCause
+   */
+  public
+  CanonicalizationException(String message, Exception rootCause)
+  {
+    super(message, rootCause);
+  }
+
+  /**
+   * Constructor CanonicalizationException
+   *
+   * @param msgID
+   * @param exArgs
+   * @param originalException
+   */
+  public
+  CanonicalizationException(String message, Exception rootCause, Object... exArgs)
+  {
+    super(C14nHelper.getErrorMessage(message, exArgs), rootCause);
+  }
 
-    /**
-     * Constructor CanonicalizationException
-     *
-     * @param msgID
-     * @param exArgs
-     */
-    public CanonicalizationException(String message, Object... exArgs) {     
-        super(C14nHelper.getErrorMessage(message, exArgs));
-    }
-    
-    /**
-     * Constructor CanonicalizationException
-     *
-     * @param message
-     * @param rootCause
-     */
-    public CanonicalizationException(String message, Exception rootCause) {
-        super(message, rootCause);
-    }
 
-    /**
-     * Constructor CanonicalizationException
-     *
-     * @param msgID
-     * @param exArgs
-     * @param originalException
-     */
-    public CanonicalizationException(String message, Exception rootCause, Object... exArgs) {
-        super(C14nHelper.getErrorMessage(message, exArgs), rootCause);
-    }
-    
-    
 }

data/ext/java/nokogiri/internals/c14n/Canonicalizer.java

@@ -28,225 +28,250 @@ import org.w3c.dom.Node;
  *
  * @author Christian Geuer-Pollmann
  */
-public class Canonicalizer {
-
-    /** The output encoding of canonicalized data */
-    public static final String ENCODING = "UTF8";
-
-    /**
-     * XPath Expression for selecting every node and continuous comments joined
-     * in only one node
-     */
-    public static final String XPATH_C14N_WITH_COMMENTS_SINGLE_NODE =
-        "(.//. | .//@* | .//namespace::*)";
-
-    /**
-     * The URL defined in XML-SEC Rec for inclusive c14n <b>without</b> comments.
-     */
-    public static final String ALGO_ID_C14N_OMIT_COMMENTS =
-        "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
-    /**
-     * The URL defined in XML-SEC Rec for inclusive c14n <b>with</b> comments.
-     */
-    public static final String ALGO_ID_C14N_WITH_COMMENTS =
-        ALGO_ID_C14N_OMIT_COMMENTS + "#WithComments";
-    /**
-     * The URL defined in XML-SEC Rec for exclusive c14n <b>without</b> comments.
-     */
-    public static final String ALGO_ID_C14N_EXCL_OMIT_COMMENTS =
-        "http://www.w3.org/2001/10/xml-exc-c14n#";
-    /**
-     * The URL defined in XML-SEC Rec for exclusive c14n <b>with</b> comments.
-     */
-    public static final String ALGO_ID_C14N_EXCL_WITH_COMMENTS =
-        ALGO_ID_C14N_EXCL_OMIT_COMMENTS + "WithComments";
-    /**
-     * The URI for inclusive c14n 1.1 <b>without</b> comments.
-     */
-    public static final String ALGO_ID_C14N11_OMIT_COMMENTS =
-        "http://www.w3.org/2006/12/xml-c14n11";
-    /**
-     * The URI for inclusive c14n 1.1 <b>with</b> comments.
-     */
-    public static final String ALGO_ID_C14N11_WITH_COMMENTS =
-        ALGO_ID_C14N11_OMIT_COMMENTS + "#WithComments";
-    /**
-     * Non-standard algorithm to serialize the physical representation for XML Encryption
-     */
-    public static final String ALGO_ID_C14N_PHYSICAL =
-        "http://santuario.apache.org/c14n/physical";
-
-    private static Map<String, Class<? extends CanonicalizerSpi>> canonicalizerHash = null;
-
-    private final CanonicalizerSpi canonicalizerSpi;
-
-    /**
-     * Constructor Canonicalizer
-     *
-     * @param algorithmURI
-     * @throws InvalidCanonicalizerException
-     */
-    private Canonicalizer(String algorithmURI) throws CanonicalizationException {
-        try {
-            Class<? extends CanonicalizerSpi> implementingClass =
-                canonicalizerHash.get(algorithmURI);
-
-            canonicalizerSpi = implementingClass.newInstance();
-            canonicalizerSpi.reset = true;
-        } catch (Exception e) {
-            Object exArgs[] = { algorithmURI };
-            throw new CanonicalizationException(
-                "signature.Canonicalizer.UnknownCanonicalizer", exArgs, e
-            );
-        }
-    }
+public class Canonicalizer
+{
 
-    /**
-     * Method getInstance
-     *
-     * @param algorithmURI
-     * @return a Canonicalizer instance ready for the job
-     * @throws InvalidCanonicalizerException
-     */
-    public static final Canonicalizer getInstance(String algorithmURI)
-        throws CanonicalizationException {
-        if (canonicalizerHash == null) {
-            canonicalizerHash = new ConcurrentHashMap<String, Class<? extends CanonicalizerSpi>>();
-            Canonicalizer.registerDefaultAlgorithms();
-        }
-        return new Canonicalizer(algorithmURI);
-    }
+  /** The output encoding of canonicalized data */
+  public static final String ENCODING = "UTF8";
 
-    /**
-     * Method register
-     *
-     * @param algorithmURI
-     * @param implementingClass
-     * @throws CanonicalizationException
-     */
-    @SuppressWarnings("unchecked")
-    public static void register(String algorithmURI, String implementingClass)
-        throws CanonicalizationException, ClassNotFoundException {
-        // check whether URI is already registered
-        Class<? extends CanonicalizerSpi> registeredClass =
-            canonicalizerHash.get(algorithmURI);
-
-        if (registeredClass != null)  {
-            Object exArgs[] = { algorithmURI, registeredClass };
-            throw new CanonicalizationException("algorithm.alreadyRegistered", exArgs);
-        }
-
-        canonicalizerHash.put(
-            algorithmURI, (Class<? extends CanonicalizerSpi>)Class.forName(implementingClass)
-        );
-    }
+  /**
+   * XPath Expression for selecting every node and continuous comments joined
+   * in only one node
+   */
+  public static final String XPATH_C14N_WITH_COMMENTS_SINGLE_NODE =
+    "(.//. | .//@* | .//namespace::*)";
 
-    /**
-     * Method register
-     *
-     * @param algorithmURI
-     * @param implementingClass
-     * @throws CanonicalizationException
-     */
-    public static void register(String algorithmURI, Class<? extends CanonicalizerSpi> implementingClass)
-        throws CanonicalizationException {
-        // check whether URI is already registered
-        Class<? extends CanonicalizerSpi> registeredClass = canonicalizerHash.get(algorithmURI);
-
-        if (registeredClass != null)  {
-            Object exArgs[] = { algorithmURI, registeredClass };
-            throw new CanonicalizationException("algorithm.alreadyRegistered", exArgs);
-        }
-
-        canonicalizerHash.put(algorithmURI, implementingClass);
-    }
+  /**
+   * The URL defined in XML-SEC Rec for inclusive c14n <b>without</b> comments.
+   */
+  public static final String ALGO_ID_C14N_OMIT_COMMENTS =
+    "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
+  /**
+   * The URL defined in XML-SEC Rec for inclusive c14n <b>with</b> comments.
+   */
+  public static final String ALGO_ID_C14N_WITH_COMMENTS =
+    ALGO_ID_C14N_OMIT_COMMENTS + "#WithComments";
+  /**
+   * The URL defined in XML-SEC Rec for exclusive c14n <b>without</b> comments.
+   */
+  public static final String ALGO_ID_C14N_EXCL_OMIT_COMMENTS =
+    "http://www.w3.org/2001/10/xml-exc-c14n#";
+  /**
+   * The URL defined in XML-SEC Rec for exclusive c14n <b>with</b> comments.
+   */
+  public static final String ALGO_ID_C14N_EXCL_WITH_COMMENTS =
+    ALGO_ID_C14N_EXCL_OMIT_COMMENTS + "WithComments";
+  /**
+   * The URI for inclusive c14n 1.1 <b>without</b> comments.
+   */
+  public static final String ALGO_ID_C14N11_OMIT_COMMENTS =
+    "http://www.w3.org/2006/12/xml-c14n11";
+  /**
+   * The URI for inclusive c14n 1.1 <b>with</b> comments.
+   */
+  public static final String ALGO_ID_C14N11_WITH_COMMENTS =
+    ALGO_ID_C14N11_OMIT_COMMENTS + "#WithComments";
+  /**
+   * Non-standard algorithm to serialize the physical representation for XML Encryption
+   */
+  public static final String ALGO_ID_C14N_PHYSICAL =
+    "http://santuario.apache.org/c14n/physical";
 
-    /**
-     * This method registers the default algorithms.
-     */
-    private static void registerDefaultAlgorithms() {
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS,
-                Canonicalizer20010315OmitComments.class);
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS,
-                Canonicalizer20010315WithComments.class);
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS,
-                Canonicalizer20010315ExclOmitComments.class);
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS,
-                Canonicalizer20010315ExclWithComments.class);
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS,
-                Canonicalizer11_OmitComments.class);
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS,
-                Canonicalizer11_WithComments.class);
-        canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_PHYSICAL,
-                CanonicalizerPhysical.class);
-    }
+  private static Map<String, Class<? extends CanonicalizerSpi>> canonicalizerHash = null;
 
-    /**
-     * Method getURI
-     *
-     * @return the URI defined for this c14n instance.
-     */
-    public final String getURI() {
-        return canonicalizerSpi.engineGetURI();
-    }
+  private final CanonicalizerSpi canonicalizerSpi;
 
-    /**
-     * Method getIncludeComments
-     *
-     * @return true if the c14n respect the comments.
-     */
-    public boolean getIncludeComments() {
-        return canonicalizerSpi.engineGetIncludeComments();
-    }
+  /**
+   * Constructor Canonicalizer
+   *
+   * @param algorithmURI
+   * @throws InvalidCanonicalizerException
+   */
+  private
+  Canonicalizer(String algorithmURI) throws CanonicalizationException
+  {
+    try {
+      Class<? extends CanonicalizerSpi> implementingClass =
+        canonicalizerHash.get(algorithmURI);
 
-    /**
-     * Canonicalizes the subtree rooted by <CODE>node</CODE>.
-     *
-     * @param node The node to canonicalize
-     * @return the result of the c14n.
-     *
-     * @throws CanonicalizationException
-     */
-    public byte[] canonicalizeSubtree(Node node, CanonicalFilter filter) throws CanonicalizationException {
-        return canonicalizerSpi.engineCanonicalizeSubTree(node, filter);
+      canonicalizerSpi = implementingClass.newInstance();
+      canonicalizerSpi.reset = true;
+    } catch (Exception e) {
+      Object exArgs[] = { algorithmURI };
+      throw new CanonicalizationException(
+        "signature.Canonicalizer.UnknownCanonicalizer", exArgs, e
+      );
     }
+  }
 
-    /**
-     * Canonicalizes the subtree rooted by <CODE>node</CODE>.
-     *
-     * @param node
-     * @param inclusiveNamespaces
-     * @return the result of the c14n.
-     * @throws CanonicalizationException
-     */
-    public byte[] canonicalizeSubtree(Node node, String inclusiveNamespaces, CanonicalFilter filter)
-        throws CanonicalizationException {
-        return canonicalizerSpi.engineCanonicalizeSubTree(node, inclusiveNamespaces, filter);
+  /**
+   * Method getInstance
+   *
+   * @param algorithmURI
+   * @return a Canonicalizer instance ready for the job
+   * @throws InvalidCanonicalizerException
+   */
+  public static final Canonicalizer
+  getInstance(String algorithmURI)
+  throws CanonicalizationException
+  {
+    if (canonicalizerHash == null) {
+      canonicalizerHash = new ConcurrentHashMap<String, Class<? extends CanonicalizerSpi>>();
+      Canonicalizer.registerDefaultAlgorithms();
     }
+    return new Canonicalizer(algorithmURI);
+  }
 
-    /**
-     * Sets the writer where the canonicalization ends.  ByteArrayOutputStream
-     * if none is set.
-     * @param os
-     */
-    public void setWriter(OutputStream os) {
-        canonicalizerSpi.setWriter(os);
-    }
+  /**
+   * Method register
+   *
+   * @param algorithmURI
+   * @param implementingClass
+   * @throws CanonicalizationException
+   */
+  @SuppressWarnings("unchecked")
+  public static void
+  register(String algorithmURI, String implementingClass)
+  throws CanonicalizationException, ClassNotFoundException
+  {
+    // check whether URI is already registered
+    Class<? extends CanonicalizerSpi> registeredClass =
+      canonicalizerHash.get(algorithmURI);
 
-    /**
-     * Returns the name of the implementing {@link CanonicalizerSpi} class
-     *
-     * @return the name of the implementing {@link CanonicalizerSpi} class
-     */
-    public String getImplementingCanonicalizerClass() {
-        return canonicalizerSpi.getClass().getName();
+    if (registeredClass != null)  {
+      Object exArgs[] = { algorithmURI, registeredClass };
+      throw new CanonicalizationException("algorithm.alreadyRegistered", exArgs);
     }
 
-    /**
-     * Set the canonicalizer behaviour to not reset.
-     */
-    public void notReset() {
-        canonicalizerSpi.reset = false;
+    canonicalizerHash.put(
+      algorithmURI, (Class<? extends CanonicalizerSpi>)Class.forName(implementingClass)
+    );
+  }
+
+  /**
+   * Method register
+   *
+   * @param algorithmURI
+   * @param implementingClass
+   * @throws CanonicalizationException
+   */
+  public static void
+  register(String algorithmURI, Class<? extends CanonicalizerSpi> implementingClass)
+  throws CanonicalizationException
+  {
+    // check whether URI is already registered
+    Class<? extends CanonicalizerSpi> registeredClass = canonicalizerHash.get(algorithmURI);
+
+    if (registeredClass != null)  {
+      Object exArgs[] = { algorithmURI, registeredClass };
+      throw new CanonicalizationException("algorithm.alreadyRegistered", exArgs);
     }
 
+    canonicalizerHash.put(algorithmURI, implementingClass);
+  }
+
+  /**
+   * This method registers the default algorithms.
+   */
+  private static void
+  registerDefaultAlgorithms()
+  {
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS,
+                          Canonicalizer20010315OmitComments.class);
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS,
+                          Canonicalizer20010315WithComments.class);
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS,
+                          Canonicalizer20010315ExclOmitComments.class);
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS,
+                          Canonicalizer20010315ExclWithComments.class);
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS,
+                          Canonicalizer11_OmitComments.class);
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS,
+                          Canonicalizer11_WithComments.class);
+    canonicalizerHash.put(Canonicalizer.ALGO_ID_C14N_PHYSICAL,
+                          CanonicalizerPhysical.class);
+  }
+
+  /**
+   * Method getURI
+   *
+   * @return the URI defined for this c14n instance.
+   */
+  public final String
+  getURI()
+  {
+    return canonicalizerSpi.engineGetURI();
+  }
+
+  /**
+   * Method getIncludeComments
+   *
+   * @return true if the c14n respect the comments.
+   */
+  public boolean
+  getIncludeComments()
+  {
+    return canonicalizerSpi.engineGetIncludeComments();
+  }
+
+  /**
+   * Canonicalizes the subtree rooted by <CODE>node</CODE>.
+   *
+   * @param node The node to canonicalize
+   * @return the result of the c14n.
+   *
+   * @throws CanonicalizationException
+   */
+  public byte[]
+  canonicalizeSubtree(Node node, CanonicalFilter filter) throws CanonicalizationException
+  {
+    return canonicalizerSpi.engineCanonicalizeSubTree(node, filter);
+  }
+
+  /**
+   * Canonicalizes the subtree rooted by <CODE>node</CODE>.
+   *
+   * @param node
+   * @param inclusiveNamespaces
+   * @return the result of the c14n.
+   * @throws CanonicalizationException
+   */
+  public byte[]
+  canonicalizeSubtree(Node node, String inclusiveNamespaces, CanonicalFilter filter)
+  throws CanonicalizationException
+  {
+    return canonicalizerSpi.engineCanonicalizeSubTree(node, inclusiveNamespaces, filter);
+  }
+
+  /**
+   * Sets the writer where the canonicalization ends.  ByteArrayOutputStream
+   * if none is set.
+   * @param os
+   */
+  public void
+  setWriter(OutputStream os)
+  {
+    canonicalizerSpi.setWriter(os);
+  }
+
+  /**
+   * Returns the name of the implementing {@link CanonicalizerSpi} class
+   *
+   * @return the name of the implementing {@link CanonicalizerSpi} class
+   */
+  public String
+  getImplementingCanonicalizerClass()
+  {
+    return canonicalizerSpi.getClass().getName();
+  }
+
+  /**
+   * Set the canonicalizer behaviour to not reset.
+   */
+  public void
+  notReset()
+  {
+    canonicalizerSpi.reset = false;
+  }
+
 }