From 784b2c78806a6aff03b20c5316e3d1fe63a523ea Mon Sep 17 00:00:00 2001 From: Vaibhav-a Mankar Date: Thu, 27 Apr 2023 15:23:18 +0530 Subject: [PATCH] Teams retry InMemory handler --- .../springbot/teams/TeamsWorkflowConfig.java | 3 +- .../teams/handlers/retry/MessageRetry.java | 93 ------------------- 2 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/retry/MessageRetry.java diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsWorkflowConfig.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsWorkflowConfig.java index 9c7f51bd..f344ec23 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsWorkflowConfig.java +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsWorkflowConfig.java @@ -75,8 +75,7 @@ ThymeleafEngineConfig.class, AdaptiveCardConverterConfig.class, ThymeleafConverterConfig.class, - TeamsConversationsConfig.class, - TeamsScheduledConfig.class + TeamsConversationsConfig.class }) @Profile("teams") public class TeamsWorkflowConfig { diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/retry/MessageRetry.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/retry/MessageRetry.java deleted file mode 100644 index 5bcda074..00000000 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/retry/MessageRetry.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.finos.springbot.teams.handlers.retry; - -import java.time.LocalDateTime; - -import org.finos.springbot.teams.content.TeamsAddressable; -import org.finos.springbot.teams.content.TeamsChannel; -import org.finos.springbot.teams.content.TeamsUser; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.microsoft.bot.schema.Activity; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class MessageRetry { - - private Activity activity; - private String teamsAddressableId; - private int retryCount; - private LocalDateTime retryAfterTime; - private Class teamsAddressableClass; - - public MessageRetry() { - - } - - public MessageRetry(Activity activity, TeamsAddressable teamsAddressable, int retryCount, LocalDateTime retryAfterTime) { - this.activity = activity; - this.teamsAddressableId = teamsAddressable.getKey(); - this.retryCount = retryCount; - this.retryAfterTime = retryAfterTime; - this.teamsAddressableClass = teamsAddressable.getClass(); - } - - public Activity getActivity() { - return activity; - } - - public void setActivity(Activity activity) { - this.activity = activity; - } - - public int getRetryCount() { - return retryCount; - } - - public void setRetryCount(int retryCount) { - this.retryCount = retryCount; - } - - public LocalDateTime getRetryAfterTime() { - return retryAfterTime; - } - - public void setRetryAfterTime(LocalDateTime retryAfterTime) { - this.retryAfterTime = retryAfterTime; - } - - public String getTeamsAddressableId() { - return teamsAddressableId; - } - - public void setTeamsAddressableId(String teamsAddressableId) { - this.teamsAddressableId = teamsAddressableId; - } - - public Class getTeamsAddressableClass() { - return teamsAddressableClass; - } - - public void setTeamsAddressableClass(Class teamsAddressableClass) { - this.teamsAddressableClass = teamsAddressableClass; - } - - public TeamsAddressable getTeamsAddressable() { - try { - TeamsAddressable instance = teamsAddressableClass.newInstance(); - - if (instance instanceof TeamsUser || instance instanceof TeamsChannel) { - ((TeamsChannel)instance).setKey(teamsAddressableId); - } - - return instance; - } catch (InstantiationException | IllegalAccessException e) { - throw new RuntimeException("Can't create TeamsAddressable", e); - } - } - - @Override - public String toString() { - return "MessageRetry [activity=" + activity + ", teamsAddressableId=" + teamsAddressableId + ", retryCount=" - + retryCount + ", retryAfterTime=" + retryAfterTime + "]"; - } - -} \ No newline at end of file