SO-5510: Fix decimal concrete value conversion (8.x)

commons/com.b2international.index.tests/.launch/index-http-unit-tests (es8).launch

@@ -122,6 +122,7 @@
         <setEntry value="com.b2international.index.tests@default:false"/>
         <setEntry value="com.b2international.index@default:default"/>
         <setEntry value="com.b2international.snowowl.logback.config@default:false"/>
+        <setEntry value="com.b2international.snowowl.test.dependencies@default:default"/>
     </setAttribute>
     <booleanAttribute key="show_selected_only" value="false"/>
     <booleanAttribute key="tracing" value="false"/>

commons/com.b2international.index.tests/.launch/index-http-unit-tests.launch

@@ -122,6 +122,7 @@
         <setEntry value="com.b2international.index.tests@default:false"/>
         <setEntry value="com.b2international.index@default:default"/>
         <setEntry value="com.b2international.snowowl.logback.config@default:false"/>
+        <setEntry value="com.b2international.snowowl.test.dependencies@default:default"/>        
     </setAttribute>
     <booleanAttribute key="show_selected_only" value="false"/>
     <booleanAttribute key="tracing" value="false"/>

commons/com.b2international.index.tests/.launch/index-tcp-unit-tests.launch

@@ -121,6 +121,7 @@
         <setEntry value="com.b2international.index.tests@default:false"/>
         <setEntry value="com.b2international.index@default:default"/>
         <setEntry value="com.b2international.snowowl.logback.config@default:false"/>
+        <setEntry value="com.b2international.snowowl.test.dependencies@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
     </setAttribute>
     <booleanAttribute key="show_selected_only" value="false"/>

commons/com.b2international.index.tests/src/com/b2international/index/DecimalFieldTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2011-2022 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ public class DecimalFieldTest extends BaseIndexTest {
 	private static final BigDecimal VALUE_05 = new BigDecimal("0.5");
 	private static final BigDecimal VALUE_10 = new BigDecimal("1.0");
 	private static final BigDecimal VALUE_20 = new BigDecimal("2.0");
+	private static final BigDecimal VALUE_TEN = new BigDecimal("10.000");
 	private static final String KEY3 = "key3";
 	private static final String KEY4 = "key4";
 
@@ -170,6 +171,25 @@ public void indexReallySmallPositiveDecimal() throws Exception {
 			.containsOnly(new DataWithDecimal(KEY1, REALLY_SMALL));
 	}
 
+	@Test
+	public void indexRemovesTrailingZeros() throws Exception {
+		final DataWithDecimal expected = new DataWithDecimal(KEY1, VALUE_TEN);
+		indexDocument(expected);
+		final DataWithDecimal actual = getDocument(DataWithDecimal.class, KEY1);
+
+		// The sortable compact BigDecimal representation we use from Solr removes excess zeros
+		assertEquals(expected.getValue().stripTrailingZeros(), actual.getValue());
+
+		// The change in precision and scale in the two representations changes the output of "toString()" as well
+		assertEquals("10.000", expected.getValue().toString());
+		assertEquals(5, expected.getValue().precision()); // "10000 x 10^-3"
+		assertEquals(3, expected.getValue().scale());
+
+		assertEquals("1E+1", actual.getValue().toString());
+		assertEquals(1, actual.getValue().precision()); // "1 x 10^1"
+		assertEquals(-1, actual.getValue().scale());
+	}
+
 	@Doc
 	static class DataWithDecimal {
 

snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/classification/SnomedClassificationApiTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2011-2022 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -188,6 +188,11 @@ public void persistDataHasValueAxiom_Decimal() throws Exception {
 		persistDataHasValueAxiom("\"3.6\"^^xsd:decimal", new RelationshipValue(new BigDecimal("3.6")));
 	}
 
+	@Test
+	public void persistDataHasValueAxiom_DecimalWithTrailingZeros() throws Exception {
+		persistDataHasValueAxiom("\"100.00\"^^xsd:decimal", new RelationshipValue(new BigDecimal("100")));
+	}
+
 	@Test
 	public void persistDataHasValueAxiom_String() throws Exception {
 		persistDataHasValueAxiom("\"Hello world\"^^xsd:string", new RelationshipValue("Hello world"));

snomed/com.b2international.snowowl.snomed.datastore/src/com/b2international/snowowl/snomed/datastore/request/SnomedOWLRelationshipConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2019-2022 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ public String fromSnomedOwlRelationships(
 	private ConcreteValue toConcreteValue(final RelationshipValue value) {
 		return value.map(
 			i -> new ConcreteValue(ConcreteValue.Type.INTEGER, i.toString()), 
-			d -> new ConcreteValue(ConcreteValue.Type.DECIMAL, d.toString()), 
+			d -> new ConcreteValue(ConcreteValue.Type.DECIMAL, d.stripTrailingZeros().toPlainString()), 
 			s -> new ConcreteValue(ConcreteValue.Type.STRING, s));
 	}