From 76df53835f9070990a6508f925efa1dc646b1ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristo=20Kuusk=C3=BCll?= Date: Thu, 31 Oct 2024 16:08:10 +0200 Subject: [PATCH] Restoring Spring 4 compatibly. --- CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- .../tasks/management/TasksManagementPortController.java | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf07a4b..436a353f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Changed +- Restoring Spring 4 compatibly. + +## 1.45.0 - 2024/10/30 + +### Changed + - Context switches are reduced. - MDC values are cleared more aggressively. diff --git a/gradle.properties b/gradle.properties index c0ccaa5f..d4275f02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=1.45.0 +version=1.45.1 org.gradle.internal.http.socketTimeout=120000 diff --git a/tw-tasks-management/src/main/java/com/transferwise/tasks/management/TasksManagementPortController.java b/tw-tasks-management/src/main/java/com/transferwise/tasks/management/TasksManagementPortController.java index 1f9c7670..a06b6d5b 100644 --- a/tw-tasks-management/src/main/java/com/transferwise/tasks/management/TasksManagementPortController.java +++ b/tw-tasks-management/src/main/java/com/transferwise/tasks/management/TasksManagementPortController.java @@ -18,7 +18,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.AuthenticationServiceException; import org.springframework.security.core.Authentication; @@ -203,7 +202,7 @@ public ResponseEntity getTasksStuck(@RequestBody(required @Override public ResponseEntity getTaskTypes(@RequestParam(name = "status", required = false) List status) { if (!tasksProperties.getTasksManagement().isEnableGetTaskTypes()) { - return ResponseEntity.status(HttpStatus.GONE).build(); + return ResponseEntity.status(410).build(); } return callWithAuthentication(() -> { ITasksManagementService.GetTaskTypesResponse serviceResponse = tasksManagementService.getTaskTypes(status); @@ -222,7 +221,7 @@ protected T callWithAuthentication(Set roles, Function