nokogiri 1.13.10-java → 1.14.0-java

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2008 -- 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
+Copyright 2008 -- 2023 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -2,7 +2,7 @@
 
 # Nokogiri
 
-Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a sensible, easy-to-understand API for [reading](https://nokogiri.org/tutorials/parsing_an_html_xml_document.html), writing, [modifying](https://nokogiri.org/tutorials/modifying_an_html_xml_document.html), and [querying](https://nokogiri.org/tutorials/searching_a_xml_html_document.html) documents. It is fast and standards-compliant by relying on native parsers like libxml2 (CRuby) and xerces (JRuby).
+Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a sensible, easy-to-understand API for [reading](https://nokogiri.org/tutorials/parsing_an_html_xml_document.html), writing, [modifying](https://nokogiri.org/tutorials/modifying_an_html_xml_document.html), and [querying](https://nokogiri.org/tutorials/searching_a_xml_html_document.html) documents. It is fast and standards-compliant by relying on native parsers like libxml2, libgumbo, and xerces.
 
 ## Guiding Principles
 
@@ -40,10 +40,6 @@ Some guiding principles Nokogiri tries to follow:
 
 All official documentation is posted at https://nokogiri.org (the source for which is at https://github.com/sparklemotion/nokogiri.org/, and we welcome contributions).
 
-Consider subscribing to [Tidelift][tidelift] which provides license assurances and timely security notifications for your open source dependencies, including Nokogiri. [Tidelift][tidelift] subscriptions also help the Nokogiri maintainers fund our [automated testing](https://ci.nokogiri.org) which in turn allows us to ship releases, bugfixes, and security updates more often.
-
-  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme
-
 ### Reading
 
 Your first stops for learning more about Nokogiri should be:
@@ -57,7 +53,6 @@ Your first stops for learning more about Nokogiri should be:
 
 There are a few ways to ask exploratory questions:
 
-- The Ruby Discord chat server is active at https://discord.gg/UyQnKrT
 - The Nokogiri mailing list is active at https://groups.google.com/group/nokogiri-talk
 - Open an issue using the "Help Request" template at https://github.com/sparklemotion/nokogiri/issues
 
@@ -103,12 +98,21 @@ We bump `Major.Minor.Patch` versions following this guidance:
 - Updating packaged libraries for security-related reasons.
 
 
+### Sponsorship
+
+You can help sponsor the maintainers of this software through one of these organizations:
+
+- [github.com/sponsors/flavorjones](https://github.com/sponsors/flavorjones)
+- [opencollective.com/nokogiri](https://opencollective.com/nokogiri)
+- [tidelift.com/subscription/pkg/rubygems-nokogiri](https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme)
+
+
 ## Installation
 
 Requirements:
 
-- Ruby >= 2.6
-- JRuby >= 9.3.0.0
+- Ruby >= 2.7
+- JRuby >= 9.4.0.0
 
 
 ### Native Gems: Faster, more reliable installation
@@ -119,10 +123,13 @@ Requirements:
 
 Nokogiri ships pre-compiled, "native" gems for the following platforms:
 
-- Linux: `x86-linux` and `x86_64-linux` (req: `glibc >= 2.17`), including musl platforms like Alpine
+- Linux:
+  - `x86-linux` and `x86_64-linux` (req: `glibc >= 2.17`)
+  - `aarch64-linux` and `arm-linux` (req: `glibc >= 2.29`)
+  - Note that musl platforms like Alpine **are** supported
 - Darwin/MacOS: `x86_64-darwin` and `arm64-darwin`
-- Windows: `x86-mingw32` and `x64-mingw32`
-- Java: any platform running JRuby 9.3 or higher
+- Windows: `x86-mingw32`, `x64-mingw32`, and `x64-mingw-ucrt`
+- Java: any platform running JRuby 9.4 or higher
 
 To determine whether your system supports one of these gems, look at the output of `bundle platform` or `ruby -e 'puts Gem::Platform.local.to_s'`.
 

data/dependencies.yml

@@ -14,10 +14,28 @@ zlib:
   # SHA-256 hash provided on http://zlib.net/
 
 libiconv:
-  version: "1.16"
-  sha256: "e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
-  # gpg: Signature made Fri 26 Apr 2019 03:36:38 PM EDT
-  # gpg:                using RSA key 4F494A942E4616C2
-  # gpg: Good signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>" [expired]
-  # gpg: Note: This key has expired!
-  # Primary key fingerprint: 68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2
+  version: "1.17"
+  sha256: "8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
+  # signature verified by following this path:
+  # - release announced at https://savannah.gnu.org/forum/forum.php?forum_id=10175
+  # - which links to https://savannah.gnu.org/users/haible as the releaser
+  # - which links to https://savannah.gnu.org/people/viewgpg.php?user_id=1871 as the gpg key
+  #
+  # So:
+  # - wget -q -O - https://savannah.gnu.org/people/viewgpg.php?user_id=1871 | gpg --import
+  #     gpg: key F5BE8B267C6A406D: 1 signature not checked due to a missing key
+  #     gpg: key F5BE8B267C6A406D: public key "Bruno Haible (Open Source Development) <bruno@clisp.org>" imported
+  #     gpg: Total number processed: 1
+  #     gpg:               imported: 1
+  #     gpg: marginals needed: 3  completes needed: 1  trust model: pgp
+  #     gpg: depth: 0  valid:   4  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 4u
+  #     gpg: next trustdb check due at 2024-05-09
+  # - gpg --verify libiconv-1.17.tar.gz.sig ports/archives/libiconv-1.17.tar.gz
+  #     gpg: Signature made Sun 15 May 2022 11:26:42 AM EDT
+  #     gpg:                using RSA key 9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D
+  #     gpg: Good signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>" [unknown]
+  #     gpg: WARNING: This key is not certified with a trusted signature!
+  #     gpg:          There is no indication that the signature belongs to the owner.
+  #     Primary key fingerprint: 9001 B85A F9E1 B83D F1BD  A942 F5BE 8B26 7C6A 406D
+  #
+  # And this sha256sum is calculated from that verified tarball.

data/ext/java/nokogiri/Html4Document.java

@@ -26,6 +26,8 @@ import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 @JRubyClass(name = "Nokogiri::HTML4::Document", parent = "Nokogiri::XML::Document")
 public class Html4Document extends XmlDocument
 {
+  private static final long serialVersionUID = 1L;
+
   private static final String DEFAULT_CONTENT_TYPE = "html";
   private static final String DEFAULT_PUBLIC_ID = "-//W3C//DTD HTML 4.01//EN";
   private static final String DEFAULT_SYTEM_ID = "http://www.w3.org/TR/html4/strict.dtd";

data/ext/java/nokogiri/Html4ElementDescription.java

@@ -6,7 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.cyberneko.html.HTMLElements;
+import net.sourceforge.htmlunit.cyberneko.HTMLElements;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyObject;
@@ -23,6 +23,8 @@ import org.jruby.runtime.builtin.IRubyObject;
 @JRubyClass(name = "Nokogiri::HTML4::ElementDescription")
 public class Html4ElementDescription extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+  private static final HTMLElements htmlElements_ = new HTMLElements();
 
   /**
    * Stores memoized hash of element -> list of valid subelements.
@@ -62,9 +64,8 @@ public class Html4ElementDescription extends RubyObject
        * the list of elements directly because it's protected.
        */
       for (short c = 0; c < HTMLElements.UNKNOWN; c++) {
-        HTMLElements.Element maybe_sub =
-          HTMLElements.getElement(c);
-        if (maybe_sub.isParent(elem)) {
+        HTMLElements.Element maybe_sub = htmlElements_.getElement(c);
+        if (maybe_sub != null && maybe_sub.isParent(elem)) {
           subs.add(maybe_sub.name);
         }
       }
@@ -81,11 +82,10 @@ public class Html4ElementDescription extends RubyObject
       IRubyObject klazz, IRubyObject name)
   {
 
-    // nekohtml will return an element even for invalid names, see
-    // http://sourceforge.net/p/nekohtml/code/HEAD/tree/trunk/src/org/cyberneko/html/HTMLElements.java#l514
-    // which breaks `test_fetch_nonexistent'
-    HTMLElements.Element elem = HTMLElements.getElement(name.asJavaString(), HTMLElements.NO_SUCH_ELEMENT);
-    if (elem == HTMLElements.NO_SUCH_ELEMENT) {
+    // nekohtml will return an element even for invalid names, which breaks `test_fetch_nonexistent'
+    // see getElement() in HTMLElements.java
+    HTMLElements.Element elem = htmlElements_.getElement(name.asJavaString(), htmlElements_.NO_SUCH_ELEMENT);
+    if (elem == htmlElements_.NO_SUCH_ELEMENT) {
       return context.nil;
     }
 

data/ext/java/nokogiri/Html4EntityLookup.java

@@ -2,7 +2,7 @@ package nokogiri;
 
 import static org.jruby.runtime.Helpers.invoke;
 
-import org.cyberneko.html.HTMLEntities;
+import net.sourceforge.htmlunit.cyberneko.HTMLEntitiesParser;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyObject;
@@ -19,6 +19,7 @@ import org.jruby.runtime.builtin.IRubyObject;
 @JRubyClass(name = "Nokogiri::HTML4::EntityLookup")
 public class Html4EntityLookup extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
 
   public
   Html4EntityLookup(Ruby runtime, RubyClass rubyClass)
@@ -37,8 +38,18 @@ public class Html4EntityLookup extends RubyObject
   {
     Ruby ruby = context.getRuntime();
     String name = key.toString();
-    int val = HTMLEntities.get(name);
-    if (val == -1) { return ruby.getNil(); }
+
+    HTMLEntitiesParser parser = new HTMLEntitiesParser();
+    for (int j = 0 ; j < name.length() ; j++) {
+      if (!parser.parse(name.charAt(j))) {
+        break;
+      }
+    }
+    String match = parser.getMatch();
+
+    if (match == null) { return ruby.getNil(); }
+
+    int val = match.charAt(0);
 
     IRubyObject edClass =
       ruby.getClassFromPath("Nokogiri::HTML4::EntityDescription");

data/ext/java/nokogiri/Html4SaxParserContext.java

@@ -9,7 +9,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.xerces.parsers.AbstractSAXParser;
-import org.cyberneko.html.parsers.SAXParser;
+import net.sourceforge.htmlunit.cyberneko.parsers.SAXParser;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
@@ -30,10 +30,10 @@ import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-
 @JRubyClass(name = "Nokogiri::HTML4::SAX::ParserContext", parent = "Nokogiri::XML::SAX::ParserContext")
 public class Html4SaxParserContext extends XmlSaxParserContext
 {
+  private static final long serialVersionUID = 1L;
 
   static Html4SaxParserContext
   newInstance(final Ruby runtime, final RubyClass klazz)

data/ext/java/nokogiri/Html4SaxPushParser.java

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

data/ext/java/nokogiri/NokogiriService.java

@@ -29,6 +29,7 @@ public class NokogiriService implements BasicLibraryService
     return true;
   }
 
+  @SuppressWarnings("unchecked")
   public static Map<String, RubyClass>
   getNokogiriClassCache(Ruby ruby)
   {
@@ -39,7 +40,6 @@ public class NokogiriService implements BasicLibraryService
   populateNokogiriClassCahce(Ruby ruby)
   {
     Map<String, RubyClass> nokogiriClassCache = new HashMap<String, RubyClass>();
-    nokogiriClassCache.put("Nokogiri::EncodingHandler", (RubyClass)ruby.getClassFromPath("Nokogiri::EncodingHandler"));
     nokogiriClassCache.put("Nokogiri::HTML4::Document", (RubyClass)ruby.getClassFromPath("Nokogiri::HTML4::Document"));
     nokogiriClassCache.put("Nokogiri::HTML4::ElementDescription",
                            (RubyClass)ruby.getClassFromPath("Nokogiri::HTML4::ElementDescription"));
@@ -85,8 +85,6 @@ public class NokogiriService implements BasicLibraryService
     RubyModule htmlSaxModule = htmlModule.defineModuleUnder("SAX");
     RubyModule xsltModule = nokogiri.defineModuleUnder("XSLT");
 
-    createJavaLibraryVersionConstants(ruby, nokogiri);
-    createNokogiriModule(ruby, nokogiri);
     createSyntaxErrors(ruby, nokogiri, xmlModule);
     RubyClass xmlNode = createXmlModule(ruby, xmlModule);
     createHtmlModule(ruby, htmlModule);
@@ -96,20 +94,6 @@ public class NokogiriService implements BasicLibraryService
     nokogiri.setInternalVariable("cache", populateNokogiriClassCahce(ruby));
   }
 
-  private void
-  createJavaLibraryVersionConstants(Ruby ruby, RubyModule nokogiri)
-  {
-    nokogiri.defineConstant("XERCES_VERSION", ruby.newString(org.apache.xerces.impl.Version.getVersion()));
-    nokogiri.defineConstant("NEKO_VERSION", ruby.newString(org.cyberneko.html.Version.getVersion()));
-  }
-
-  private void
-  createNokogiriModule(Ruby ruby, RubyModule nokogiri)
-  {
-    RubyClass encHandler = nokogiri.defineClassUnder("EncodingHandler", ruby.getObject(), ENCODING_HANDLER_ALLOCATOR);
-    encHandler.defineAnnotatedMethods(EncodingHandler.class);
-  }
-
   private void
   createSyntaxErrors(Ruby ruby, RubyModule nokogiri, RubyModule xmlModule)
   {
@@ -246,13 +230,6 @@ public class NokogiriService implements BasicLibraryService
     xsltModule.defineAnnotatedMethod(XsltStylesheet.class, "register");
   }
 
-  private static ObjectAllocator ENCODING_HANDLER_ALLOCATOR = new ObjectAllocator()
-  {
-    public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-      return new EncodingHandler(runtime, klazz, "");
-    }
-  };
-
   public static final ObjectAllocator HTML_DOCUMENT_ALLOCATOR = new ObjectAllocator()
   {
     private Html4Document htmlDocument = null;

data/ext/java/nokogiri/XmlAttr.java

@@ -22,10 +22,10 @@ import org.w3c.dom.Node;
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-
 @JRubyClass(name = "Nokogiri::XML::Attr", parent = "Nokogiri::XML::Node")
 public class XmlAttr extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
 
   public static final String[] HTML_BOOLEAN_ATTRS = {
     "checked", "compact", "declare", "defer", "disabled", "ismap",

data/ext/java/nokogiri/XmlAttributeDecl.java

@@ -20,6 +20,7 @@ import org.w3c.dom.Node;
 @JRubyClass(name = "Nokogiri::XML::AttributeDecl", parent = "Nokogiri::XML::Node")
 public class XmlAttributeDecl extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
 
   public
   XmlAttributeDecl(Ruby ruby, RubyClass klass)
@@ -105,7 +106,7 @@ public class XmlAttributeDecl extends XmlNode
       // removed enclosing parens
       String valueStr = atype.substring(1, atype.length() - 1);
       String[] values = valueStr.split("\\|");
-      RubyArray enumVals = RubyArray.newArray(context.runtime, values.length);
+      RubyArray<?> enumVals = RubyArray.newArray(context.runtime, values.length);
       for (int i = 0; i < values.length; i++) {
         enumVals.append(context.runtime.newString(values[i]));
       }

data/ext/java/nokogiri/XmlCdata.java

@@ -19,10 +19,11 @@ import org.w3c.dom.Node;
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-
 @JRubyClass(name = "Nokogiri::XML::CDATA", parent = "Nokogiri::XML::Text")
 public class XmlCdata extends XmlText
 {
+  private static final long serialVersionUID = 1L;
+
   public
   XmlCdata(Ruby ruby, RubyClass rubyClass)
   {

data/ext/java/nokogiri/XmlComment.java

@@ -18,10 +18,11 @@ import org.w3c.dom.Node;
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-
 @JRubyClass(name = "Nokogiri::XML::Comment", parent = "Nokogiri::XML::CharacterData")
 public class XmlComment extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
+
   public
   XmlComment(Ruby ruby, RubyClass rubyClass, Node node)
   {

data/ext/java/nokogiri/XmlDocument.java

@@ -51,10 +51,11 @@ import nokogiri.internals.c14n.Canonicalizer;
  * @author Yoko Harada <yokolet@gmail.com>
  * @author John Shahid <jvshahid@gmail.com>
  */
-
 @JRubyClass(name = "Nokogiri::XML::Document", parent = "Nokogiri::XML::Node")
 public class XmlDocument extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
+
   private NokogiriNamespaceCache nsCache;
 
   /* UserData keys for storing extra info in the document node. */
@@ -600,7 +601,7 @@ public class XmlDocument extends XmlNode
   public static IRubyObject
   wrap(ThreadContext context, IRubyObject klass, IRubyObject arg)
   {
-    XmlDocument xmlDocument = new XmlDocument(context.runtime, (RubyClass) klass, (Document) arg.toJava(Document.class));
+    XmlDocument xmlDocument = new XmlDocument(context.runtime, (RubyClass) klass, arg.toJava(Document.class));
     Helpers.invoke(context, xmlDocument, "initialize");
     return xmlDocument;
   }
@@ -680,11 +681,9 @@ public class XmlDocument extends XmlNode
         result = canonicalizer.canonicalizeSubtree(startingNode.getNode(), inclusive_namespace, filter);
       }
       return RubyString.newString(context.runtime, new ByteList(result, UTF8Encoding.INSTANCE));
-    } catch (CanonicalizationException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+    } catch (Exception e) {
+      throw context.getRuntime().newRuntimeError(e.getMessage());
     }
-    return context.nil;
   }
 
   private XmlNode

data/ext/java/nokogiri/XmlDocumentFragment.java

@@ -34,6 +34,7 @@ import org.w3c.dom.NamedNodeMap;
 @JRubyClass(name = "Nokogiri::XML::DocumentFragment", parent = "Nokogiri::XML::Node")
 public class XmlDocumentFragment extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
 
   public
   XmlDocumentFragment(Ruby ruby)
@@ -122,7 +123,7 @@ public class XmlDocumentFragment extends XmlNode
         if (isNamespaceDefined(qName, nodeMap)) {
           CharSequence namespaceDecl = getNamespaceDecl(getPrefix(qName), nodeMap);
           if (namespaceDecl != null) {
-            if (rewriteTable == null) { rewriteTable = new HashMap(8, 1); }
+            if (rewriteTable == null) { rewriteTable = new HashMap<CharSequence, CharSequence>(8, 1); }
             StringBuilder str = new StringBuilder(qName.length() + namespaceDecl.length() + 3);
             String key = str.append('<').append(qName).append('>').toString();
             str.setCharAt(key.length() - 1, ' '); // (last) '>' -> ' '

data/ext/java/nokogiri/XmlDtd.java

@@ -34,10 +34,11 @@ import nokogiri.internals.SaveContextVisitor;
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-
 @JRubyClass(name = "Nokogiri::XML::DTD", parent = "Nokogiri::XML::Node")
 public class XmlDtd extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
+
   /** cache of children, Nokogiri::XML::NodeSet */
   protected IRubyObject children = null;
 
@@ -331,7 +332,7 @@ public class XmlDtd extends XmlNode
   public IRubyObject
   validate(ThreadContext context, IRubyObject doc)
   {
-    RubyArray errors = RubyArray.newArray(context.getRuntime());
+    RubyArray<?> errors = RubyArray.newArray(context.getRuntime());
     if (doc instanceof XmlDocument) {
       errors = (RubyArray)((XmlDocument)doc).getInstanceVariable("@errors");
     }
@@ -416,7 +417,7 @@ public class XmlDtd extends XmlNode
     children = XmlNodeSet.newNodeSet(runtime, extractDecls(context, node.getFirstChild()));
 
     // add attribute decls as attributes to the matching element decl
-    RubyArray keys = attributes.keys();
+    RubyArray<?> keys = attributes.keys();
     for (int i = 0; i < keys.getLength(); ++i) {
       IRubyObject akey = keys.entry(i);
       IRubyObject val;

data/ext/java/nokogiri/XmlElement.java

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

data/ext/java/nokogiri/XmlElementContent.java

@@ -26,6 +26,8 @@ import org.w3c.dom.Node;
 @JRubyClass(name = "Nokogiri::XML::ElementContent")
 public class XmlElementContent extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   protected String element_name = null;
 
   protected String name;
@@ -145,8 +147,9 @@ public class XmlElementContent extends RubyObject
       case SEQ:
       case OR:
         applyGroup(runtime, klass, doc, iter);
+        break;
       default:
-        // noop
+        break;
     }
   }
 

data/ext/java/nokogiri/XmlElementDecl.java

@@ -22,7 +22,9 @@ import org.w3c.dom.Node;
 @JRubyClass(name = "Nokogiri::XML::ElementDecl", parent = "Nokogiri::XML::Node")
 public class XmlElementDecl extends XmlNode
 {
-  RubyArray attrDecls;
+  private static final long serialVersionUID = 1L;
+
+  RubyArray<?> attrDecls;
   IRubyObject contentModel;
 
   public

data/ext/java/nokogiri/XmlEntityDecl.java

@@ -20,6 +20,8 @@ import org.w3c.dom.Node;
 @JRubyClass(name = "Nokogiri::XML::EntityDecl", parent = "Nokogiri::XML::Node")
 public class XmlEntityDecl extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
+
   public static final int INTERNAL_GENERAL = 1;
   public static final int EXTERNAL_GENERAL_PARSED = 2;
   public static final int EXTERNAL_GENERAL_UNPARSED  = 3;

data/ext/java/nokogiri/XmlEntityReference.java

@@ -23,6 +23,7 @@ import org.w3c.dom.Node;
 @JRubyClass(name = "Nokogiri::XML::EntityReference", parent = "Nokogiri::XML::Node")
 public class XmlEntityReference extends XmlNode
 {
+  private static final long serialVersionUID = 1L;
 
   public
   XmlEntityReference(Ruby ruby, RubyClass klazz)

data/ext/java/nokogiri/XmlNamespace.java

@@ -25,6 +25,8 @@ import org.w3c.dom.Node;
 @JRubyClass(name = "Nokogiri::XML::Namespace")
 public class XmlNamespace extends RubyObject
 {
+  private static final long serialVersionUID = 1L;
+
   private Attr attr;
   private transient IRubyObject prefixRuby;
   private transient IRubyObject hrefRuby;