From bfa569685af30f5cd230f4dbfa93e5a3ab1871c7 Mon Sep 17 00:00:00 2001
From: LSmyrnaios <lsmyrnaios@gmail.com>
Date: Tue, 23 May 2023 22:24:49 +0300
Subject: [PATCH] - Use the "POST" method for shutdown and cancelShutdown
 requests. - Polish some messages.

---
 .../urls_worker/controllers/GeneralController.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/openaire/urls_worker/controllers/GeneralController.java b/src/main/java/eu/openaire/urls_worker/controllers/GeneralController.java
index 4d9339b..2a043e9 100644
--- a/src/main/java/eu/openaire/urls_worker/controllers/GeneralController.java
+++ b/src/main/java/eu/openaire/urls_worker/controllers/GeneralController.java
@@ -56,7 +56,7 @@ public class GeneralController {
 
     public static boolean shouldShutdownWorker = false;
 
-    @GetMapping("shutdownWorker")
+    @PostMapping("shutdownWorker")
     public ResponseEntity<?> shutdownWorkerGracefully(HttpServletRequest request)
     {
         String initMsg = "Received a \"shutdownWorker\" request. ";
@@ -76,16 +76,16 @@ public class GeneralController {
     }
 
 
-    @GetMapping("cancelShutdownWorker")
+    @PostMapping("cancelShutdownWorker")
     public ResponseEntity<?> cancelShutdownWorkerGracefully(HttpServletRequest request)
     {
-        String initMsg = "Received a \"cancelShutdownWorker\" request.";
+        String initMsg = "Received a \"cancelShutdownWorker\" request. ";
         ResponseEntity<?> responseEntity = passSecurityChecks(request, initMsg);
         if ( responseEntity != null )
             return responseEntity;
 
         shouldShutdownWorker = false;
-        String finalMsg = " Any previous \"shutdownWorker\"-request is canceled. The \"maxAssignmentsBatchesToHandleBeforeShutdown\" will still be honored (if it's set).";
+        String finalMsg = "Any previous \"shutdownWorker\"-request is canceled. The \"maxAssignmentsBatchesToHandleBeforeShutdown\" will still be honored (if it's set).";
         logger.info(initMsg + finalMsg);
         return ResponseEntity.ok().body(finalMsg + "\n");
     }
@@ -122,7 +122,7 @@ public class GeneralController {
     public ResponseEntity<?> passSecurityChecks(HttpServletRequest request, String initMsg)
     {
         if ( request == null ) {
-            logger.error(initMsg + " The \"HttpServletRequest\" is null!");
+            logger.error(initMsg + "The \"HttpServletRequest\" is null!");
             return ResponseEntity.internalServerError().build();
         }
         String remoteAddr = request.getHeader("X-FORWARDED-FOR");
@@ -130,7 +130,7 @@ public class GeneralController {
             remoteAddr = request.getRemoteAddr();
 
         if ( ! (remoteAddr.equals("127.0.0.1") || remoteAddr.equals(UriBuilder.ip) || remoteAddr.equals(controllerIp)) ) {
-            logger.error(initMsg + " The request came from another IP: " + remoteAddr + " | while this worker has the IP: " + UriBuilder.ip);
+            logger.error(initMsg + "The request came from another IP: " + remoteAddr + " | while this worker has the IP: " + UriBuilder.ip);
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
         }
         return null;    // The checks are passing.