Merge pull request #385 from deutschebank/spring-bot-master-db

Retry / File State Storage
finos · May 17, 2023 · 4280e2f · 4280e2f
2 parents 5911655 + 9007a16
commit 4280e2f
Show file tree

Hide file tree

Showing 18 changed files with 554 additions and 311 deletions.
diff --git a/...low-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsScheduledConfig.java b/...low-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsScheduledConfig.java
diff --git a/...flow-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsWorkflowConfig.java b/...flow-spring-boot-starter/src/main/java/org/finos/springbot/teams/TeamsWorkflowConfig.java
@@ -13,8 +13,8 @@
 import org.finos.springbot.teams.conversations.TeamsConversationsConfig;
 import org.finos.springbot.teams.form.TeamsFormConverter;
 import org.finos.springbot.teams.form.TeamsFormDeserializerModule;
-import org.finos.springbot.teams.handlers.InMemoryMessageRetryHandler;
-import org.finos.springbot.teams.handlers.MessageRetryHandler;
+import org.finos.springbot.teams.handlers.ActivityHandler;
+import org.finos.springbot.teams.handlers.SimpleActivityHandler;
 import org.finos.springbot.teams.handlers.TeamsResponseHandler;
 import org.finos.springbot.teams.history.StateStorageBasedTeamsHistory;
 import org.finos.springbot.teams.history.StorageIDResponseHandler;
@@ -75,8 +75,7 @@
 	ThymeleafEngineConfig.class,
 	AdaptiveCardConverterConfig.class,
 	ThymeleafConverterConfig.class,
-	TeamsConversationsConfig.class,
-	TeamsScheduledConfig.class
+	TeamsConversationsConfig.class
 	})
 @Profile("teams")
 public class TeamsWorkflowConfig {
@@ -129,16 +128,23 @@ public TeamsResponseHandler teamsResponseHandler(
 			AdaptiveCardTemplateProvider formTemplater,
 			ThymeleafTemplateProvider displayTemplater,
 			TeamsStateStorage th,
-			TeamsConversations tc,
-			MessageRetryHandler mr) {
+			ActivityHandler ah) {
 		return new TeamsResponseHandler(
 				null,	// attachment handler
 				markupTemplater,
 				formTemplater,
 				displayTemplater,
 				th,
-				tc,
-				mr);
+				ah);
+	}
+
+	/**
+	If you want to include retry logic for activities, override this bean and return an instance of InMemoryRetryingActivityHandler
+	*/
+	@Bean
+	@ConditionalOnMissingBean
+	public ActivityHandler activityHandler(TeamsConversations tc) {
+		return new SimpleActivityHandler(tc);
 	}
 
 	@Bean
@@ -230,10 +236,5 @@ public void setResourceLoaderClassLoader() {
         resourceLoader.setClassLoader(this.getClass().getClassLoader());
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public MessageRetryHandler messageRetryHandler() {
-    	return new InMemoryMessageRetryHandler();
-    }
 
 }
diff --git a/...spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/ActivityHandler.java b/...spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/ActivityHandler.java
@@ -0,0 +1,13 @@
+package org.finos.springbot.teams.handlers;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.finos.springbot.teams.content.TeamsAddressable;
+
+import com.microsoft.bot.schema.Activity;
+import com.microsoft.bot.schema.ResourceResponse;
+
+public interface ActivityHandler {
+
+	public CompletableFuture<ResourceResponse> handleActivity(Activity activity, TeamsAddressable to);
+}
diff --git a/...starter/src/main/java/org/finos/springbot/teams/handlers/InMemoryMessageRetryHandler.java b/...starter/src/main/java/org/finos/springbot/teams/handlers/InMemoryMessageRetryHandler.java
diff --git a/...ow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/MessageRetry.java b/...ow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/MessageRetry.java
diff --git a/...ng-boot-starter/src/main/java/org/finos/springbot/teams/handlers/MessageRetryHandler.java b/...ng-boot-starter/src/main/java/org/finos/springbot/teams/handlers/MessageRetryHandler.java
diff --git a/...-boot-starter/src/main/java/org/finos/springbot/teams/handlers/SimpleActivityHandler.java b/...-boot-starter/src/main/java/org/finos/springbot/teams/handlers/SimpleActivityHandler.java
@@ -0,0 +1,24 @@
+package org.finos.springbot.teams.handlers;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.finos.springbot.teams.content.TeamsAddressable;
+import org.finos.springbot.teams.conversations.TeamsConversations;
+
+import com.microsoft.bot.schema.Activity;
+import com.microsoft.bot.schema.ResourceResponse;
+
+public class SimpleActivityHandler implements ActivityHandler {
+
+	private TeamsConversations tc;
+
+	public SimpleActivityHandler(TeamsConversations tc) {
+		this.tc = tc;
+	}
+
+	@Override
+	public CompletableFuture<ResourceResponse> handleActivity(Activity activity, TeamsAddressable to) {
+		return tc.handleActivity(activity, to);
+	}
+
+}