GH-3404: Restore lexical forms of TDB2 NodeId-decimals as plain strings.

Author: Aklakan

jena-arq/src/main/java/org/apache/jena/sparql/util/XSDNumUtils.java

@@ -147,6 +147,18 @@ public static String canonicalDecimalStrNoIntegerDot(BigDecimal bd) {
         return bd.stripTrailingZeros().toPlainString();
     }
 
+    /** Return a canonical decimal with a trailing ".0". */
+    public static BigDecimal canonicalDecimalWithDot(BigDecimal decimal) {
+        BigDecimal result = decimal;
+        if (result.scale() > 1) {
+            result = decimal.stripTrailingZeros();
+        }
+        if (result.scale() <= 0) {
+            result = result.setScale(1);
+        }
+        return result;
+    }
+
     /**
      * Integer-valued decimals have a trailing ".0".
      * (In XML Schema Datatype 1.1 they did not have a ".0".)

jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java

@@ -163,6 +163,7 @@ public static boolean hasInlineDatatype(Node node) {
             // But at this point we know it's a valid literal so the excessive
             // chopping by .trim is safe.
             BigDecimal decimal = new BigDecimal(lit.getLexicalForm().trim());
+            decimal = XSDNumUtils.canonicalDecimalWithDot(decimal);
 
             // Does range checking.
             DecimalNode56 dn = DecimalNode56.valueOf(decimal);

jena-tdb2/src/test/java/org/apache/jena/tdb2/store/value/TestNodeIdInline.java

@@ -120,6 +120,29 @@ public class TestNodeIdInline
     @Test public void nodeId_decimal_8()
     { test("0.00000001", NodeFactory.createLiteralDT("0.00000001", XSDDatatype.XSDdecimal)); }
 
+    @Test public void nodeId_decimal_9()
+    { test("'18'^^xsd:decimal",
+           NodeFactory.createLiteralDT("18.0", XSDDatatype.XSDdecimal));
+    }
+
+    @Test public void nodeId_decimal_10()
+    { test("'18.'^^xsd:decimal", NodeFactory.createLiteralDT("18.0", XSDDatatype.XSDdecimal)); }
+
+    @Test public void nodeId_decimal_11()
+    { test("18.0", NodeFactory.createLiteralDT("18.0", XSDDatatype.XSDdecimal)); }
+
+    @Test public void nodeId_decimal_20()
+    { testNodeIdRoundtrip(NodeValue.makeDecimal("18").asNode()); }
+
+    @Test public void nodeId_decimal_21()
+    { testNodeIdRoundtrip(NodeValue.makeDecimal("18.0").asNode()); }
+
+    @Test public void nodeId_decimal_22()
+    { testNodeIdRoundtrip(NodeValue.makeDecimal("18.00").asNode()); }
+
+    @Test public void nodeId_decimal_23()
+    { testNodeIdRoundtrip(NodeValue.makeDecimal("18.000").asNode()); }
+
     @Test public void nodeId_dateTime_01()
     { test("'2008-04-28T15:36:15+01:00'^^xsd:dateTime"); }
 
@@ -306,4 +329,17 @@ private void test(String x, Node correct) {
         // Term equality.
         assertEquals(correct, n2, ()->"Not same term");
     }
+
+    /** For a Node n assert: nodeId(n) == nodeId(extract(nodeId(n)) */
+    private static void testNodeIdRoundtrip(Node node) {
+        NodeId nodeId = NodeId.inline(node);
+        testNodeIdRoundtrip(nodeId);
+    }
+
+    /** For a NodeId n assert: n == nodeId(extract(n)) */
+    private static void testNodeIdRoundtrip(NodeId expected) {
+        Node extractedNode = NodeId.extract(expected);
+        NodeId actual = NodeId.inline(extractedNode);
+        assertEquals(expected, actual);
+    }
 }