nokogiri 1.13.10-java → 1.14.0-java

data/ext/java/nokogiri/XmlNode.java

@@ -55,6 +55,8 @@ import nokogiri.internals.XmlDomParserContext;
 @JRubyClass(name = "Nokogiri::XML::Node")
 public class XmlNode extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   protected static final String TEXT_WRAPPER_NAME = "nokogiri_text_wrapper";
 
   /** The underlying Node object. */
@@ -598,22 +600,23 @@ public class XmlNode extends RubyObject
       hrefStr = rubyStringToString(href.convertToString());
     }
 
-    NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCache(node);
-    XmlNamespace cachedNamespace = nsCache.get(prefixStr, hrefStr);
-    if (cachedNamespace != null) { return cachedNamespace; }
-
     Node namespaceOwner;
     if (node.getNodeType() == Node.ELEMENT_NODE) {
       namespaceOwner = node;
-      Element element = (Element) node;
       // adds namespace as node's attribute
       String qName = prefix.isNil() ? "xmlns" : "xmlns:" + prefixStr;
-      element.setAttributeNS("http://www.w3.org/2000/xmlns/", qName, hrefStr);
-    } else if (node.getNodeType() == Node.ATTRIBUTE_NODE) { namespaceOwner = ((Attr) node).getOwnerElement(); }
-    else { namespaceOwner = node.getParentNode(); }
-
-    XmlNamespace ns = XmlNamespace.createImpl(namespaceOwner, prefix, prefixStr, href, hrefStr);
+      ((Element)node).setAttributeNS("http://www.w3.org/2000/xmlns/", qName, hrefStr);
+    } else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
+      namespaceOwner = ((Attr) node).getOwnerElement();
+    } else {
+      namespaceOwner = node.getParentNode();
+    }
 
+    NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCache(node);
+    XmlNamespace ns = nsCache.get(prefixStr, hrefStr);
+    if (ns == null) {
+      ns = XmlNamespace.createImpl(namespaceOwner, prefix, prefixStr, href, hrefStr);
+    }
     if (node != namespaceOwner) {
       node = NokogiriHelpers.renameNode(node, ns.getHref(), ns.getPrefix() + ':' + node.getLocalName());
     }
@@ -658,7 +661,7 @@ public class XmlNode extends RubyObject
     NamedNodeMap nodeMap = this.node.getAttributes();
 
     if (nodeMap == null) { return runtime.newEmptyArray(); }
