Skip to content

Commit 0723293

Browse files
jvshahidjvshahid
authored
Merge pull request #1874 from sparklemotion/remove-runtime-helpers-usage
Replace deprecated usage of RuntimeHelpers with Helpers
2 parents 19c9570 + 280a537 commit 0723293

13 files changed

+61
-64
lines changed

‎ext/java/nokogiri/HtmlDocument.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@
3232

3333
package nokogiri;
3434

35-
import nokogiri.internals.HtmlDomParserContext;
3635
import org.jruby.Ruby;
3736
import org.jruby.RubyClass;
3837
import org.jruby.anno.JRubyClass;
3938
import org.jruby.anno.JRubyMethod;
40-
import org.jruby.javasupport.util.RuntimeHelpers;
4139
import org.jruby.runtime.Arity;
40+
import org.jruby.runtime.Helpers;
4241
import org.jruby.runtime.ThreadContext;
4342
import org.jruby.runtime.builtin.IRubyObject;
4443
import org.w3c.dom.Attr;
@@ -47,6 +46,8 @@
4746
import org.w3c.dom.Node;
4847
import org.w3c.dom.NodeList;
4948

49+
import nokogiri.internals.HtmlDomParserContext;
50+
5051
/**
5152
* Class for Nokogiri::HTML::Document.
5253
*
@@ -81,7 +82,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz,
8182
throw context.getRuntime().newRuntimeError("couldn't create document: " + ex);
8283
}
8384

84-
RuntimeHelpers.invoke(context, htmlDocument, "initialize", args);
85+
Helpers.invoke(context, htmlDocument, "initialize", args);
8586

8687
return htmlDocument;
8788
}

‎ext/java/nokogiri/HtmlEntityLookup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package nokogiri;
3434

35-
import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
35+
import static org.jruby.runtime.Helpers.invoke;
3636

3737
import org.cyberneko.html.HTMLEntities;
3838
import org.jruby.Ruby;

‎ext/java/nokogiri/HtmlSaxPushParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import static nokogiri.XmlSaxPushParser.terminateExecution;
3636
import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
37-
import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
37+
import static org.jruby.runtime.Helpers.invoke;
3838

3939
import java.io.ByteArrayInputStream;
4040
import java.io.InputStream;

‎ext/java/nokogiri/XmlDocument.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@
4545
import javax.xml.parsers.DocumentBuilderFactory;
4646
import javax.xml.parsers.ParserConfigurationException;
4747

48-
import nokogiri.internals.NokogiriHelpers;
49-
import nokogiri.internals.NokogiriNamespaceCache;
50-
import nokogiri.internals.SaveContextVisitor;
51-
import nokogiri.internals.XmlDomParserContext;
52-
import nokogiri.internals.c14n.CanonicalFilter;
53-
import nokogiri.internals.c14n.CanonicalizationException;
54-
import nokogiri.internals.c14n.Canonicalizer;
55-
5648
import org.jruby.Ruby;
5749
import org.jruby.RubyArray;
5850
import org.jruby.RubyClass;
@@ -61,9 +53,9 @@
6153
import org.jruby.anno.JRubyClass;
6254
import org.jruby.anno.JRubyMethod;
6355
import org.jruby.javasupport.JavaUtil;
64-
import org.jruby.javasupport.util.RuntimeHelpers;
6556
import org.jruby.runtime.Arity;
6657
import org.jruby.runtime.Block;
58+
import org.jruby.runtime.Helpers;
6759
import org.jruby.runtime.ThreadContext;
6860
import org.jruby.runtime.builtin.IRubyObject;
6961
import org.w3c.dom.Attr;
@@ -73,6 +65,14 @@
7365
import org.w3c.dom.Node;
7466
import org.w3c.dom.NodeList;
7567

68+
import nokogiri.internals.NokogiriHelpers;
69+
import nokogiri.internals.NokogiriNamespaceCache;
70+
import nokogiri.internals.SaveContextVisitor;
71+
import nokogiri.internals.XmlDomParserContext;
72+
import nokogiri.internals.c14n.CanonicalFilter;
73+
import nokogiri.internals.c14n.CanonicalizationException;
74+
import nokogiri.internals.c14n.Canonicalizer;
75+
7676
/**
7777
* Class for Nokogiri::XML::Document
7878
*
@@ -264,7 +264,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyO
264264
throw context.getRuntime().newRuntimeError("couldn't create document: "+ex.toString());
265265
}
266266

267-
RuntimeHelpers.invoke(context, xmlDocument, "initialize", args);
267+
Helpers.invoke(context, xmlDocument, "initialize", args);
268268

269269
return xmlDocument;
270270
}
@@ -565,7 +565,7 @@ public void accept(ThreadContext context, SaveContextVisitor visitor) {
565565
@JRubyMethod(meta=true)
566566
public static IRubyObject wrapJavaDocument(ThreadContext context, IRubyObject klazz, IRubyObject arg) {
567567
XmlDocument xmlDocument = (XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document"));
568-
RuntimeHelpers.invoke(context, xmlDocument, "initialize");
568+
Helpers.invoke(context, xmlDocument, "initialize");
569569
Document document = (Document)arg.toJava(Document.class);
570570
xmlDocument.setDocumentNode(context, document);
571571
return xmlDocument;

‎ext/java/nokogiri/XmlDocumentFragment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
import java.util.HashMap;
4242
import java.util.Map;
43-
import java.util.Set;
4443
import java.util.regex.Matcher;
4544
import java.util.regex.Pattern;
4645

@@ -50,7 +49,7 @@
5049
import org.jruby.RubyString;
5150
import org.jruby.anno.JRubyClass;
5251
import org.jruby.anno.JRubyMethod;
53-
import org.jruby.javasupport.util.RuntimeHelpers;
52+
import org.jruby.runtime.Helpers;
5453
import org.jruby.runtime.ThreadContext;
5554
import org.jruby.runtime.builtin.IRubyObject;
5655
import org.jruby.util.ByteList;
@@ -103,7 +102,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject cls, IRubyObj
103102
if (args.length == 3 && args[2] != null && args[2] instanceof XmlElement) {
104103
fragment.fragmentContext = (XmlElement)args[2];
105104
}
106-
RuntimeHelpers.invoke(context, fragment, "initialize", args);
105+
Helpers.invoke(context, fragment, "initialize", args);
107106
return fragment;
108107
}
109108

‎ext/java/nokogiri/XmlNode.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* distribute, sublicense, and/or sell copies of the Software, and to
1818
* permit persons to whom the Software is furnished to do so, subject to
1919
* the following conditions:
20-
*
20+
*
2121
* The above copyright notice and this permission notice shall be
2222
* included in all copies or substantial portions of the Software.
23-
*
23+
*
2424
* THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
2525
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
2626
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -64,7 +64,7 @@
6464
import org.jruby.anno.JRubyClass;
6565
import org.jruby.anno.JRubyMethod;
6666
import org.jruby.exceptions.RaiseException;
67-
import org.jruby.javasupport.util.RuntimeHelpers;
67+
import org.jruby.runtime.Helpers;
6868
import org.jruby.runtime.Block;
6969
import org.jruby.runtime.ThreadContext;
7070
import org.jruby.runtime.Visibility;
@@ -227,7 +227,7 @@ protected void decorate(final ThreadContext context) {
227227
doc = document(context.runtime);
228228

229229
if (doc != null && ! doc.isNil()) {
230-
RuntimeHelpers.invoke(context, doc, "decorate", this);
230+
Helpers.invoke(context, doc, "decorate", this);
231231
}
232232
}
233233
}
@@ -570,7 +570,7 @@ public void setDocument(ThreadContext context, IRubyObject doc) {
570570
static void setDocumentAndDecorate(ThreadContext context, RubyObject self, IRubyObject doc) {
571571
self.setInstanceVariable("@document", doc);
572572
if (doc != null) {
573-
RuntimeHelpers.invoke(context, doc, "decorate", self);
573+
Helpers.invoke(context, doc, "decorate", self);
574574
}
575575
}
576576

@@ -709,7 +709,7 @@ public IRubyObject attribute_with_ns(ThreadContext context, IRubyObject name, IR
709709

710710
@JRubyMethod(name = "blank?")
711711
public IRubyObject blank_p(ThreadContext context) {
712-
// according to libxml doc,
712+
// according to libxml doc,
713713
// a node is blank if if it is a Text or CDATA node consisting of whitespace only
714714
if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE) {
715715
String data = node.getTextContent();
@@ -853,7 +853,7 @@ public IRubyObject in_context(ThreadContext context,
853853
HtmlDomParserContext htmlCtx= (HtmlDomParserContext) ctx;
854854
htmlCtx.setEncoding(document.getEncoding().asJavaString());
855855
}
856-
856+
857857
XmlDocument doc = ctx.parse(context, klass, runtime.getNil());
858858

859859
RubyArray documentErrors = getErrorArray(document);
@@ -1158,7 +1158,7 @@ public IRubyObject namespace(ThreadContext context) {
11581158
@JRubyMethod
11591159
public IRubyObject namespace_definitions(ThreadContext context) {
11601160
// don't use namespace_definitions cache anymore since
1161-
// namespaces might be deleted. Reflecting the result of
1161+
// namespaces might be deleted. Reflecting the result of
11621162
// namesapce removals is complicated, so the cache might not be
11631163
// updated.
11641164
Ruby ruby = context.getRuntime();
@@ -1279,7 +1279,7 @@ public IRubyObject native_write_to(ThreadContext context, IRubyObject[] args) {
12791279

12801280
String encString = encoding.isNil() ? null : rubyStringToString(encoding);
12811281

1282-
SaveContextVisitor visitor =
1282+
SaveContextVisitor visitor =
12831283
new SaveContextVisitor(RubyFixnum.fix2int(options), rubyStringToString(indentString), encString, isHtmlDoc(context), isFragment(), 0);
12841284
accept(context, visitor);
12851285

@@ -1291,7 +1291,7 @@ public IRubyObject native_write_to(ThreadContext context, IRubyObject[] args) {
12911291
ByteList str = new ByteList(bytes.array(), bytes.arrayOffset(), bytes.remaining());
12921292
rubyString = RubyString.newString(context.getRuntime(), str);
12931293
}
1294-
RuntimeHelpers.invoke(context, io, "write", rubyString);
1294+
Helpers.invoke(context, io, "write", rubyString);
12951295

12961296
return io;
12971297
}
@@ -1764,7 +1764,7 @@ public IRubyObject add_next_sibling_node(ThreadContext context, IRubyObject othe
17641764
*
17651765
* Loads and substitutes all xinclude elements below the node. The
17661766
* parser context will be initialized with +options+.
1767-
*
1767+
*
17681768
*/
17691769
@JRubyMethod(visibility=Visibility.PRIVATE)
17701770
public IRubyObject process_xincludes(ThreadContext context, IRubyObject options) {

‎ext/java/nokogiri/XmlProcessingInstruction.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,20 @@
3333
package nokogiri;
3434

3535
import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
36-
import nokogiri.internals.SaveContextVisitor;
3736

3837
import org.jruby.Ruby;
3938
import org.jruby.RubyClass;
4039
import org.jruby.anno.JRubyClass;
4140
import org.jruby.anno.JRubyMethod;
42-
import org.jruby.javasupport.util.RuntimeHelpers;
41+
import org.jruby.runtime.Helpers;
4342
import org.jruby.runtime.ThreadContext;
4443
import org.jruby.runtime.builtin.IRubyObject;
4544
import org.w3c.dom.Document;
4645
import org.w3c.dom.Node;
4746
import org.w3c.dom.ProcessingInstruction;
4847

48+
import nokogiri.internals.SaveContextVisitor;
49+
4950
/**
5051
* Class for Nokogiri::XML::ProcessingInstruction
5152
*
@@ -81,7 +82,7 @@ public static IRubyObject rbNew(ThreadContext context,
8182
(RubyClass) klazz,
8283
node);
8384

84-
RuntimeHelpers.invoke(context, self, "initialize", args);
85+
Helpers.invoke(context, self, "initialize", args);
8586

8687
// TODO: if_block_given.
8788

‎ext/java/nokogiri/XmlSaxParserContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package nokogiri;
3434

35-
import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
35+
import static org.jruby.runtime.Helpers.invoke;
3636

3737
import java.io.IOException;
3838
import java.io.InputStream;

‎ext/java/nokogiri/XmlSaxPushParser.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
package nokogiri;
3434

3535
import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
36-
import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
36+
import static org.jruby.runtime.Helpers.invoke;
3737

3838
import java.io.ByteArrayInputStream;
3939
import java.io.IOException;
@@ -45,18 +45,20 @@
4545
import java.util.concurrent.FutureTask;
4646
import java.util.concurrent.ThreadFactory;
4747

48-
import nokogiri.internals.*;
49-
5048
import org.jruby.Ruby;
5149
import org.jruby.RubyClass;
52-
import org.jruby.RubyException;
5350
import org.jruby.RubyObject;
5451
import org.jruby.anno.JRubyClass;
5552
import org.jruby.anno.JRubyMethod;
5653
import org.jruby.exceptions.RaiseException;
5754
import org.jruby.runtime.ThreadContext;
5855
import org.jruby.runtime.builtin.IRubyObject;
59-
import org.xml.sax.SAXException;
56+
57+
import nokogiri.internals.ClosedStreamException;
58+
import nokogiri.internals.NokogiriBlockingQueueInputStream;
59+
import nokogiri.internals.NokogiriHandler;
60+
import nokogiri.internals.NokogiriHelpers;
61+
import nokogiri.internals.ParserContext;
6062

6163
/**
6264
* Class for Nokogiri::XML::SAX::PushParser

‎ext/java/nokogiri/XsltStylesheet.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
import java.io.PipedReader;
4141
import java.io.PipedWriter;
4242
import java.io.StringReader;
43-
import java.nio.CharBuffer;
44-
import java.util.HashMap;
45-
import java.util.Map;
4643
import java.util.Set;
4744
import java.util.regex.Matcher;
4845
import java.util.regex.Pattern;
@@ -57,8 +54,6 @@
5754
import javax.xml.transform.stream.StreamResult;
5855
import javax.xml.transform.stream.StreamSource;
5956

60-
import nokogiri.internals.NokogiriXsltErrorListener;
61-
6257
import org.apache.xalan.transformer.TransformerImpl;
6358
import org.apache.xml.serializer.SerializationHandler;
6459
import org.jruby.Ruby;
@@ -69,11 +64,13 @@
6964
import org.jruby.RubyString;
7065
import org.jruby.anno.JRubyClass;
7166
import org.jruby.anno.JRubyMethod;
72-
import org.jruby.javasupport.util.RuntimeHelpers;
67+
import org.jruby.runtime.Helpers;
7368
import org.jruby.runtime.ThreadContext;
7469
import org.jruby.runtime.builtin.IRubyObject;
7570
import org.w3c.dom.Document;
7671

72+
import nokogiri.internals.NokogiriXsltErrorListener;
73+
7774
/**
7875
* Class for Nokogiri::XSLT::Stylesheet
7976
*
@@ -327,14 +324,14 @@ private IRubyObject createDocumentFromString(ThreadContext context, Ruby runtime
327324
if (htmlish) {
328325
args[3] = parse_options.getConstant("DEFAULT_HTML");
329326
RubyClass htmlDocumentClass = getNokogiriClass(runtime, "Nokogiri::HTML::Document");
330-
return RuntimeHelpers.invoke(context, htmlDocumentClass, "parse", args);
327+
return Helpers.invoke(context, htmlDocumentClass, "parse", args);
331328
} else {
332329
args[3] = parse_options.getConstant("DEFAULT_XML");
333330
RubyClass xmlDocumentClass = getNokogiriClass(runtime, "Nokogiri::XML::Document");
334-
XmlDocument xmlDocument = (XmlDocument) RuntimeHelpers.invoke(context, xmlDocumentClass, "parse", args);
331+
XmlDocument xmlDocument = (XmlDocument) Helpers.invoke(context, xmlDocumentClass, "parse", args);
335332
if (((Document)xmlDocument.getNode()).getDocumentElement() == null) {
336333
RubyArray errors = (RubyArray) xmlDocument.getInstanceVariable("@errors");
337-
RuntimeHelpers.invoke(context, errors, "<<", args[0]);
334+
Helpers.invoke(context, errors, "<<", args[0]);
338335
}
339336
return xmlDocument;
340337
}

0 commit comments

Comments
 (0)