Merge pull request #4418 from evolvedbinary/hotfix/xmldb-declare-variable

Allow BigDecimal and BigInteger values to be declared via XML:DB API

Author: reinhapa

exist-core/src/main/java/org/exist/xquery/XPathUtil.java

@@ -21,6 +21,8 @@
  */
 package org.exist.xquery;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.net.URISyntaxException;
 import java.util.List;
 
@@ -89,6 +91,10 @@ public final static Sequence javaObjectToXPath(Object obj, XQueryContext context
             return new IntegerValue(((Integer) obj), Type.INT);
         } else if (obj instanceof Long) {
             return new IntegerValue(((Long) obj), Type.LONG);
+        } else if (obj instanceof BigInteger) {
+             return new IntegerValue((BigInteger) obj);
+        } else if (obj instanceof BigDecimal) {
+            return new DecimalValue((BigDecimal) obj);
         } else if (obj instanceof byte[]) {
             return BinaryValueFromInputStream.getInstance(context, new Base64BinaryValueType(), new UnsynchronizedByteArrayInputStream((byte[]) obj));
 

exist-core/src/test/java/org/exist/xmldb/DeclareVariableTest.java

@@ -0,0 +1,118 @@
+/*
+ * eXist-db Open Source Native XML Database
+ * Copyright (C) 2001 The eXist-db Authors
+ *
+ * [email protected]
+ * http://www.exist-db.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.exist.xmldb;
+
+import org.exist.TestUtils;
+import org.exist.test.ExistWebServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.xmldb.api.DatabaseManager;
+import org.xmldb.api.base.*;
+import org.xmldb.api.modules.CollectionManagementService;
+import org.xmldb.api.modules.XQueryService;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Parameterized.class)
+public class DeclareVariableTest {
+
+    private static final String TEST_COLLECTION_NAME = "xmldb-declare-variable-test";
+
+    @ClassRule
+    public static final ExistWebServer existWebServer = new ExistWebServer(true, false, true, true);
+    private static final String PORT_PLACEHOLDER = "${PORT}";
+
+    @Parameterized.Parameters(name = "{0}")
+    public static java.util.Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+                { "local", "xmldb:exist://" },
+                { "remote", "xmldb:exist://localhost:" + PORT_PLACEHOLDER + "/xmlrpc" }
+        });
+    }
+
+    @Parameterized.Parameter
+    public String apiName;
+
+    @Parameterized.Parameter(value = 1)
+    public String baseUri;
+
+    private Collection testCollection;
+
+    private final String getBaseUri() {
+        return baseUri.replace(PORT_PLACEHOLDER, Integer.toString(existWebServer.getPort()));
+    }
+
+    @Before
+    public void setUp() throws XMLDBException {
+        final Collection root = DatabaseManager.getCollection(getBaseUri() + "/db", TestUtils.ADMIN_DB_USER, TestUtils.ADMIN_DB_PWD);
+        final CollectionManagementService service = (CollectionManagementService) root.getService("CollectionManagementService", "1.0");
+        testCollection = service.createCollection(TEST_COLLECTION_NAME);
+        assertNotNull(testCollection);
+    }
+
+    @After
+    public void tearDown() throws XMLDBException {
+        final Collection root = DatabaseManager.getCollection(getBaseUri() + "/db", TestUtils.ADMIN_DB_USER, TestUtils.ADMIN_DB_PWD);
+        final CollectionManagementService service = (CollectionManagementService) root.getService("CollectionManagementService", "1.0");
+        service.removeCollection(TEST_COLLECTION_NAME);
+        testCollection = null;
+    }
+
+    @Test
+    public void declareBigInteger() throws XMLDBException {
+        final Resource result = executeQueryWithExternalVariable(new BigInteger("123456789123456789123456789"));
+        assertEquals("123456789123456789123456789", result.getContent());
+    }
+
+    @Test
+    public void declareBigDecimal() throws XMLDBException {
+        final Resource result = executeQueryWithExternalVariable(new BigDecimal("1.1"));
+        assertEquals("1.1", result.getContent());
+    }
+
+    private Resource executeQueryWithExternalVariable(final Object value) throws XMLDBException {
+        final XQueryService xqueryService = (XQueryService) testCollection.getService("XQueryService", "1.0");
+        xqueryService.declareVariable("x", value);
+
+        final String query =
+                "xquery version \"3.1\";\n" +
+                "declare variable $x external;\n" +
+                "$x";
+
+        final CompiledExpression compiled = xqueryService.compile(query);
+
+        final ResourceSet resourceSet = xqueryService.execute(compiled);
+        assertEquals(1, resourceSet.getSize());
+        final Resource resource = resourceSet.getResource(0);
+        assertNotNull(resource);
+        return resource;
+    }
+}