[refactor] Add try-with-resources statement to the collation-key function, and add BinaryValue.hashCode() method.

Author: chris-evolvedbinary

exist-core/src/main/java/org/exist/xquery/functions/fn/FunCollationKey.java

@@ -29,14 +29,15 @@
 
 import com.ibm.icu.text.Collator;
 
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import static org.exist.xquery.FunctionDSL.*;
 import static org.exist.xquery.functions.fn.FnModule.functionSignatures;
 
 public class FunCollationKey extends BasicFunction {
 
-    private static final String FN_NAME = "collation-key"; // , Function.BUILTIN_FUNCTION_NS, FnModule.PREFIX);
+    private static final String FN_NAME = "collation-key";
     private static final String FN_DESCRIPTION =
             "Given a $value-string value and a $collation-string " +
                     "collation, generates an internal value called a collation key, with the " +
@@ -63,8 +64,17 @@ public FunCollationKey(final XQueryContext context, final FunctionSignature sign
     public Sequence eval(final Sequence[] args, final Sequence contextSequence) throws XPathException {
         final String source = (args.length >= 1) ? args[0].itemAt(0).toString() : "";
         final Collator collator = (args.length >= 2) ? Collations.getCollationFromURI(args[1].itemAt(0).toString()) : null;
-
-        return new BinaryValueFromBinaryString(new Base64BinaryValueType(), Base64.encodeBase64String(
-                (collator == null) ? source.getBytes(StandardCharsets.UTF_8) : new String(collator.getCollationKey(source).toByteArray()).getBytes(StandardCharsets.UTF_8))).convertTo(new Base64BinaryValueType());
+        final Sequence sequence;
+        try (BinaryValueFromBinaryString binaryValue = new BinaryValueFromBinaryString(
+                new Base64BinaryValueType(),
+                Base64.encodeBase64String(
+                        (collator == null) ?
+                                source.getBytes(StandardCharsets.UTF_8) :
+                                new String(collator.getCollationKey(source).toByteArray()).getBytes(StandardCharsets.UTF_8)))) {
+            sequence = binaryValue.convertTo(new Base64BinaryValueType());
+        } catch (IOException e) {
+            throw new XPathException(e);
+        }
+        return sequence;
     }
 }

exist-core/src/main/java/org/exist/xquery/value/BinaryValue.java

@@ -31,7 +31,6 @@
 import org.exist.xquery.XPathException;
 
 import java.io.*;
-import java.util.Objects;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -292,4 +291,25 @@ public boolean equals(Object o) {
         BinaryValue that = (BinaryValue) o;
         return compareTo(that) == 0;
     }
+
+    @Override
+    public int hashCode() {
+        final InputStream is = getInputStream();
+        int hash = 7;
+
+        if (is != null) {
+            int read;
+            do {
+                try {
+                    read = is.read();
+                    if (read != -1) {
+                        hash = 31 * hash + read;
+                    }
+                } catch (final IOException ioe) {
+                    read = -1;
+                }
+            } while (read != -1);
+        }
+        return hash;
+    }
 }