chore: avoid usage of deprecated API

getappmap · Nov 15, 2023 · cb4b74b · cb4b74b
1 parent c8a5ddd
commit cb4b74b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/plugin-core/src/main/java/appland/notifications/AppMapFullContentNotification.java b/plugin-core/src/main/java/appland/notifications/AppMapFullContentNotification.java
@@ -4,7 +4,6 @@
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.impl.NotificationFullContent;
-import com.intellij.openapi.util.NlsContexts;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -15,7 +14,19 @@
  * Notification, which implements {@link NotificationFullContent} to show all of its content.
  */
 class AppMapFullContentNotification extends Notification implements NotificationFullContent {
-    public AppMapFullContentNotification(@NotNull @NonNls String groupId, @Nullable Icon icon, @Nullable @NlsContexts.NotificationTitle String title, @Nullable @NlsContexts.NotificationSubtitle String subtitle, @Nullable @NlsContexts.NotificationContent String content, @NotNull NotificationType type, @Nullable NotificationListener listener) {
-        super(groupId, icon, title, subtitle, content, type, listener);
+    public AppMapFullContentNotification(@NotNull @NonNls String groupId,
+                                         @Nullable Icon icon,
+                                         @Nullable String title,
+                                         @Nullable String subtitle,
+                                         @NotNull String content,
+                                         @NotNull NotificationType type,
+                                         @Nullable NotificationListener listener) {
+        super(groupId, content, type);
+        setTitle(title);
+        setSubtitle(subtitle);
+        setIcon(icon);
+        if (listener != null) {
+            setListener(listener);
+        }
     }
 }
diff --git a/plugin-core/src/main/java/appland/notifications/AppMapNotifications.java b/plugin-core/src/main/java/appland/notifications/AppMapNotifications.java
@@ -6,23 +6,19 @@
 import appland.installGuide.InstallGuideEditorProvider;
 import appland.installGuide.InstallGuideViewPage;
 import appland.startup.FirstAppMapLaunchStartupActivity;
-import appland.toolwindow.AppMapToolWindowFactory;
-import appland.webviews.findings.FindingsOverviewEditorProvider;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationAction;
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.EdtInvocationManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.util.function.Consumer;
 
 import static appland.AppMapBundle.lazy;
@@ -40,7 +36,7 @@ public static void showExpiringRecordingNotification(@NotNull Project project,
 
         ApplicationManager.getApplication().invokeLater(() -> {
             // cast to Icon to avoid an ambiguity with 2021.2
-            var notification = new Notification(REMOTE_RECORDING_ID, (Icon) null, type);
+            var notification = new Notification(REMOTE_RECORDING_ID, "", type);
             if (title != null) {
                 notification.setTitle(title);
             }

diff --git a/plugin-core/src/main/java/appland/upload/AppMapUploader.java b/plugin-core/src/main/java/appland/upload/AppMapUploader.java
@@ -3,6 +3,7 @@
 import appland.AppMapBundle;
 import appland.Icons;
 import appland.settings.AppMapProjectSettingsService;
+import com.google.common.html.HtmlEscapers;
 import com.google.gson.GsonBuilder;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -19,7 +20,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Urls;
 import com.intellij.util.io.HttpRequests;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -102,7 +102,9 @@ public void run(@NotNull ProgressIndicator indicator) {
                     LOG.warn("Uploading AppMap failed", e);
                     ApplicationManager.getApplication().invokeLater(() -> {
                         Messages.showErrorDialog(project,
-                                AppMapBundle.get("upload.uploadFailed.message", file.getName(), StringEscapeUtils.escapeHtml(e.getMessage())),
+                                AppMapBundle.get("upload.uploadFailed.message",
+                                        file.getName(),
+                                        HtmlEscapers.htmlEscaper().escape(e.getMessage())),
                                 AppMapBundle.get("upload.uploadFailed.title"));
                     });
                 }