From 14066df05735cb10f15ef52d7c7541e28a849ba3 Mon Sep 17 00:00:00 2001
From: Bruce Downs <bruce.downs@autodesk.com>
Date: Wed, 22 Jan 2025 08:27:11 -0700
Subject: [PATCH 1/5] create undocumented message bot events

* message_bot_add
* message_bot_remove
* these occur on add/remove of incoming webhook
---
 .../java/com/slack/api/bolt/AppConfig.java    |  9 +++---
 .../slack/api/bolt/context/SayUtility.java    |  2 +-
 .../DefaultTokensRevokedEventHandler.java     |  2 +-
 .../api/bolt/util/ListenerCodeSuggestion.java | 25 +++++++---------
 .../api/model/event/MessageBotAddEvent.java   | 30 +++++++++++++++++++
 .../model/event/MessageBotRemoveEvent.java    | 30 +++++++++++++++++++
 6 files changed, 77 insertions(+), 21 deletions(-)
 create mode 100644 slack-api-model/src/main/java/com/slack/api/model/event/MessageBotAddEvent.java
 create mode 100644 slack-api-model/src/main/java/com/slack/api/model/event/MessageBotRemoveEvent.java

diff --git a/bolt/src/main/java/com/slack/api/bolt/AppConfig.java b/bolt/src/main/java/com/slack/api/bolt/AppConfig.java
index 0d858b4ce..78c7aad84 100644
--- a/bolt/src/main/java/com/slack/api/bolt/AppConfig.java
+++ b/bolt/src/main/java/com/slack/api/bolt/AppConfig.java
@@ -79,8 +79,7 @@ private EnvVariableName() {
     private static SlackHttpClient buildSlackHttpClient() {
         Map<String, String> userAgentCustomInfo = new HashMap<>();
         userAgentCustomInfo.put("bolt", BoltLibraryVersion.get());
-        SlackHttpClient client = new SlackHttpClient(SlackConfig.DEFAULT, userAgentCustomInfo);
-        return client;
+        return new SlackHttpClient(SlackConfig.DEFAULT, userAgentCustomInfo);
     }
 
     @Builder.Default
@@ -286,7 +285,7 @@ public String getOauthInstallPath() {
         String path = this.oauthInstallPath;
         String legacyPath = this.oauthStartPath;
         if (path != null
-                && path.equals(DEFAULT_OAUTH_INSTALL_PATH) == false
+                && !path.equals(DEFAULT_OAUTH_INSTALL_PATH)
                 && legacyPath.equals(DEFAULT_OAUTH_INSTALL_PATH)) {
             return path;
         } else {
@@ -330,7 +329,7 @@ public String getOauthRedirectUriPath() {
         String path = this.oauthRedirectUriPath;
         String legacyPath = this.oauthCallbackPath;
         if (path != null
-                && path.equals(DEFAULT_OAUTH_REDIRECT_URI_PATH) == false
+                && !path.equals(DEFAULT_OAUTH_REDIRECT_URI_PATH)
                 && legacyPath.equals(DEFAULT_OAUTH_REDIRECT_URI_PATH)) {
             return path;
         } else {
@@ -407,4 +406,4 @@ public void setOauthRedirectUriPath(String oauthRedirectUriPath) {
     @Builder.Default
     private boolean ignoringSelfAssistantMessageEventsEnabled = true;
 
-}
\ No newline at end of file
+}
diff --git a/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java b/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java
index a89ac23a9..952b1e5ac 100644
--- a/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java
+++ b/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java
@@ -26,7 +26,7 @@ default ChatPostMessageResponse say(String text) throws IOException, SlackApiExc
     }
 
     /**
-     * Using `say(blocks, text)` instead is highly recommended for even better user experience.
+     * Using `say(text, blocks)` instead is highly recommended for even better user experience.
      */
     default ChatPostMessageResponse say(List<LayoutBlock> blocks) throws IOException, SlackApiException {
         return say(null, blocks);
diff --git a/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java b/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
index dbb7473e5..8aaa019e7 100644
--- a/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
+++ b/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
@@ -45,7 +45,7 @@ public Response apply(
         this.executorService.submit(() -> {
             TokensRevokedEvent.Tokens tokens = payload.getEvent().getTokens();
             if (tokens.getOauth() != null) { // user tokens
-                for (String userId : tokens.    getOauth()) {
+                for (String userId : tokens.getOauth()) {
                     Installer installer = installationService.findInstaller(enterpriseId, teamId, userId);
                     if (installer != null) {
                         try {
diff --git a/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java b/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
index 9d6696742..7507fae94 100644
--- a/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
+++ b/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
@@ -17,7 +17,7 @@ private ListenerCodeSuggestion() {
             "\n" +
             "app.step(step);\n";
 
-    public static final String viewSubmission(String callbackId) {
+    public static String viewSubmission(String callbackId) {
         return COMMON_PREFIX +
                 "app.viewSubmission(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Sent inputs: req.getPayload().getView().getState().getValues()\n" +
@@ -25,7 +25,7 @@ public static final String viewSubmission(String callbackId) {
                 "});\n";
     }
 
-    public static final String viewClosed(String callbackId) {
+    public static String viewClosed(String callbackId) {
         return COMMON_PREFIX +
                 "app.viewClosed(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -33,7 +33,7 @@ public static final String viewClosed(String callbackId) {
                 "});\n";
     }
 
-    public static final String dialogSubmission(String callbackId) {
+    public static String dialogSubmission(String callbackId) {
         return COMMON_PREFIX +
                 "app.dialogSubmission(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -41,7 +41,7 @@ public static final String dialogSubmission(String callbackId) {
                 "});\n";
     }
 
-    public static final String dialogSuggestion(String callbackId) {
+    public static String dialogSuggestion(String callbackId) {
         return COMMON_PREFIX +
                 "app.dialogSubmission(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  List<Option> options = Arrays.asList(Option.builder().label(\"label\").value(\"value\").build());\n" +
@@ -57,14 +57,14 @@ public static String dialogCancellation(String callbackId) {
                 "});\n";
     }
 
-    public static final String command(String command) {
+    public static String command(String command) {
         return COMMON_PREFIX +
                 "app.command(\"" + command + "\", (req, ctx) -> {\n" +
                 "  return ctx.ack();\n" +
                 "});\n";
     }
 
-    public static final String attachmentAction(String callbackId) {
+    public static String attachmentAction(String callbackId) {
         return COMMON_PREFIX +
                 "app.attachmentAction(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -72,7 +72,7 @@ public static final String attachmentAction(String callbackId) {
                 "});\n";
     }
 
-    public static final String blockAction(String actionId) {
+    public static String blockAction(String actionId) {
         return COMMON_PREFIX +
                 "app.blockAction(\"" + actionId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -80,7 +80,7 @@ public static final String blockAction(String actionId) {
                 "});\n";
     }
 
-    public static final String blockSuggestion(String actionId) {
+    public static String blockSuggestion(String actionId) {
         return COMMON_PREFIX +
                 "app.blockSuggestion(\"" + actionId + "\", (req, ctx) -> {\n" +
                 "  List<Option> options = Arrays.asList(Option.builder().text(plainText(\"label\")).value(\"v\").build());\n" +
@@ -88,7 +88,7 @@ public static final String blockSuggestion(String actionId) {
                 "});\n";
     }
 
-    public static final String event(String eventTypeAndSubtype) {
+    public static String event(String eventTypeAndSubtype) {
         String className = toEventClassName(eventTypeAndSubtype);
         return COMMON_PREFIX +
                 "app.event(" + className + ".class, (payload, ctx) -> {\n" +
@@ -96,7 +96,7 @@ public static final String event(String eventTypeAndSubtype) {
                 "});\n";
     }
 
-    public static final String toEventClassName(String eventTypeAndSubtype) {
+    public static String toEventClassName(String eventTypeAndSubtype) {
         String eventType = eventTypeAndSubtype;
         String[] elements = eventTypeAndSubtype.split(":");
         if (elements.length == 2) {
@@ -105,9 +105,6 @@ public static final String toEventClassName(String eventTypeAndSubtype) {
                     .replaceFirst("_message", "")
                     .replaceFirst("message_", "");
         }
-        if (eventType == null) {
-            return "";
-        }
         StringBuilder sb = new StringBuilder();
         char[] cs = eventType.toCharArray();
         for (int i = 0; i < cs.length; i++) {
@@ -121,7 +118,7 @@ public static final String toEventClassName(String eventTypeAndSubtype) {
                 sb.append(c);
             }
         }
-        return sb.toString() + "Event";
+        return sb + "Event";
     }
 
     public static String globalShortcut(String callbackId) {
diff --git a/slack-api-model/src/main/java/com/slack/api/model/event/MessageBotAddEvent.java b/slack-api-model/src/main/java/com/slack/api/model/event/MessageBotAddEvent.java
new file mode 100644
index 000000000..b431058b9
--- /dev/null
+++ b/slack-api-model/src/main/java/com/slack/api/model/event/MessageBotAddEvent.java
@@ -0,0 +1,30 @@
+package com.slack.api.model.event;
+
+import lombok.Data;
+
+/**
+ * https://api.slack.com/events/message/bot_add
+ * (undocumented)
+ */
+@Data
+public class MessageBotAddEvent implements Event {
+
+  public static final String TYPE_NAME = "message";
+  public static final String SUBTYPE_NAME = "bot_add";
+
+  private final String type = TYPE_NAME;
+  private final String subtype = SUBTYPE_NAME;
+
+  private String botId;
+  private String user;
+
+  private String channel;
+
+  private String text;
+  private String botLink;
+
+  private String ts;
+
+  private String eventTs;
+  private String channelType;
+}
diff --git a/slack-api-model/src/main/java/com/slack/api/model/event/MessageBotRemoveEvent.java b/slack-api-model/src/main/java/com/slack/api/model/event/MessageBotRemoveEvent.java
new file mode 100644
index 000000000..95263356d
--- /dev/null
+++ b/slack-api-model/src/main/java/com/slack/api/model/event/MessageBotRemoveEvent.java
@@ -0,0 +1,30 @@
+package com.slack.api.model.event;
+
+import lombok.Data;
+
+/**
+ * https://api.slack.com/events/message/bot_remove
+ * (undocumented)
+ */
+@Data
+public class MessageBotRemoveEvent implements Event {
+
+  public static final String TYPE_NAME = "message";
+  public static final String SUBTYPE_NAME = "bot_remove";
+
+  private final String type = TYPE_NAME;
+  private final String subtype = SUBTYPE_NAME;
+
+  private String botId;
+  private String user;
+
+  private String channel;
+
+  private String text;
+  private String botLink;
+
+  private String ts;
+
+  private String eventTs;
+  private String channelType;
+}

From 4ce4a75233ef37e70de28a61ca66b4f970a0b978 Mon Sep 17 00:00:00 2001
From: Bruce Downs <bruce.downs@autodesk.com>
Date: Sat, 25 Jan 2025 10:22:38 -0700
Subject: [PATCH 2/5] caching default bot

---
 .../main/java/com/slack/api/bolt/model/builtin/DefaultBot.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java b/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java
index d51d116af..4bcb2af23 100644
--- a/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java
+++ b/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java
@@ -1,13 +1,14 @@
 package com.slack.api.bolt.model.builtin;
 
 import com.slack.api.bolt.model.Bot;
+import java.io.Serializable;
 import lombok.Data;
 
 /**
  * The default data class for the Bot interface.
  */
 @Data
-public class DefaultBot implements Bot {
+public class DefaultBot implements Bot, Serializable {
 
     private String appId;
     private String enterpriseId;

From 049bd433e0ae4629a7d8501a49f04a8f1d676255 Mon Sep 17 00:00:00 2001
From: Bruce Downs <bruce.downs@autodesk.com>
Date: Tue, 28 Jan 2025 08:44:31 -0700
Subject: [PATCH 3/5] intellij tweak

---
 .../bolt/handler/builtin/DefaultTokensRevokedEventHandler.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java b/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
index 8aaa019e7..67d69b8dc 100644
--- a/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
+++ b/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
@@ -58,7 +58,7 @@ public Response apply(
                     }
                 }
             }
-            if (tokens.getBot() != null && tokens.getBot().size() > 0) { // bots
+            if (tokens.getBot() != null && !tokens.getBot().isEmpty()) { // bots
                 // actually only one bot per app in a workspace
                 Bot bot = installationService.findBot(enterpriseId, teamId);
                 if (bot != null) {

From a08e1a1f1556aee096876fba382e915a1d49a35a Mon Sep 17 00:00:00 2001
From: Bruce Downs <bruce.downs@autodesk.com>
Date: Mon, 3 Feb 2025 10:21:29 -0700
Subject: [PATCH 4/5] manual revert of unrelated

---
 .../java/com/slack/api/bolt/AppConfig.java    |  9 +++---
 .../slack/api/bolt/context/SayUtility.java    |  2 +-
 .../DefaultTokensRevokedEventHandler.java     |  4 +--
 .../api/bolt/model/builtin/DefaultBot.java    |  3 +-
 .../api/bolt/util/ListenerCodeSuggestion.java | 31 ++++++++++---------
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/bolt/src/main/java/com/slack/api/bolt/AppConfig.java b/bolt/src/main/java/com/slack/api/bolt/AppConfig.java
index 78c7aad84..0d858b4ce 100644
--- a/bolt/src/main/java/com/slack/api/bolt/AppConfig.java
+++ b/bolt/src/main/java/com/slack/api/bolt/AppConfig.java
@@ -79,7 +79,8 @@ private EnvVariableName() {
     private static SlackHttpClient buildSlackHttpClient() {
         Map<String, String> userAgentCustomInfo = new HashMap<>();
         userAgentCustomInfo.put("bolt", BoltLibraryVersion.get());
-        return new SlackHttpClient(SlackConfig.DEFAULT, userAgentCustomInfo);
+        SlackHttpClient client = new SlackHttpClient(SlackConfig.DEFAULT, userAgentCustomInfo);
+        return client;
     }
 
     @Builder.Default
@@ -285,7 +286,7 @@ public String getOauthInstallPath() {
         String path = this.oauthInstallPath;
         String legacyPath = this.oauthStartPath;
         if (path != null
-                && !path.equals(DEFAULT_OAUTH_INSTALL_PATH)
+                && path.equals(DEFAULT_OAUTH_INSTALL_PATH) == false
                 && legacyPath.equals(DEFAULT_OAUTH_INSTALL_PATH)) {
             return path;
         } else {
@@ -329,7 +330,7 @@ public String getOauthRedirectUriPath() {
         String path = this.oauthRedirectUriPath;
         String legacyPath = this.oauthCallbackPath;
         if (path != null
-                && !path.equals(DEFAULT_OAUTH_REDIRECT_URI_PATH)
+                && path.equals(DEFAULT_OAUTH_REDIRECT_URI_PATH) == false
                 && legacyPath.equals(DEFAULT_OAUTH_REDIRECT_URI_PATH)) {
             return path;
         } else {
@@ -406,4 +407,4 @@ public void setOauthRedirectUriPath(String oauthRedirectUriPath) {
     @Builder.Default
     private boolean ignoringSelfAssistantMessageEventsEnabled = true;
 
-}
+}
\ No newline at end of file
diff --git a/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java b/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java
index 952b1e5ac..a89ac23a9 100644
--- a/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java
+++ b/bolt/src/main/java/com/slack/api/bolt/context/SayUtility.java
@@ -26,7 +26,7 @@ default ChatPostMessageResponse say(String text) throws IOException, SlackApiExc
     }
 
     /**
-     * Using `say(text, blocks)` instead is highly recommended for even better user experience.
+     * Using `say(blocks, text)` instead is highly recommended for even better user experience.
      */
     default ChatPostMessageResponse say(List<LayoutBlock> blocks) throws IOException, SlackApiException {
         return say(null, blocks);
diff --git a/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java b/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
index 67d69b8dc..dbb7473e5 100644
--- a/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
+++ b/bolt/src/main/java/com/slack/api/bolt/handler/builtin/DefaultTokensRevokedEventHandler.java
@@ -45,7 +45,7 @@ public Response apply(
         this.executorService.submit(() -> {
             TokensRevokedEvent.Tokens tokens = payload.getEvent().getTokens();
             if (tokens.getOauth() != null) { // user tokens
-                for (String userId : tokens.getOauth()) {
+                for (String userId : tokens.    getOauth()) {
                     Installer installer = installationService.findInstaller(enterpriseId, teamId, userId);
                     if (installer != null) {
                         try {
@@ -58,7 +58,7 @@ public Response apply(
                     }
                 }
             }
-            if (tokens.getBot() != null && !tokens.getBot().isEmpty()) { // bots
+            if (tokens.getBot() != null && tokens.getBot().size() > 0) { // bots
                 // actually only one bot per app in a workspace
                 Bot bot = installationService.findBot(enterpriseId, teamId);
                 if (bot != null) {
diff --git a/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java b/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java
index 4bcb2af23..d51d116af 100644
--- a/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java
+++ b/bolt/src/main/java/com/slack/api/bolt/model/builtin/DefaultBot.java
@@ -1,14 +1,13 @@
 package com.slack.api.bolt.model.builtin;
 
 import com.slack.api.bolt.model.Bot;
-import java.io.Serializable;
 import lombok.Data;
 
 /**
  * The default data class for the Bot interface.
  */
 @Data
-public class DefaultBot implements Bot, Serializable {
+public class DefaultBot implements Bot {
 
     private String appId;
     private String enterpriseId;
diff --git a/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java b/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
index 7507fae94..af2f9bf29 100644
--- a/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
+++ b/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
@@ -17,7 +17,7 @@ private ListenerCodeSuggestion() {
             "\n" +
             "app.step(step);\n";
 
-    public static String viewSubmission(String callbackId) {
+    public static final String viewSubmission(String callbackId) {
         return COMMON_PREFIX +
                 "app.viewSubmission(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Sent inputs: req.getPayload().getView().getState().getValues()\n" +
@@ -25,7 +25,7 @@ public static String viewSubmission(String callbackId) {
                 "});\n";
     }
 
-    public static String viewClosed(String callbackId) {
+    public static final String viewClosed(String callbackId) {
         return COMMON_PREFIX +
                 "app.viewClosed(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -33,7 +33,7 @@ public static String viewClosed(String callbackId) {
                 "});\n";
     }
 
-    public static String dialogSubmission(String callbackId) {
+    public static final String dialogSubmission(String callbackId) {
         return COMMON_PREFIX +
                 "app.dialogSubmission(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -41,7 +41,7 @@ public static String dialogSubmission(String callbackId) {
                 "});\n";
     }
 
-    public static String dialogSuggestion(String callbackId) {
+    public static final String dialogSuggestion(String callbackId) {
         return COMMON_PREFIX +
                 "app.dialogSubmission(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  List<Option> options = Arrays.asList(Option.builder().label(\"label\").value(\"value\").build());\n" +
@@ -49,7 +49,7 @@ public static String dialogSuggestion(String callbackId) {
                 "});\n";
     }
 
-    public static String dialogCancellation(String callbackId) {
+    public static final String dialogCancellation(String callbackId) {
         return COMMON_PREFIX +
                 "app.dialogCancellation(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -57,14 +57,14 @@ public static String dialogCancellation(String callbackId) {
                 "});\n";
     }
 
-    public static String command(String command) {
+    public static final String command(String command) {
         return COMMON_PREFIX +
                 "app.command(\"" + command + "\", (req, ctx) -> {\n" +
                 "  return ctx.ack();\n" +
                 "});\n";
     }
 
-    public static String attachmentAction(String callbackId) {
+    public static final String attachmentAction(String callbackId) {
         return COMMON_PREFIX +
                 "app.attachmentAction(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -72,7 +72,7 @@ public static String attachmentAction(String callbackId) {
                 "});\n";
     }
 
-    public static String blockAction(String actionId) {
+    public static final String blockAction(String actionId) {
         return COMMON_PREFIX +
                 "app.blockAction(\"" + actionId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -80,7 +80,7 @@ public static String blockAction(String actionId) {
                 "});\n";
     }
 
-    public static String blockSuggestion(String actionId) {
+    public static final String blockSuggestion(String actionId) {
         return COMMON_PREFIX +
                 "app.blockSuggestion(\"" + actionId + "\", (req, ctx) -> {\n" +
                 "  List<Option> options = Arrays.asList(Option.builder().text(plainText(\"label\")).value(\"v\").build());\n" +
@@ -88,7 +88,7 @@ public static String blockSuggestion(String actionId) {
                 "});\n";
     }
 
-    public static String event(String eventTypeAndSubtype) {
+    public static final String event(String eventTypeAndSubtype) {
         String className = toEventClassName(eventTypeAndSubtype);
         return COMMON_PREFIX +
                 "app.event(" + className + ".class, (payload, ctx) -> {\n" +
@@ -96,7 +96,7 @@ public static String event(String eventTypeAndSubtype) {
                 "});\n";
     }
 
-    public static String toEventClassName(String eventTypeAndSubtype) {
+    public static final String toEventClassName(String eventTypeAndSubtype) {
         String eventType = eventTypeAndSubtype;
         String[] elements = eventTypeAndSubtype.split(":");
         if (elements.length == 2) {
@@ -105,6 +105,9 @@ public static String toEventClassName(String eventTypeAndSubtype) {
                     .replaceFirst("_message", "")
                     .replaceFirst("message_", "");
         }
+        if (eventType == null) {
+            return "";
+        }
         StringBuilder sb = new StringBuilder();
         char[] cs = eventType.toCharArray();
         for (int i = 0; i < cs.length; i++) {
@@ -118,10 +121,10 @@ public static String toEventClassName(String eventTypeAndSubtype) {
                 sb.append(c);
             }
         }
-        return sb + "Event";
+        return sb.toString() + "Event";
     }
 
-    public static String globalShortcut(String callbackId) {
+    public static final String globalShortcut(String callbackId) {
         return COMMON_PREFIX +
                 "app.globalShortcut(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -129,7 +132,7 @@ public static String globalShortcut(String callbackId) {
                 "});\n";
     }
 
-    public static String messageShortcut(String callbackId) {
+    public static final String messageShortcut(String callbackId) {
         return COMMON_PREFIX +
                 "app.messageShortcut(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +

From 181e3de7ca1eb894793fd3aa25944b4380a3c09e Mon Sep 17 00:00:00 2001
From: Bruce Downs <bruce.downs@autodesk.com>
Date: Mon, 3 Feb 2025 10:22:44 -0700
Subject: [PATCH 5/5] manual revert

---
 .../com/slack/api/bolt/util/ListenerCodeSuggestion.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java b/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
index af2f9bf29..9d6696742 100644
--- a/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
+++ b/bolt/src/main/java/com/slack/api/bolt/util/ListenerCodeSuggestion.java
@@ -49,7 +49,7 @@ public static final String dialogSuggestion(String callbackId) {
                 "});\n";
     }
 
-    public static final String dialogCancellation(String callbackId) {
+    public static String dialogCancellation(String callbackId) {
         return COMMON_PREFIX +
                 "app.dialogCancellation(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -124,7 +124,7 @@ public static final String toEventClassName(String eventTypeAndSubtype) {
         return sb.toString() + "Event";
     }
 
-    public static final String globalShortcut(String callbackId) {
+    public static String globalShortcut(String callbackId) {
         return COMMON_PREFIX +
                 "app.globalShortcut(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +
@@ -132,7 +132,7 @@ public static final String globalShortcut(String callbackId) {
                 "});\n";
     }
 
-    public static final String messageShortcut(String callbackId) {
+    public static String messageShortcut(String callbackId) {
         return COMMON_PREFIX +
                 "app.messageShortcut(\"" + callbackId + "\", (req, ctx) -> {\n" +
                 "  // Do something where\n" +