-    RubyArray attr = runtime.newArray(nodeMap.getLength());
+    RubyArray<?> attr = runtime.newArray(nodeMap.getLength());
 
     final XmlDocument doc = document(context.runtime);
     for (int i = 0; i < nodeMap.getLength(); i++) {
@@ -848,8 +851,8 @@ public class XmlNode extends RubyObject
 
     XmlDocument doc = ctx.parse(context, klass, context.nil);
 
-    RubyArray documentErrors = getErrors(document);
-    RubyArray docErrors = getErrors(doc);
+    RubyArray<?> documentErrors = getErrors(document);
+    RubyArray<?> docErrors = getErrors(doc);
     if (checkNewErrors(documentErrors, docErrors)) {
       for (int i = 0; i < docErrors.getLength(); i++) {
         documentErrors.append(docErrors.entry(i));
@@ -871,7 +874,7 @@ public class XmlNode extends RubyObject
     return XmlNodeSet.newNodeSet(context.runtime, nodes, this);
   }
 
-  private static RubyArray
+  private static RubyArray<?>
   getErrors(XmlDocument document)
   {
     IRubyObject obj = document.getInstanceVariable("@errors");
@@ -880,7 +883,7 @@ public class XmlNode extends RubyObject
   }
 
   private static boolean
-  checkNewErrors(RubyArray baseErrors, RubyArray newErrors)
+  checkNewErrors(RubyArray<?> baseErrors, RubyArray<?> newErrors)
   {
     int length = ((RubyArray) newErrors.op_diff(baseErrors)).size();
     return length > 0;
@@ -1191,7 +1194,7 @@ public class XmlNode extends RubyObject
    * of this node.
    */
   @JRubyMethod
-  public IRubyObject
+  public RubyArray<?>
   namespace_definitions(ThreadContext context)
   {
     // don't use namespace_definitions cache anymore since
@@ -1203,7 +1206,19 @@ public class XmlNode extends RubyObject
     if (doc instanceof Html4Document) { return context.runtime.newEmptyArray(); }
 
     List<XmlNamespace> namespaces = doc.getNamespaceCache().get(node);
-    return context.runtime.newArray((List) namespaces);
+    return RubyArray.newArray(context.runtime, namespaces);
+
+    // // TODO: I think this implementation would be better but there are edge cases
+    // // See https://github.com/sparklemotion/nokogiri/issues/2543
+    // RubyArray<?> nsdefs = RubyArray.newArray(context.getRuntime());
+    // NamedNodeMap attrs = node.getAttributes();
+    // for (int j = 0 ; j < attrs.getLength() ; j++) {
+    //   Attr attr = (Attr)attrs.item(j);
+    //   if ("http://www.w3.org/2000/xmlns/" == attr.getNamespaceURI()) {
+    //     nsdefs.append(XmlNamespace.createFromAttr(context.getRuntime(), attr));
+    //   }
+    // }
+    // return nsdefs;
   }
 
   /**
@@ -1211,7 +1226,7 @@ public class XmlNode extends RubyObject
    * on any ancestor node.
    */
   @JRubyMethod
-  public RubyArray
+  public RubyArray<?>
   namespace_scopes(ThreadContext context)
   {
     final XmlDocument doc = document(context.runtime);
@@ -1228,7 +1243,7 @@ public class XmlNode extends RubyObject
     }
     if (previousNode == null) { return context.runtime.newEmptyArray(); }
 
-    final RubyArray scoped_namespaces = context.runtime.newArray();
+    final RubyArray<?> scoped_namespaces = context.runtime.newArray();
     final HashSet<String> prefixes_in_scope = new HashSet<String>(8);
     NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCache(previousNode);
     for (Node previous = previousNode; previous != null;) {
@@ -1438,7 +1453,7 @@ public class XmlNode extends RubyObject
     XmlNode currentNode = this;
     final XmlDocument doc = document(context.runtime);
     while (currentNode != doc) {
-      RubyArray namespaces = currentNode.namespace_scopes(context);
+      RubyArray<?> namespaces = currentNode.namespace_scopes(context);
       for (int i = 0; i < namespaces.size(); i++) {
         XmlNamespace namespace = (XmlNamespace) namespaces.eltInternal(i);
         if (namespace.hasPrefix(prefix)) { return namespace.getHref(); }
@@ -1891,7 +1906,7 @@ public class XmlNode extends RubyObject
   process_xincludes(ThreadContext context, IRubyObject options)
   {
     XmlDocument xmlDocument = (XmlDocument)document(context);
-    RubyArray errors = (RubyArray)xmlDocument.getInstanceVariable("@errors");
+    RubyArray<?> errors = (RubyArray)xmlDocument.getInstanceVariable("@errors");
     while (errors.getLength() > 0) {
       XmlSyntaxError error = (XmlSyntaxError)errors.shift(context);
       if (error.toString().contains("Include operation failed")) {
@@ -1911,11 +1926,11 @@ public class XmlNode extends RubyObject
 
   @SuppressWarnings("unchecked")
   @Override
-  public Object
-  toJava(final Class target)
+  public <T> T
+  toJava(Class<T> target)
   {
     if (target == Object.class || Node.class.isAssignableFrom(target)) {
-      return getNode();
+      return (T)getNode();
     }
     return super.toJava(target);
   }

data/ext/java/nokogiri/XmlNodeSet.java

@@ -28,6 +28,7 @@ import org.w3c.dom.NodeList;
 @JRubyClass(name = "Nokogiri::XML::NodeSet")
 public class XmlNodeSet extends RubyObject implements NodeList
 {
+  private static final long serialVersionUID = 1L;
 
   IRubyObject[] nodes;
 
@@ -350,12 +351,14 @@ public class XmlNodeSet extends RubyObject implements NodeList
     if (indexOrRange instanceof RubyFixnum) {
       return slice(context, ((RubyFixnum) indexOrRange).getIntValue());
     }
-
-    int[] begLen = new int[2];
-    rangeBeginLength(context, indexOrRange, nodes.length, begLen);
-    int min = begLen[0];
-    int max = begLen[1];
-    return subseq(context, min, max - min);
+    if (indexOrRange instanceof RubyRange) {
+      int[] begLen = new int[2];
+      rangeBeginLength(context, indexOrRange, nodes.length, begLen);
+      int min = begLen[0];
+      int max = begLen[1];
+      return subseq(context, min, max - min);
+    }
+    throw context.runtime.newTypeError("index must be an Integer or a Range");
   }
 
   IRubyObject
@@ -407,7 +410,7 @@ public class XmlNodeSet extends RubyObject implements NodeList
   }
 
   @JRubyMethod(name = {"to_a", "to_ary"})
-  public RubyArray
+  public RubyArray<?>
   to_a(ThreadContext context)
   {
     return context.runtime.newArrayNoCopy(nodes);

data/ext/java/nokogiri/XmlProcessingInstruction.java

@@ -24,6 +24,7 @@ import nokogiri.internals.SaveContextVisitor;
 @JRubyClass(name = "Nokogiri::XML::ProcessingInstruction", parent = "Nokogiri::XML::Node")
 public class XmlProcessingInstruction extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
 
   public
   XmlProcessingInstruction(Ruby ruby, RubyClass klazz)

data/ext/java/nokogiri/XmlReader.java

@@ -57,6 +57,7 @@ import nokogiri.internals.ReaderNode.TextNode;
 @JRubyClass(name = "Nokogiri::XML::Reader")
 public class XmlReader extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
 
   private static final int XML_TEXTREADER_MODE_INITIAL = 0;
   private static final int XML_TEXTREADER_MODE_INTERACTIVE = 1;
@@ -224,7 +225,7 @@ public class XmlReader extends RubyObject
 
     Options options;
     if (args.length > 3) {
-      options = new ParserContext.Options((Long)args[3].toJava(Long.class));
+      options = new ParserContext.Options(args[3].toJava(Long.class));
     } else {
       // use the default options RECOVER | NONET
       options = new ParserContext.Options(2048 | 1);
@@ -255,7 +256,7 @@ public class XmlReader extends RubyObject
 
     Options options;
     if (args.length > 3) {
-      options = new ParserContext.Options((Long)args[3].toJava(Long.class));
+      options = new ParserContext.Options(args[3].toJava(Long.class));
     } else {
       // use the default options RECOVER | NONET
       options = new ParserContext.Options(2048 | 1);
@@ -403,7 +404,7 @@ public class XmlReader extends RubyObject
     final ReaderNode currentNode = currentNode();
     if (currentNode == null) { return runtime.getNil(); }
     if (currentNode.isError()) {
-      RubyArray errors = (RubyArray) getInstanceVariable("@errors");
+      RubyArray<?> errors = (RubyArray) getInstanceVariable("@errors");
       IRubyObject error = currentNode.toSyntaxError();
       errors.append(error);
       setInstanceVariable("@errors", errors);

data/ext/java/nokogiri/XmlRelaxng.java

@@ -38,6 +38,7 @@ import org.xml.sax.SAXException;
 @JRubyClass(name = "Nokogiri::XML::RelaxNG", parent = "Nokogiri::XML::Schema")
 public class XmlRelaxng extends XmlSchema
 {
+  private static final long serialVersionUID = 1L;
   private Verifier verifier;
 
   public

data/ext/java/nokogiri/XmlSaxParserContext.java

@@ -28,6 +28,7 @@ import static org.jruby.runtime.Helpers.invoke;
 @JRubyClass(name = "Nokogiri::XML::SAX::ParserContext")
 public class XmlSaxParserContext extends ParserContext
 {
+  private static final long serialVersionUID = 1L;
 
   protected static final String FEATURE_NAMESPACES =
     "http://xml.org/sax/features/namespaces";

data/ext/java/nokogiri/XmlSaxPushParser.java

@@ -29,6 +29,8 @@ import static org.jruby.runtime.Helpers.invoke;
 @JRubyClass(name = "Nokogiri::XML::SAX::PushParser")
 public class XmlSaxPushParser extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   ParserContext.Options options;
   IRubyObject saxParser;
 
@@ -45,6 +47,7 @@ public class XmlSaxPushParser extends RubyObject
     super(ruby, rubyClass);
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void
   finalize()

data/ext/java/nokogiri/XmlSchema.java

@@ -50,6 +50,8 @@ import org.xml.sax.SAXParseException;
 @JRubyClass(name = "Nokogiri::XML::Schema")
 public class XmlSchema extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   private Validator validator;
 
   public
@@ -149,7 +151,7 @@ public class XmlSchema extends RubyObject
 
     XmlDocument doc = ((XmlDocument)((XmlNode) document).document(context));
 
-    RubyArray errors = (RubyArray) doc.getInstanceVariable("@errors");
+    RubyArray<?> errors = (RubyArray) doc.getInstanceVariable("@errors");
     if (!errors.isEmpty()) {
       throw((XmlSyntaxError) errors.first()).toThrowable();
     }
@@ -212,7 +214,7 @@ public class XmlSchema extends RubyObject
   IRubyObject
   validate_document_or_file(ThreadContext context, XmlDocument xmlDocument)
   {
-    RubyArray errors = (RubyArray) this.getInstanceVariable("@errors");
+    RubyArray<?> errors = (RubyArray) this.getInstanceVariable("@errors");
     ErrorHandler errorHandler = new SchemaErrorHandler(context.runtime, errors);
     setErrorHandler(errorHandler);
 

data/ext/java/nokogiri/XmlSyntaxError.java

@@ -21,6 +21,7 @@ import org.xml.sax.SAXParseException;
 @JRubyClass(name = "Nokogiri::XML::SyntaxError", parent = "Nokogiri::SyntaxError")
 public class XmlSyntaxError extends RubyException
 {
+  private static final long serialVersionUID = 1L;
 
   private Exception exception;
   private boolean messageSet; // whether a custom error message was set

data/ext/java/nokogiri/XmlText.java

@@ -25,6 +25,7 @@ import org.w3c.dom.Text;
 @JRubyClass(name = "Nokogiri::XML::Text", parent = "Nokogiri::XML::CharacterData")
 public class XmlText extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
 
   private static final ByteList TEXT = ByteList.create("text");
   static { TEXT.setEncoding(USASCIIEncoding.INSTANCE); }

data/ext/java/nokogiri/XmlXpathContext.java

@@ -39,6 +39,8 @@ import static nokogiri.internals.NokogiriHelpers.nodeListToRubyArray;
 @JRubyClass(name = "Nokogiri::XML::XPathContext")
 public class XmlXpathContext extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   static
   {
     final String DTMManager = "org.apache.xml.dtm.DTMManager";

data/ext/java/nokogiri/XsltStylesheet.java

@@ -9,6 +9,7 @@ import java.io.PipedReader;
 import java.io.PipedWriter;
 import java.io.StringReader;
 import java.util.Set;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -22,8 +23,10 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.xalan.transformer.TransformerImpl;
 import org.apache.xml.serializer.SerializationHandler;
+import org.apache.xml.serializer.Serializer;
+import org.apache.xml.serializer.SerializerFactory;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -48,6 +51,7 @@ import nokogiri.internals.NokogiriXsltErrorListener;
 @JRubyClass(name = "Nokogiri::XSLT::Stylesheet")
 public class XsltStylesheet extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
 
   private TransformerFactory factory = null;
   private Templates sheet = null;
@@ -86,18 +90,17 @@ public class XsltStylesheet extends RubyObject
     }
   }
 
+  @SuppressWarnings("unchecked")
   private void
   setHashParameters(Transformer transformer, RubyHash hash)
   {
-    Set<String> keys = hash.keySet();
-    for (String key : keys) {
-      String value = (String)hash.get(key);
-      transformer.setParameter(key, unparseValue(value));
+    for (Map.Entry<Object, Object> entry : (Set<Map.Entry<Object, Object>>)hash.entrySet()) {
+      transformer.setParameter((String)entry.getKey(), unparseValue((String)entry.getValue()));
     }
   }
 
   private void
-  setArrayParameters(Transformer transformer, Ruby runtime, RubyArray params)
+  setArrayParameters(Transformer transformer, Ruby runtime, RubyArray<?> params)
   {
     int limit = params.getLength();
     if (limit % 2 == 1) { limit--; }
@@ -168,7 +171,7 @@ public class XsltStylesheet extends RubyObject
   ensureDocumentHasNoError(ThreadContext context, XmlDocument xmlDoc)
   {
     Ruby runtime = context.getRuntime();
-    RubyArray errors_of_xmlDoc = (RubyArray) xmlDoc.getInstanceVariable("@errors");
+    RubyArray<?> errors_of_xmlDoc = (RubyArray) xmlDoc.getInstanceVariable("@errors");
     if (!errors_of_xmlDoc.isEmpty()) {
       throw runtime.newRuntimeError(errors_of_xmlDoc.first().asString().asJavaString());
     }
@@ -176,14 +179,14 @@ public class XsltStylesheet extends RubyObject
 
   @JRubyMethod
   public IRubyObject
-  serialize(ThreadContext context, IRubyObject doc) throws IOException, TransformerException
+  serialize(ThreadContext context, IRubyObject doc) throws IOException
   {
     XmlDocument xmlDoc = (XmlDocument) doc;
-    TransformerImpl transformer = (TransformerImpl) this.sheet.newTransformer();
     ByteArrayOutputStream writer = new ByteArrayOutputStream();
-    StreamResult streamResult = new StreamResult(writer);
-    SerializationHandler serializationHandler = transformer.createSerializationHandler(streamResult);
-    serializationHandler.serialize(xmlDoc.getNode());
+
+    Serializer serializer = SerializerFactory.getSerializer(this.sheet.getOutputProperties());
+    serializer.setOutputStream(writer);
+    ((SerializationHandler) serializer).serialize(xmlDoc.getNode());
     return context.getRuntime().newString(writer.toString());
   }
 
@@ -329,7 +332,7 @@ public class XsltStylesheet extends RubyObject
       RubyClass xmlDocumentClass = getNokogiriClass(runtime, "Nokogiri::XML::Document");
       XmlDocument xmlDocument = (XmlDocument) Helpers.invoke(context, xmlDocumentClass, "parse", args);
       if (((Document)xmlDocument.getNode()).getDocumentElement() == null) {
-        RubyArray errors = (RubyArray) xmlDocument.getInstanceVariable("@errors");
+        RubyArray<?> errors = (RubyArray) xmlDocument.getInstanceVariable("@errors");
         Helpers.invoke(context, errors, "<<", args[0]);
       }
       return xmlDocument;

data/ext/java/nokogiri/internals/HtmlDomParserContext.java

@@ -15,8 +15,8 @@ import org.apache.xerces.xni.XMLAttributes;
 import org.apache.xerces.xni.XNIException;
 import org.apache.xerces.xni.parser.XMLDocumentFilter;
 import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.cyberneko.html.HTMLConfiguration;
-import org.cyberneko.html.filters.DefaultFilter;
+import net.sourceforge.htmlunit.cyberneko.HTMLConfiguration;
+import net.sourceforge.htmlunit.cyberneko.filters.DefaultFilter;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.runtime.ThreadContext;
@@ -36,6 +36,7 @@ import org.w3c.dom.NodeList;
  */
 public class HtmlDomParserContext extends XmlDomParserContext
 {
+  private static final long serialVersionUID = 1L;
 
   public
   HtmlDomParserContext(Ruby runtime, IRubyObject options)

data/ext/java/nokogiri/internals/NokogiriHandler.java

@@ -114,9 +114,9 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler
     final ThreadContext context = runtime.getCurrentContext();
 
     // for attributes other than namespace attrs
-    RubyArray rubyAttr = RubyArray.newArray(runtime);
+    RubyArray<?> rubyAttr = RubyArray.newArray(runtime);
     // for namespace defining attributes
-    RubyArray rubyNSAttr = RubyArray.newArray(runtime);
+    RubyArray<?> rubyNSAttr = RubyArray.newArray(runtime);
 
     boolean fromFragmentHandler = false; // isFromFragmentHandler();
 

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -645,10 +645,10 @@ public class NokogiriHelpers
     return result;
   }
 
-  public static RubyArray
+  public static RubyArray<?>
   nodeArrayToRubyArray(Ruby ruby, Node[] nodes)
   {
-    RubyArray n = RubyArray.newArray(ruby, nodes.length);
+    RubyArray<?> n = RubyArray.newArray(ruby, nodes.length);
     for (int i = 0; i < nodes.length; i++) {
       n.append(NokogiriHelpers.getCachedNodeOrCreate(ruby, nodes[i]));
     }
@@ -754,10 +754,9 @@ public class NokogiriHelpers
     else if (NokogiriHelpers.EUC_JP.compareTo(encoding) == 0) { opt = _Ew; }
     else { opt = _Ww; } // should not come here. should be treated before this method.
 
-    Class nkfClass;
+    Class<?> nkfClass;
     try {
-      // JRuby 1.7 and later
-      nkfClass = runtime.getClassLoader().loadClass("org.jruby.ext.nkf.RubyNKF");
+      nkfClass = Ruby.getClassLoader().loadClass("org.jruby.ext.nkf.RubyNKF");
     } catch (ClassNotFoundException e1) {
       return str;
     }

data/ext/java/nokogiri/internals/NokogiriXPathFunction.java

@@ -52,7 +52,7 @@ public class NokogiriXPathFunction implements XPathFunction
   }
 
   public Object
-  evaluate(List args) throws XPathFunctionException
+  evaluate(List<?> args) throws XPathFunctionException
   {
     if (args.size() != this.arity) {
       throw new XPathFunctionException("arity does not match");
@@ -76,7 +76,7 @@ public class NokogiriXPathFunction implements XPathFunction
   }
 
   private static IRubyObject[]
-  fromObjectToRubyArgs(final Ruby runtime, List args)
+  fromObjectToRubyArgs(final Ruby runtime, List<?> args)
   {
     IRubyObject[] newArgs = new IRubyObject[args.size()];
     for (int i = 0; i < args.size(); i++) {
@@ -114,7 +114,7 @@ public class NokogiriXPathFunction implements XPathFunction
   }
 
   private static boolean
-  builtinCssClass(List args) throws XPathFunctionException
+  builtinCssClass(List<?> args) throws XPathFunctionException
   {
     if (args.size() != 2) {
       throw new XPathFunctionException("builtin function nokogiri:css-class takes two arguments");

data/ext/java/nokogiri/internals/ParserContext.java

@@ -28,6 +28,8 @@ import org.xml.sax.InputSource;
  */
 public abstract class ParserContext extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   protected InputSource source = null;
   protected IRubyObject detected_encoding = null;
   protected int stringDataSize = -1;

data/ext/java/nokogiri/internals/ReaderNode.java

@@ -91,7 +91,7 @@ public abstract class ReaderNode
   public IRubyObject
   getAttributesNodes()
   {
-    RubyArray array = RubyArray.newArray(ruby);
+    RubyArray<?> array = RubyArray.newArray(ruby);
     if (attributeList != null && attributeList.length > 0) {
       if (document == null) {
         document = XmlDocument.createNewDocument(ruby);

data/ext/java/nokogiri/internals/SaveContextVisitor.java

@@ -12,7 +12,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.cyberneko.html.HTMLElements;
+import net.sourceforge.htmlunit.cyberneko.HTMLElements;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Comment;
@@ -81,6 +81,8 @@ public class SaveContextVisitor
   public static final int SUBSETS = 8;
   public static final int EXCLUSIVE = 16;
 
+  private static final HTMLElements htmlElements_ = new HTMLElements();
+
   public
   SaveContextVisitor(int options, CharSequence indent, String encoding, boolean htmlDoc, boolean fragment,
                      int canonicalOpts)
@@ -498,7 +500,7 @@ public class SaveContextVisitor
   private boolean
   isEmpty(String name)
   {
-    HTMLElements.Element element = HTMLElements.getElement(name);
+    HTMLElements.Element element = htmlElements_.getElement(name);
     return element.isEmpty();
   }
 

data/ext/java/nokogiri/internals/SchemaErrorHandler.java

@@ -20,10 +20,10 @@ public class SchemaErrorHandler implements ErrorHandler
 {
 
   private final Ruby runtime;
-  final RubyArray errors;
+  final RubyArray<?> errors;
 
   public
-  SchemaErrorHandler(Ruby ruby, RubyArray array)
+  SchemaErrorHandler(Ruby ruby, RubyArray<?> array)
   {
     this.runtime = ruby;
     this.errors = array;

data/ext/java/nokogiri/internals/XmlDomParserContext.java

@@ -30,6 +30,7 @@ import static nokogiri.internals.NokogiriHelpers.isBlank;
  */
 public class XmlDomParserContext extends ParserContext
 {
+  private static final long serialVersionUID = 1L;
 
   protected static final String FEATURE_LOAD_EXTERNAL_DTD =
     "http://apache.org/xml/features/nonvalidating/load-external-dtd";
@@ -150,7 +151,7 @@ public class XmlDomParserContext extends ParserContext
   }
 
 
-  public static RubyArray
+  public static RubyArray<?>
   mapErrors(ThreadContext context, NokogiriErrorHandler errorHandler)
   {
     final Ruby runtime = context.runtime;

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

@@ -87,6 +87,7 @@ public class Canonicalizer
    * @param algorithmURI
    * @throws InvalidCanonicalizerException
    */
+  @SuppressWarnings("deprecation")
   private
   Canonicalizer(String algorithmURI) throws CanonicalizationException
   {

data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java

@@ -580,7 +580,7 @@ public class DOM2DTM extends DTMDefaultBaseIterators
 
     int identity = makeNodeIdentity(nodeHandle);
 
-    return (Node) m_nodes.get(identity);
+    return m_nodes.get(identity);
   }
 
   /**
@@ -593,7 +593,7 @@ public class DOM2DTM extends DTMDefaultBaseIterators
   protected Node
   lookupNode(int nodeIdentity)
   {
-    return (Node) m_nodes.get(nodeIdentity);
+    return m_nodes.get(nodeIdentity);
   }
 
   /**
@@ -987,7 +987,7 @@ public class DOM2DTM extends DTMDefaultBaseIterators
 //        {
     int id = makeNodeIdentity(nodeHandle);
     if (NULL == id) { return null; }
-    Node newnode = (Node)m_nodes.get(id);
+    Node newnode = m_nodes.get(id);
     String newname = newnode.getLocalName();
     if (null == newname) {
       // XSLT treats PIs, and possibly other things, as having QNames.
@@ -1102,7 +1102,7 @@ public class DOM2DTM extends DTMDefaultBaseIterators
 //        {
     int id = makeNodeIdentity(nodeHandle);
     if (id == NULL) { return null; }
-    Node node = (Node)m_nodes.get(id);
+    Node node = m_nodes.get(id);
     return node.getNamespaceURI();
 //        }
 //        else
@@ -1608,6 +1608,7 @@ public class DOM2DTM extends DTMDefaultBaseIterators
    * @param node Node whose subtree is to be walked, gathering the
    * contents of all Text or CDATASection nodes.
    */
+  @SuppressWarnings("fallthrough")
   protected static void
   dispatchNodeData(Node node,
                    org.xml.sax.ContentHandler ch,