Merge pull request #126 from copilot-community-sdk/copilot/fix-quota-snapshots-null-value

brunoborges · web-flow · commit 8dcd06023569 · 2026-02-11T00:40:41.000-05:00
Return empty map instead of null from AssistantUsageData.quotaSnapshots()
diff --git a/src/main/java/com/github/copilot/sdk/events/AssistantUsageEvent.java b/src/main/java/com/github/copilot/sdk/events/AssistantUsageEvent.java
@@ -47,7 +47,7 @@ public record AssistantUsageData(@JsonProperty("model") String model,
         /** Returns a defensive copy of the quota snapshots map. */
         @Override
         public Map<String, Object> quotaSnapshots() {
-            return quotaSnapshots == null ? null : Collections.unmodifiableMap(quotaSnapshots);
+            return quotaSnapshots == null ? Collections.emptyMap() : Collections.unmodifiableMap(quotaSnapshots);
         }
     }
 }
diff --git a/src/test/java/com/github/copilot/sdk/SessionEventParserTest.java b/src/test/java/com/github/copilot/sdk/SessionEventParserTest.java
@@ -1381,6 +1381,30 @@ void testAssistantUsageEventAllFields() throws Exception {
         assertEquals(2, data.quotaSnapshots().size());
     }
 
+    @Test
+    void testAssistantUsageEventWithNullQuotaSnapshots() throws Exception {
+        String json = """
+                {
+                    "type": "assistant.usage",
+                    "data": {
+                        "model": "gpt-4-turbo",
+                        "inputTokens": 500,
+                        "outputTokens": 200
+                    }
+                }
+                """;
+
+        var event = (AssistantUsageEvent) parseJson(json);
+        assertNotNull(event);
+        var data = event.getData();
+        assertEquals("gpt-4-turbo", data.model());
+        assertEquals(500.0, data.inputTokens());
+        assertEquals(200.0, data.outputTokens());
+        // quotaSnapshots should return an empty map, not null
+        assertNotNull(data.quotaSnapshots());
+        assertTrue(data.quotaSnapshots().isEmpty());
+    }
+
     @Test
     void testAssistantReasoningDeltaEventAllFields() throws Exception {
         String json = """

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public record AssistantUsageData(@JsonProperty("model") String model,`
`47`	`47`	`/** Returns a defensive copy of the quota snapshots map. */`
`48`	`48`	`@Override`
`49`	`49`	`public Map<String, Object> quotaSnapshots() {`
`50`		`- return quotaSnapshots == null ? null : Collections.unmodifiableMap(quotaSnapshots);`
	`50`	`+ return quotaSnapshots == null ? Collections.emptyMap() : Collections.unmodifiableMap(quotaSnapshots);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`