nokogiri 1.11.0.rc3-java → 1.11.4-java

data/ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java

@@ -23,7 +23,8 @@ import nokogiri.XmlSaxPushParser;
  *
  * @author John Shahid <jvshahid@gmail.com>
  */
-public class NokogiriBlockingQueueInputStream extends InputStream {
+public class NokogiriBlockingQueueInputStream extends InputStream
+{
   private final LinkedBlockingQueue<Task>  queue;
   protected Task                           currentTask;
   protected ByteArrayInputStream           currentStream;
@@ -32,10 +33,13 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
 
   public static final ByteArrayInputStream END    = new ByteArrayInputStream(new byte[0]);
 
-  private static class Task extends FutureTask<Void> {
+  private static class Task extends FutureTask<Void>
+  {
     private final ByteArrayInputStream stream;
 
-    public Task(ByteArrayInputStream stream) {
+    public
+    Task(ByteArrayInputStream stream)
+    {
       super(new Callable<Void>() {
         @Override
         public Void call() throws Exception {
@@ -46,28 +50,38 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
       this.stream = stream;
     }
 
-    public ByteArrayInputStream getStream() {
+    public ByteArrayInputStream
+    getStream()
+    {
       return stream;
     }
 
     @Override
-    public void run() {
+    public void
+    run()
+    {
       // don't do anything
     }
 
     @Override
-    public boolean runAndReset() {
+    public boolean
+    runAndReset()
+    {
       // don't do anything
       return true;
     }
 
     @Override
-    public void set(Void v) {
+    public void
+    set(Void v)
+    {
       super.set(v);
     }
   }
 
-  public NokogiriBlockingQueueInputStream() {
+  public
+  NokogiriBlockingQueueInputStream()
+  {
     queue = new LinkedBlockingQueue<Task>();
   }
 
@@ -77,7 +91,9 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
    * that the read method will block indefinitely.
    */
   @Override
-  public synchronized void close() {
+  public synchronized void
+  close()
+  {
     closed = true;
     List<Task> tasks = new LinkedList<Task>();
     queue.drainTo(tasks);
@@ -98,9 +114,12 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
    *
    * @return
    */
-  public synchronized Future<Void> addChunk(ByteArrayInputStream stream) throws ClosedStreamException {
-    if (closed)
+  public synchronized Future<Void>
+  addChunk(ByteArrayInputStream stream) throws ClosedStreamException
+  {
+    if (closed) {
       throw new ClosedStreamException("Cannot add a chunk to a closed stream");
+    }
     Task task = new Task(stream);
     queue.add(task);
     return task;
@@ -112,10 +131,13 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
    * @see java.io.InputStream#read()
    */
   @Override
-  public int read() throws IOException {
+  public int
+  read() throws IOException
+  {
     if (currentTask == null || currentStream.available() == 0)
-      if (getNextTask() == -1)
+      if (getNextTask() == -1) {
         return -1;
+      }
     return currentStream.read();
   }
 
@@ -125,7 +147,9 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
    * @see java.io.InputStream#read(byte[], int, int)
    */
   @Override
-  public int read(byte[] bytes, int off, int len) {
+  public int
+  read(byte[] bytes, int off, int len)
+  {
     if (currentTask == null || currentStream.available() == 0) {
       if (getNextTask() == -1) {
         currentTask.set(null);
@@ -135,11 +159,14 @@ public class NokogiriBlockingQueueInputStream extends InputStream {
     return currentStream.read(bytes, off, len);
   }
 
-  protected int getNextTask() {
+  protected int
+  getNextTask()
+  {
     while (true) {
       try {
-        if (currentTask != null)
+        if (currentTask != null) {
           currentTask.set(null);
+        }
         currentTask = queue.take();
         currentStream = currentTask.getStream();
         return currentStream.available() == 0 ? -1 : currentStream.available();

data/ext/java/nokogiri/internals/NokogiriDomParser.java

@@ -1,35 +1,3 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2011:
- *
- * * {Aaron Patterson}[http://tenderlovemaking.com]
- * * {Mike Dalessio}[http://mike.daless.io]
- * * {Charles Nutter}[http://blog.headius.com]
- * * {Sergio Arbeo}[http://www.serabe.com]
- * * {Patrick Mahoney}[http://polycrystal.org]
- * * {Yoko Harada}[http://yokolet.blogspot.com]
- *
- * 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:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package nokogiri.internals;
 
 import java.io.IOException;
@@ -53,64 +21,79 @@ import org.xml.sax.SAXException;
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
-public class NokogiriDomParser extends DOMParser {
-    protected DOMParser dtd;
-    protected boolean xInclude;
-    protected XMLParserConfiguration config;
+public class NokogiriDomParser extends DOMParser
+{
+  protected DOMParser dtd;
+  protected boolean xInclude;
+  protected XMLParserConfiguration config;
 
-    public NokogiriDomParser(XMLParserConfiguration config) {
-        super(config);
-        this.config = config;
-        initialize();
-    }
+  public
+  NokogiriDomParser(XMLParserConfiguration config)
+  {
+    super(config);
+    this.config = config;
+    initialize();
+  }
+
+  public
+  NokogiriDomParser(ParserContext.Options options)
+  {
+    xInclude = options.xInclude;
+    initialize();
+  }
 
-    public NokogiriDomParser(ParserContext.Options options) {
-        xInclude = options.xInclude;
-        initialize();
+  protected void
+  initialize()
+  {
+    if (config == null) {
+      if (xInclude) {
+        config = new XIncludeParserConfiguration();
+      } else {
+        config = getXMLParserConfiguration();
+      }
     }
 
-    protected void initialize() {
-        if (config == null) {
-            if (xInclude) {
-                config = new XIncludeParserConfiguration();
-            } else {
-                config = getXMLParserConfiguration();
-            }
-        }
+    DTDConfiguration dtdConfig = new DTDConfiguration();
+    dtd = new DOMParser(dtdConfig);
 
-        DTDConfiguration dtdConfig = new DTDConfiguration();
-        dtd = new DOMParser(dtdConfig);
+    config.setDTDHandler(dtdConfig);
+    config.setDTDContentModelHandler(dtdConfig);
+  }
 
-        config.setDTDHandler(dtdConfig);
-        config.setDTDContentModelHandler(dtdConfig);
+  @Override
+  public void
+  parse(InputSource source) throws SAXException, IOException
+  {
+    dtd.reset();
+    if (xInclude) {
+      setEntityResolver(new NokogiriXInlcudeEntityResolver(source));
+    }
+    super.parse(source);
+    Document doc = getDocument();
+    if (doc == null) {
+      throw new RuntimeException("null document");
     }
 
-    @Override
-    public void parse(InputSource source) throws SAXException, IOException {
-        dtd.reset();
-        if (xInclude) {
-            setEntityResolver(new NokogiriXInlcudeEntityResolver(source));
-        }
-        super.parse(source);
-        Document doc = getDocument();
-        if (doc == null)
-            throw new RuntimeException("null document");
+    doc.setUserData(XmlDocument.DTD_RAW_DOCUMENT, dtd.getDocument(), null);
+  }
 
-        doc.setUserData(XmlDocument.DTD_RAW_DOCUMENT, dtd.getDocument(), null);
+  private static class NokogiriXInlcudeEntityResolver implements org.xml.sax.EntityResolver
+  {
+    InputSource source;
+    private
+    NokogiriXInlcudeEntityResolver(InputSource source)
+    {
+      this.source = source;
     }
 
-    private static class NokogiriXInlcudeEntityResolver implements org.xml.sax.EntityResolver {
-        InputSource source;
-        private NokogiriXInlcudeEntityResolver(InputSource source) {
-            this.source = source;
-        }
-
-        @Override
-        public InputSource resolveEntity(String publicId, String systemId)
-                throws SAXException, IOException {
-            if (systemId != null) source.setSystemId(systemId);
-            if (publicId != null) source.setPublicId(publicId);
-            return source;
-        }
+    @Override
+    public InputSource
+    resolveEntity(String publicId, String systemId)
+    throws SAXException, IOException
+    {
+      if (systemId != null) { source.setSystemId(systemId); }
+      if (publicId != null) { source.setPublicId(publicId); }
+      return source;
     }
+  }
 }

data/ext/java/nokogiri/internals/NokogiriEntityResolver.java

@@ -18,104 +18,123 @@ import org.xml.sax.ext.EntityResolver2;
  * entity resolution that uses relative paths must be translated
  * to be relative to the current directory of the Ruby runtime.
  */
-public class NokogiriEntityResolver implements EntityResolver2 {
-    protected final Ruby runtime;
-    private final NokogiriErrorHandler handler;
-    private final Options options;
+public class NokogiriEntityResolver implements EntityResolver2
+{
+  protected final Ruby runtime;
+  private final NokogiriErrorHandler handler;
+  private final Options options;
 
-    public NokogiriEntityResolver(Ruby runtime, NokogiriErrorHandler handler, Options options) {
-        super();
-        this.runtime = runtime;
-        this.handler = handler;
-        this.options = options;
-    }
+  public
+  NokogiriEntityResolver(Ruby runtime, NokogiriErrorHandler handler, Options options)
+  {
+    super();
+    this.runtime = runtime;
+    this.handler = handler;
+    this.options = options;
+  }
 
-    @Override
-    public InputSource getExternalSubset(String name, String baseURI)
-        throws SAXException, IOException {
-        return null;
-    }
+  @Override
+  public InputSource
+  getExternalSubset(String name, String baseURI)
+  throws SAXException, IOException
+  {
+    return null;
+  }
 
-    @Override
-    public InputSource resolveEntity(String publicId, String systemId)
-        throws SAXException, IOException {
-        return resolveEntity(runtime, null, publicId, null, systemId);
-    }
+  @Override
+  public InputSource
+  resolveEntity(String publicId, String systemId)
+  throws SAXException, IOException
+  {
+    return resolveEntity(runtime, null, publicId, null, systemId);
+  }
 
-    @Override
-    public InputSource resolveEntity(String name,
-                                     String publicId,
-                                     String baseURI,
-                                     String systemId)
-        throws SAXException, IOException {
-        return resolveEntity(runtime, name, publicId, baseURI, systemId);
-    }
+  @Override
+  public InputSource
+  resolveEntity(String name,
+                String publicId,
+                String baseURI,
+                String systemId)
+  throws SAXException, IOException
+  {
+    return resolveEntity(runtime, name, publicId, baseURI, systemId);
+  }
 
-    private static File join(String parent, String child) {
-        if (new File(parent).isFile()) {
-            parent = new File(parent).getParent();
-        }
-        return new File(parent, child);
+  private static File
+  join(String parent, String child)
+  {
+    if (new File(parent).isFile()) {
+      parent = new File(parent).getParent();
     }
+    return new File(parent, child);
+  }
 
-    private static InputSource emptyInputSource(InputSource source) {
-        source.setByteStream(new ByteArrayInputStream(new byte[0]));
-        return source;
-    }
+  private static InputSource
+  emptyInputSource(InputSource source)
+  {
+    source.setByteStream(new ByteArrayInputStream(new byte[0]));
+    return source;
+  }
 
-    private boolean shouldLoadDtd() {
-      return options.dtdLoad || options.dtdValid;
-    }
+  private boolean
+  shouldLoadDtd()
+  {
+    return options.dtdLoad || options.dtdValid;
+  }
 
-    private void addError(String errorMessage) {
-        if (handler != null) handler.errors.add(new Exception(errorMessage));
-    }
+  private void
+  addError(String errorMessage)
+  {
+    if (handler != null) { handler.errors.add(new Exception(errorMessage)); }
+  }
 
-    /**
-     * Create a file base input source taking into account the current
-     * directory of <code>runtime</code>.
-     * @throws SAXException
-     */
-    protected InputSource resolveEntity(Ruby runtime, String name, String publicId, String baseURI, String systemId)
-        throws IOException, SAXException {
-        InputSource s = new InputSource();
-        if (name.equals("[dtd]") && !shouldLoadDtd()) {
-          return emptyInputSource(s);
-        } else if (!name.equals("[dtd]") && !options.noEnt) {
-          return emptyInputSource(s);
-        }
-        String adjustedSystemId;
-        URI uri = URI.create(systemId);
-        if (options.noNet && uri.getHost() != null) {
-          addError("Attempt to load network entity " + systemId);
-          return emptyInputSource(s);
-        }
-        // if this is a url or absolute file name then use it
-        if (uri.isAbsolute() && !uri.isOpaque()) {
-          adjustedSystemId = uri.toURL().toString();
-        } else if (new File(uri.getPath()).isAbsolute()) {
-          adjustedSystemId = uri.getPath();
-        } else if (baseURI != null) {
-          URI baseuri = URI.create(baseURI);
-          if (options.noNet && baseuri.getHost() != null) {
-            addError("Attempt to load network entity " + systemId);
-            return emptyInputSource(s);
-          }
-          if (baseuri.getHost() == null) {
-            // this is a local file
-            adjustedSystemId = join(baseuri.getPath(), uri.getPath()).getCanonicalPath();
-          } else {
-            // this is a url, then resolve uri using baseuri
-            adjustedSystemId = baseuri.resolve(systemId).toURL().toString();
-          }
-        } else {
-          // baseURI is null we have to use the current working directory to resolve the entity
-          String pwd = runtime.getCurrentDirectory();
-          adjustedSystemId = join(pwd, uri.getPath()).getCanonicalPath();
-        }
-        s.setSystemId(adjustedSystemId);
-        s.setPublicId(publicId);
-        return s;
+  /**
+   * Create a file base input source taking into account the current
+   * directory of <code>runtime</code>.
+   * @throws SAXException
+   */
+  protected InputSource
+  resolveEntity(Ruby runtime, String name, String publicId, String baseURI, String systemId)
+  throws IOException, SAXException
+  {
+    InputSource s = new InputSource();
+    if (name.equals("[dtd]") && !shouldLoadDtd()) {
+      return emptyInputSource(s);
+    } else if (!name.equals("[dtd]") && !options.noEnt) {
+      return emptyInputSource(s);
+    }
+    String adjustedSystemId;
+    URI uri = URI.create(systemId);
+    if (options.noNet && uri.getHost() != null) {
+      addError("Attempt to load network entity " + systemId);
+      return emptyInputSource(s);
+    }
+    // if this is a url or absolute file name then use it
+    if (uri.isAbsolute() && !uri.isOpaque()) {
+      adjustedSystemId = uri.toURL().toString();
+    } else if (new File(uri.getPath()).isAbsolute()) {
+      adjustedSystemId = uri.getPath();
+    } else if (baseURI != null) {
+      URI baseuri = URI.create(baseURI);
+      if (options.noNet && baseuri.getHost() != null) {
+        addError("Attempt to load network entity " + systemId);
+        return emptyInputSource(s);
+      }
+      if (baseuri.getHost() == null) {
+        // this is a local file
+        adjustedSystemId = join(baseuri.getPath(), uri.getPath()).getCanonicalPath();
+      } else {
+        // this is a url, then resolve uri using baseuri
+        adjustedSystemId = baseuri.resolve(systemId).toURL().toString();
+      }
+    } else {
+      // baseURI is null we have to use the current working directory to resolve the entity
+      String pwd = runtime.getCurrentDirectory();
+      adjustedSystemId = join(pwd, uri.getPath()).getCanonicalPath();
     }
+    s.setSystemId(adjustedSystemId);
+    s.setPublicId(publicId);
+    return s;
+  }
 
 }