* Update id logic returned from the engine (#441)

Author: ag-ramachandran

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.0.3] - 2025-09-16
+
+### Fixed
+- Added type safe conversion of Id to UUID where response from TableEntity is a string on IngestionStatus.
+
 ## [7.0.2] - 2025-07-24
 
 ### Fixed

ingest/src/main/java/com/microsoft/azure/kusto/ingest/result/IngestionStatus.java

@@ -4,13 +4,22 @@
 package com.microsoft.azure.kusto.ingest.result;
 
 import com.azure.data.tables.models.TableEntity;
+import com.microsoft.azure.kusto.data.StringUtils;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.util.annotation.Nullable;
+
+import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
+import java.net.URISyntaxException;
+
 /// <summary>
 /// This class represents an ingestion status.
 /// </summary>
@@ -23,6 +32,7 @@ public class IngestionStatus {
     /// during the ingestion's process
     /// and will be updated as soon as the ingestion completes.
     /// </summary>
+    private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     public OperationStatus status;
     private Map<String, Object> ingestionInfo = new HashMap<>();
 
@@ -210,16 +220,30 @@ public Map<String, Object> getEntityProperties() {
         return ingestionInfo;
     }
 
+    static UUID fromId(Object id) {
+        if (id instanceof String && StringUtils.isNotBlank((String) id)) {
+            try {
+                return UUID.fromString((String) id);
+            } catch (IllegalArgumentException e) {
+                log.warn("Failed to parse id [{}] to UUID,set to id set to null", id);
+                return null;
+            }
+        } else if (id instanceof UUID) {
+            return (UUID) id;
+        }
+        return null;
+    }
+
     public static IngestionStatus fromEntity(TableEntity tableEntity) {
         IngestionStatus ingestionStatus = new IngestionStatus();
         Object ingestionSourceId = tableEntity.getProperty("IngestionSourceId");
-        ingestionStatus.setIngestionSourceId(ingestionSourceId == null ? null : (UUID) ingestionSourceId);
+        ingestionStatus.setIngestionSourceId(fromId(ingestionSourceId));
 
         ingestionStatus.setDatabase((String) tableEntity.getProperty("Database"));
         ingestionStatus.setTable((String) tableEntity.getProperty("Table"));
 
         Object operationId = tableEntity.getProperty("OperationId");
-        ingestionStatus.setOperationId(ingestionSourceId == null ? null : (UUID) operationId);
+        ingestionStatus.setOperationId(operationId == null ? null : fromId(operationId));
 
         Object status = tableEntity.getProperty("Status");
         if (status instanceof String) {
@@ -229,7 +253,7 @@ public static IngestionStatus fromEntity(TableEntity tableEntity) {
         }
 
         Object activityId = tableEntity.getProperty("ActivityId");
-        ingestionStatus.setActivityId(ingestionSourceId == null ? null : (UUID) activityId);
+        ingestionStatus.setActivityId(ingestionSourceId == null ? null : fromId(activityId));
 
         ingestionStatus.setFailureStatus((String) tableEntity.getProperty("FailureStatus"));
 

ingest/src/test/java/com/microsoft/azure/kusto/ingest/result/IngestionStatusTest.java

@@ -0,0 +1,30 @@
+package com.microsoft.azure.kusto.ingest.result;
+
+import com.azure.data.tables.models.TableEntity;
+import java.util.UUID;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class IngestionStatusTest {
+    static Stream<Object[]> fromIdTestCases() {
+        UUID uuid = UUID.randomUUID();
+        return Stream.of(
+                //happy path
+                new Object[]{uuid.toString(), uuid},
+                new Object[]{uuid, uuid},
+                //edge cases
+                new Object[]{"", null},
+                new Object[]{null, null},
+                new Object[]{"not-a-uuid", null}
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("fromIdTestCases")
+    void testFromId(Object input, UUID expected) {
+        UUID result = IngestionStatus.fromId(input);
+        Assertions.assertEquals(expected, result);
+    }
+}

pom.xml

@@ -32,7 +32,7 @@
     </developers>
 
     <properties>
-        <revision>7.0.2</revision> <!-- CHANGE THIS to adjust project version-->
+        <revision>7.0.3</revision> <!-- CHANGE THIS to adjust project version-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <azure-bom-version>1.2.28</azure-bom-version>