[MOD] update to support BaseX 9.4.5 and use thumbnailator 4.13

.classpath

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="lib" path="src/main/content/thumbnailator-0.4.8.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/BaseX924.jar"/>
+	<classpathentry kind="lib" path="lib/BaseX945.jar"/>
+	<classpathentry kind="lib" path="src/main/content/thumbnailator-0.4.13.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

dist/doc/thumbnailator.xqm.xml

@@ -1,6 +1,6 @@
 <xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0">
   <xqdoc:control>
-    <xqdoc:date>2018-06-29T19:13:26.072+01:00</xqdoc:date>
+    <xqdoc:date>2021-02-16T23:01:20.669Z</xqdoc:date>
     <xqdoc:version>1.1</xqdoc:version>
   </xqdoc:control>
   <xqdoc:module type="library">
@@ -10,18 +10,18 @@
       <xqdoc:description>Generate image thumbnails using the thumbnailator library.</xqdoc:description>
       <xqdoc:see>https://github.com/coobird/thumbnailator</xqdoc:see>
       <xqdoc:author>andy bunce</xqdoc:author>
-      <xqdoc:version>0.5</xqdoc:version>
+      <xqdoc:version>0.6</xqdoc:version>
     </xqdoc:comment>
   </xqdoc:module>
-  <xqdoc:namespaces>
-    <xqdoc:namespace prefix="thumbnails" uri="expkg-zone58:image.thumbnailator"/>
-    <xqdoc:namespace prefix="Thumbs" uri="org.expkgzone58.image.Thumbs"/>
-  </xqdoc:namespaces>
   <xqdoc:imports>
     <xqdoc:import type="library">
       <xqdoc:uri>org.expkgzone58.image.Thumbs</xqdoc:uri>
     </xqdoc:import>
   </xqdoc:imports>
+  <xqdoc:namespaces>
+    <xqdoc:namespace prefix="thumbnails" uri="expkg-zone58:image.thumbnailator"/>
+    <xqdoc:namespace prefix="Thumbs" uri="org.expkgzone58.image.Thumbs"/>
+  </xqdoc:namespaces>
   <xqdoc:variables/>
   <xqdoc:functions>
     <xqdoc:function arity="2">
@@ -31,7 +31,7 @@
         <xqdoc:return>base64Binary for thumbnail</xqdoc:return>
       </xqdoc:comment>
       <xqdoc:name>thumbnails:size</xqdoc:name>
-      <xqdoc:signature>declare function thumbnails:size($source as xs:base64Binary, $size as xs:integer) as xs:base64Binary</xqdoc:signature>
+      <xqdoc:signature>declare function thumbnails:size($source as xs:base64Binary , $size as xs:integer) as xs:base64Binary</xqdoc:signature>
       <xqdoc:parameters>
         <xqdoc:parameter>
           <xqdoc:name>source</xqdoc:name>
@@ -53,7 +53,7 @@
         <xqdoc:return>base64Binary for thumbnail</xqdoc:return>
       </xqdoc:comment>
       <xqdoc:name>thumbnails:size</xqdoc:name>
-      <xqdoc:signature>declare function thumbnails:size($source as xs:base64Binary, $width as xs:integer, $height as xs:integer) as xs:base64Binary</xqdoc:signature>
+      <xqdoc:signature>declare function thumbnails:size($source as xs:base64Binary , $width as xs:integer , $height as xs:integer) as xs:base64Binary</xqdoc:signature>
       <xqdoc:parameters>
         <xqdoc:parameter>
           <xqdoc:name>source</xqdoc:name>
@@ -79,7 +79,7 @@
         <xqdoc:return>the thumbnail</xqdoc:return>
       </xqdoc:comment>
       <xqdoc:name>thumbnails:scale</xqdoc:name>
-      <xqdoc:signature>declare function thumbnails:scale($source as xs:base64Binary, $scale as xs:double) as xs:base64Binary</xqdoc:signature>
+      <xqdoc:signature>declare function thumbnails:scale($source as xs:base64Binary , $scale as xs:double) as xs:base64Binary</xqdoc:signature>
       <xqdoc:parameters>
         <xqdoc:parameter>
           <xqdoc:name>source</xqdoc:name>
@@ -101,7 +101,7 @@
         <xqdoc:return>the thumbnail</xqdoc:return>
       </xqdoc:comment>
       <xqdoc:name>thumbnails:scale</xqdoc:name>
-      <xqdoc:signature>declare function thumbnails:scale($source as xs:base64Binary, $xscale as xs:double, $yscale as xs:double) as xs:base64Binary</xqdoc:signature>
+      <xqdoc:signature>declare function thumbnails:scale($source as xs:base64Binary , $xscale as xs:double , $yscale as xs:double) as xs:base64Binary</xqdoc:signature>
       <xqdoc:parameters>
         <xqdoc:parameter>
           <xqdoc:name>source</xqdoc:name>
