Removed redundant code.

Author: ethanyhou

com.microsoft.copilot.eclipse.core.test/src/com/microsoft/copilot/eclipse/core/lsp/CopilotLanguageClientTests.java

@@ -10,14 +10,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.e4.core.services.events.IEventBroker;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -30,12 +28,10 @@
 import com.microsoft.copilot.eclipse.core.FeatureFlags;
 import com.microsoft.copilot.eclipse.core.chat.service.IChatServiceManager;
 import com.microsoft.copilot.eclipse.core.chat.service.IReferencedFileService;
-import com.microsoft.copilot.eclipse.core.events.CopilotEventConstants;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationCapabilities;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationContextParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CurrentEditorContext;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.DidChangeFeatureFlagsParams;
-import com.microsoft.copilot.eclipse.core.lsp.protocol.quota.QuotaWarningNotification;
 import com.microsoft.copilot.eclipse.core.utils.FileUtils;
 
 @ExtendWith(MockitoExtension.class)
@@ -52,9 +48,6 @@ class CopilotLanguageClientTests {
   @Mock
   private IReferencedFileService fileService;
 
-  @Mock
-  private IEventBroker eventBroker;
-
   @BeforeEach
   void setUp() {
     client = new CopilotLanguageClient();
@@ -138,25 +131,4 @@ void testOnDidChangeFeatureFlagsWithEmptyFeatureFlags() {
       verify(mockFeatureFlags).setByokEnabled(true);
     }
   }
-
-  @Test
-  void testOnQuotaWarning_PostsNotificationToEventBroker() {
-    QuotaWarningNotification notification = new QuotaWarningNotification(
-        "Copilot Quota Usage Alert", "Approaching quota", "warning", null, null);
-    setEventBroker(eventBroker);
-
-    client.onQuotaWarning(notification);
-
-    verify(eventBroker).post(CopilotEventConstants.TOPIC_QUOTA_WARNING, notification);
-  }
-
-  private void setEventBroker(IEventBroker broker) {
-    try {
-      Field field = CopilotLanguageClient.class.getDeclaredField("eventBroker");
-      field.setAccessible(true);
-      field.set(client, broker);
-    } catch (ReflectiveOperationException e) {
-      throw new AssertionError("Failed to inject event broker", e);
-    }
-  }
-}
+}

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/CopilotLanguageClient.java

@@ -64,7 +64,7 @@
 import com.microsoft.copilot.eclipse.core.lsp.protocol.codingagent.CodingAgentMessageRequestParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.codingagent.CodingAgentMessageResult;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.policy.DidChangePolicyParams;
-import com.microsoft.copilot.eclipse.core.lsp.protocol.quota.QuotaWarningNotification;
+import com.microsoft.copilot.eclipse.core.lsp.protocol.quota.QuotaWarningParams;
 import com.microsoft.copilot.eclipse.core.utils.FileUtils;
 import com.microsoft.copilot.eclipse.core.utils.PlatformUtils;
 
@@ -358,10 +358,10 @@ public CompletableFuture<CodingAgentMessageResult> onCodingAgentMessage(CodingAg
    * Notify when a quota warning is received from the language server.
    */
   @JsonNotification("copilot/quotaWarning")
-  public void onQuotaWarning(QuotaWarningNotification notification) {
-    CopilotCore.LOGGER.info("Quota warning received: " + notification);
+  public void onQuotaWarning(QuotaWarningParams params) {
+    CopilotCore.LOGGER.info("Quota warning received: " + params);
     if (eventBroker != null) {
-      eventBroker.post(CopilotEventConstants.TOPIC_QUOTA_WARNING, notification);
+      eventBroker.post(CopilotEventConstants.TOPIC_QUOTA_WARNING, params);
     }
   }
 

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/quota/IntervalQuota.java

@@ -62,7 +62,7 @@
 import com.microsoft.copilot.eclipse.core.lsp.protocol.TodoItem;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.Turn;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.codingagent.CodingAgentMessageRequestParams;
-import com.microsoft.copilot.eclipse.core.lsp.protocol.quota.QuotaWarningNotification;
+import com.microsoft.copilot.eclipse.core.lsp.protocol.quota.QuotaWarningParams;
 import com.microsoft.copilot.eclipse.core.persistence.AbstractTurnData;
 import com.microsoft.copilot.eclipse.core.persistence.ConversationPersistenceManager;
 import com.microsoft.copilot.eclipse.core.persistence.ConversationXmlData;
@@ -375,11 +375,11 @@ public void done(IJobChangeEvent event) {
 
     this.quotaWarningHandler = event -> {
       Object data = event.getProperty(IEventBroker.DATA);
-      if (data instanceof QuotaWarningNotification notification) {
+      if (data instanceof QuotaWarningParams params) {
         SwtUtils.invokeOnDisplayThreadAsync(() -> {
           if (actionBar != null && !actionBar.isDisposed()) {
-            boolean warning = "warning".equalsIgnoreCase(notification.severity());
-            actionBar.createQuotaWarningBanner(notification.message(), notification.copilotPlan(), warning);
+            boolean warning = "warning".equalsIgnoreCase(params.severity());
+            actionBar.createQuotaWarningBanner(params.message(), params.copilotPlan(), warning);
           }
         }, parent);
       }

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/quota/QuotaChangeParams.java

@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+package com.microsoft.copilot.eclipse.ui.notifications;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.osgi.service.event.EventHandler;
+
+import com.microsoft.copilot.eclipse.core.CopilotCore;
+import com.microsoft.copilot.eclipse.core.events.CopilotEventConstants;
+import com.microsoft.copilot.eclipse.core.lsp.protocol.quota.QuotaWarningParams;
+
+/**
+ * Handles quota notifications from the language server and displays
+ * them as JFace notification popups.
+ */
+public class QuotaNotificationManager {
+
+  private static final int NOTIFICATION_DELAY_MS = 10000;
+
+  private final IEventBroker eventBroker;
+  private EventHandler quotaWarningEventHandler;
+
+  /**
+   * Creates a new QuotaNotificationManager and subscribes to quota events.
+   */
+  public QuotaNotificationManager() {
+    this.eventBroker = PlatformUI.getWorkbench().getService(IEventBroker.class);
+    if (eventBroker != null) {
+      this.quotaWarningEventHandler = event -> {
+        Object data = event.getProperty(IEventBroker.DATA);
+        if (data instanceof QuotaWarningParams params) {
+          showQuotaWarningNotification(params);
+        }
+      };
+      eventBroker.subscribe(CopilotEventConstants.TOPIC_QUOTA_WARNING, quotaWarningEventHandler);
+    }
+  }
+
+  /**
+   * Unsubscribes the quota event handler.
+   */
+  public void dispose() {
+    if (eventBroker != null && quotaWarningEventHandler != null) {
+      eventBroker.unsubscribe(quotaWarningEventHandler);
+      quotaWarningEventHandler = null;
+    }
+  }
+
+  private void showQuotaWarningNotification(QuotaWarningParams params) {
+    Display display = PlatformUI.getWorkbench().getDisplay();
+    if (display == null || display.isDisposed()) {
+      return;
+    }
+    display.asyncExec(() -> {
+      try {
+        new QuotaWarningNotificationPopup(display, params.message(), NOTIFICATION_DELAY_MS).open();
+      } catch (Exception e) {
+        CopilotCore.LOGGER.error("Failed to show quota warning notification", e);
+      }
+    });
+  }
+}