From fff767011cc102ffb88fa075868f23c0025795c6 Mon Sep 17 00:00:00 2001
From: Paolo Bazzi <paolo.bazzi@bsi-software.com>
Date: Thu, 12 Dec 2024 17:37:10 +0100
Subject: [PATCH] WIP DO Deserializer using Integer -> Long

---
 .../dataobject/JsonDataObjectsSerializationTest.java       | 7 +++++++
 .../scout/rt/jackson/dataobject/DoEntityDeserializer.java  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java b/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java
index b36627ad792..edcfb8f89fc 100644
--- a/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java
+++ b/org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java
@@ -4193,4 +4193,11 @@ protected void serializeContribution(IDoEntity doEntity, Class<? extends IDoEnti
     doEntity.contribution(contributionClass);
     s_dataObjectMapper.writeValueAsString(doEntity);
   }
+
+  @Test
+  public void test80CloneNumbers() {
+    IDoEntity doEntity = BEANS.get(DoEntityBuilder.class).put("n", BigDecimal.valueOf(1000L)).build();
+    IDoEntity clonedDoEntity = BEANS.get(DataObjectHelper.class).clone(doEntity);  // transforms BigDecimal to Integer...
+    assertEquals(doEntity, clonedDoEntity); // fails
+  }
 }
diff --git a/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DoEntityDeserializer.java b/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DoEntityDeserializer.java
index 5052fd66d3e..9655635dd13 100644
--- a/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DoEntityDeserializer.java
+++ b/org.eclipse.scout.rt.jackson/src/main/java/org/eclipse/scout/rt/jackson/dataobject/DoEntityDeserializer.java
@@ -274,6 +274,10 @@ protected AttributeType findResolvedFallbackAttributeType(IDoEntity entityInstan
       // deserialize floating point numbers as BigDecimal
       return AttributeType.ofDoValue(TypeFactory.defaultInstance().constructType(BigDecimal.class));
     }
+    if (currentToken == JsonToken.VALUE_NUMBER_INT) {
+      // deserialize floating point numbers as BigDecimal
+      return AttributeType.ofDoValue(TypeFactory.defaultInstance().constructType(Long.class));
+    }
     // JSON scalar values are deserialized as raw object using default jackson typing
     return AttributeType.ofDoValue(TypeFactory.unknownType());
   }