@@ -128,7 +128,7 @@
         <xqdoc:return>the thumbnail</xqdoc:return>
       </xqdoc:comment>
       <xqdoc:name>thumbnails:task</xqdoc:name>
-      <xqdoc:signature>declare function thumbnails:task($source as xs:base64Binary, $task as element(thumbnail)) as xs:base64Binary</xqdoc:signature>
+      <xqdoc:signature>declare function thumbnails:task($source as xs:base64Binary , $task as element(thumbnail)) as xs:base64Binary</xqdoc:signature>
       <xqdoc:parameters>
         <xqdoc:parameter>
           <xqdoc:name>source</xqdoc:name>

makejar.jardesc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
 <jardesc>
-    <jar path="ex-thumbnailator/src/main/content/thumbhelper-7.0.0.jar"/>
+    <jar path="ex-thumbnailator/src/main/content/thumbhelper-8.0.0.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/ex-thumbnailator/makejar.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

package.xml

@@ -64,5 +64,8 @@
   <version num="7.0.1">
       <!-- generated: {fn:current-dateTime()} -->
     </version>
+  <version num="8.0.1">
+      <!-- generated: {fn:current-dateTime()} -->
+    </version>
   </pkg>
 </repo>

readme.md

@@ -1,13 +1,13 @@
 # expkg-zone58:image.thumbnailator
 
 An XQuery interface to the image thumbnail generator library
-[thumbnailator](https://github.com/coobird/thumbnailator) for BaseX 9+.
+[thumbnailator](https://github.com/coobird/thumbnailator) for BaseX 9.4.5+.
 
 Features size, scale, caption, rotate, flip, colorize, watermark. More details at [doc](doc/readme.md)
 
 ## Versions
-* For Basex 9+ use thumbnailator 7.0.0+
+* thumbnailator 8 requires Basex 9.4.5+
-
+* uses thumbnailator 4.13
 ## Usage
 
 Images are input and output as `xs:base64Binary` items. Inputs typically come from `fetch:binary`

src/java/org/expkgzone58/image/Thumbs.java

@@ -9,7 +9,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.imageio.ImageIO;
@@ -85,10 +84,8 @@ public class Thumbs extends QueryModule{
     // build parameters from XML
     ThumbnailParameter fromNode(final ANode node) throws QueryException, IOException {
         ThumbnailParameterBuilder builder = new ThumbnailParameterBuilder();
+        for(final ANode element : node.childIter()) {
  
-        Iterator<ANode> itr = node.children().iterator();
-        while (itr.hasNext()) {
-            ANode element = itr.next();
             if (element.kind() == Data.ELEM) {
                 String name = Token.string(element.name());
                // FnTrace.trace(name.getBytes(), "element: ".getBytes(), queryContext);
@@ -169,9 +166,7 @@ public class Thumbs extends QueryModule{
 
     List<ImageFilter> filters(final ANode filters) throws QueryException, IOException {
         Pipeline pipeline = new Pipeline();
-        Iterator<ANode> itr = filters.children().iterator();
+        for(final ANode node : filters.childIter()) {
-        while (itr.hasNext()) {
-            ANode node = itr.next();
             if (node.kind() == Data.ELEM) {
                 switch (Token.string(node.name())) {
 

src/main/basex.xml

@@ -1,5 +1,5 @@
 <package xmlns="http://www.basex.org/modules/pkg">
-  <jar>thumbhelper-7.0.0.jar</jar>
+  <jar>thumbhelper-8.0.0.jar</jar>
-   <jar>thumbnailator-0.4.8.jar</jar>
+   <jar>thumbnailator-0.4.13.jar</jar>
    <class>org.expkgzone58.image.Thumbs</class>
 </package>

src/main/content/thumbnailator.xqm

@@ -2,10 +2,11 @@ xquery version "3.1" encoding "UTF-8";
 (:~ Generate image thumbnails using the thumbnailator library. 
  : @see https://github.com/coobird/thumbnailator
  : @author andy bunce
- : @version 0.5 
+ : @version 0.6 
  :)
 module namespace thumbnails = 'expkg-zone58:image.thumbnailator';
 import module namespace Thumbs = "org.expkgzone58.image.Thumbs";
+
 (:~
  : generate scaled version of source image with maximum dimension of size
  : @param $source base64Binary (streamed?) e.g from `fetch:binary`

src/main/expath-pkg.xml

@@ -1,5 +1,5 @@
 <package xmlns="http://expath.org/ns/pkg" name="https://github.com/expkg-zone58/ex-thumbnailator"
-	abbrev="thumbnailator" version="7.0.1" spec="1.0">
+	abbrev="thumbnailator" version="8.0.1" spec="1.0">
 
 	<title>An XQuery interface to thumbnailator the thumbnail generator library.</title>