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

Compatibility With Spring-boot 3x
finos · Aug 18, 2023 · 6704873 · 6704873
2 parents e732e4d + 2347e57
commit 6704873
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 5 deletions.
diff --git a/libs/chat-workflow/src/main/java/org/finos/springbot/ChatWorkflowConfig.java b/libs/chat-workflow/src/main/java/org/finos/springbot/ChatWorkflowConfig.java
@@ -93,7 +93,7 @@ public UserListResponseHandler userListResponseHandler() {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public ChatWorkflowErrorHandler chatWorkflowErrorHandler(ResponseHandlers rh) {
+	public ErrorHandler chatWorkflowErrorHandler(ResponseHandlers rh) {
 		return new ChatWorkflowErrorHandler(rh, "default-error");
 	} 
 

diff --git a/libs/chat-workflow/src/main/java/org/finos/springbot/workflow/actions/ErrorAction.java b/libs/chat-workflow/src/main/java/org/finos/springbot/workflow/actions/ErrorAction.java
@@ -0,0 +1,33 @@
+package org.finos.springbot.workflow.actions;
+
+import org.finos.springbot.workflow.content.Addressable;
+import org.finos.springbot.workflow.content.User;
+
+public class ErrorAction implements Action {
+
+	private final Addressable a;
+	private final Object data;
+
+	public ErrorAction(Addressable a, Object ej) {
+		super();
+		this.a = a;
+		this.data = ej;
+	}
+
+	@Override
+	public Addressable getAddressable() {
+		return a;
+	}
+
+
+	@Override
+	public Object getData() {
+		return data;
+	}
+
+	@Override
+	public User getUser() {
+		return null;
+	}
+
+}
diff --git a/...rkflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/bot/BotController.java b/...rkflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/bot/BotController.java
@@ -102,12 +102,12 @@ public CompletableFuture<ResponseEntity<Object>> incoming(
 
              if (exception instanceof CompletionException) {
                  if (exception.getCause() instanceof AuthenticationException) {
-                	 return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+                	 return ResponseEntity.status(HttpStatus.UNAUTHORIZED.value()).build();
                  } else {
-                	 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+                	 return ResponseEntity.internalServerError().build();
                  }
              } else {
-            	 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+            	 return ResponseEntity.internalServerError().build();
              }
          });
  }

diff --git a/...g-boot-starter/src/main/java/org/finos/springbot/teams/handlers/TeamsResponseHandler.java b/...g-boot-starter/src/main/java/org/finos/springbot/teams/handlers/TeamsResponseHandler.java
@@ -17,8 +17,11 @@
 import org.finos.springbot.teams.templating.adaptivecard.AdaptiveCardPassthrough;
 import org.finos.springbot.teams.templating.adaptivecard.AdaptiveCardTemplateProvider;
 import org.finos.springbot.teams.templating.thymeleaf.ThymeleafTemplateProvider;
+import org.finos.springbot.workflow.actions.Action;
+import org.finos.springbot.workflow.actions.ErrorAction;
 import org.finos.springbot.workflow.annotations.WorkMode;
 import org.finos.springbot.workflow.response.AttachmentResponse;
+import org.finos.springbot.workflow.response.ErrorResponse;
 import org.finos.springbot.workflow.response.MessageResponse;
 import org.finos.springbot.workflow.response.Response;
 import org.finos.springbot.workflow.response.WorkResponse;
@@ -192,8 +195,13 @@ private BiFunction<? super ResourceResponse, Throwable, ResourceResponse> handle
 						LOG.error("message:\n"+out);						
 					} 
 
+					if(!(t  instanceof ErrorResponse)) {
+						Action.CURRENT_ACTION.set(new ErrorAction(address, data));
+					}
+
 					initErrorHandler();
-					eh.handleError(e);					
+					eh.handleError(e);
+					Action.CURRENT_ACTION.set(Action.NULL_ACTION);
 				} else if(rr != null) {
 					performStorage(address, data, teamsState);
 				}