http

x-ream · Mar 13, 2024 · d03558c · d03558c
1 parent 3c76123
commit d03558c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 deletions.
diff --git a/acku-core/src/main/java/io/xream/acku/remote/acku/AckuServiceRemote.java b/acku-core/src/main/java/io/xream/acku/remote/acku/AckuServiceRemote.java
@@ -18,8 +18,10 @@
 
 import io.xream.acku.bean.dto.AckuDto;
 import io.xream.acku.bean.dto.ConsumedAckuDto;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.service.annotation.HttpExchange;
+import org.springframework.web.service.annotation.PostExchange;
 
 
 /**
@@ -28,19 +30,19 @@
 @HttpExchange("http://${acku.app}/message" )
 public interface AckuServiceRemote {
 
-    @RequestMapping("/create")
-    AckuDto create(AckuDto dto);
+    @PostExchange("/create")
+    AckuDto create(@RequestBody AckuDto dto);
 
-    @RequestMapping("/produce")
-    boolean produce(AckuDto dto);
+    @PostExchange("/produce")
+    boolean produce(@RequestBody AckuDto dto);
 
-    @RequestMapping("/consume")
-    boolean consume(ConsumedAckuDto dto);
+    @PostExchange("/consume")
+    boolean consume(@RequestBody ConsumedAckuDto dto);
 
-    @RequestMapping("/tryToConfirm")
+    @PostExchange("/tryToConfirm")
     boolean tryToConfirm(String msgId);
 
-    @RequestMapping("/cancel")
+    @PostExchange("/cancel")
     boolean cancel(String msgId);
 
 }
diff --git a/acku-core/src/main/java/io/xream/acku/remote/acku/FailedServiceRemote.java b/acku-core/src/main/java/io/xream/acku/remote/acku/FailedServiceRemote.java
@@ -1,8 +1,10 @@
 package io.xream.acku.remote.acku;
 
 import io.xream.acku.bean.entity.AckuMessage;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.service.annotation.GetExchange;
 import org.springframework.web.service.annotation.HttpExchange;
 
 import java.util.List;
@@ -15,16 +17,16 @@
 public interface FailedServiceRemote {
 
 
-    @RequestMapping(value = "/find", method = RequestMethod.GET)
+    @GetExchange(value = "/find")
     List<AckuMessage> findFailed();
 
-    @RequestMapping(value = "/find/{topic}", method = RequestMethod.GET)
-    List<AckuMessage> findFailedByTopic();
+    @GetExchange(value = "/find/{topic}")
+    List<AckuMessage> findFailedByTopic(@PathVariable("topic") String topic);
 
-    @RequestMapping(value = "/retryAll", method = RequestMethod.GET)
+    @GetExchange(value = "/retryAll")
     boolean retryAll();
 
-    @RequestMapping(value = "/retry/{messageId}", method = RequestMethod.GET)
-    boolean retry(String messageId);
+    @GetExchange(value = "/retry/{messageId}")
+    boolean retry(@PathVariable("messageId") String messageId);
 
 }
diff --git a/...-center/acku-dashboard/src/main/java/io/xream/acku/remote/AuthorizationServiceRemote.java b/...-center/acku-dashboard/src/main/java/io/xream/acku/remote/AuthorizationServiceRemote.java
@@ -18,6 +18,7 @@
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.service.annotation.GetExchange;
 import org.springframework.web.service.annotation.HttpExchange;
 
 /**
@@ -26,6 +27,6 @@
 @HttpExchange("http://${acku.dashboard.authorization.url.server}" )
 public interface AuthorizationServiceRemote {
 
-    @RequestMapping(value = "/{token}/{userId}", method = RequestMethod.GET)
+    @GetExchange(value = "/{token}/{userId}")
     boolean verify(String token, String userId);
 }
diff --git a/...e-center/acku-schedule/src/main/java/io/xream/acku/remote/ScheduledAckuServiceRemote.java b/...e-center/acku-schedule/src/main/java/io/xream/acku/remote/ScheduledAckuServiceRemote.java
@@ -19,7 +19,9 @@
 import io.xream.acku.bean.entity.AckuMessage;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.service.annotation.GetExchange;
 import org.springframework.web.service.annotation.HttpExchange;
+import org.springframework.web.service.annotation.PostExchange;
 
 import java.util.List;
 
@@ -30,18 +32,18 @@
 public interface ScheduledAckuServiceRemote {
 
 
-    @RequestMapping(value = "/retry")
+    @PostExchange(value = "/retry")
     boolean retry(AckuMessage message);
 
-    @RequestMapping(value = "/listForRetry", method = RequestMethod.GET)
+    @GetExchange(value = "/listForRetry")
     List<AckuMessage> listForRetry();
 
-    @RequestMapping(value = "/tryToFinish",method = RequestMethod.GET)
+    @GetExchange(value = "/tryToFinish")
     boolean tryToFinish();
 
-    @RequestMapping(value = "/tryToProduceNext",method = RequestMethod.GET)
+    @GetExchange(value = "/tryToProduceNext")
     boolean tryToProduceNext();
 
-    @RequestMapping(value = "/clean",method = RequestMethod.GET)
+    @GetExchange(value = "/clean")
     boolean clean();
 }
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
         <maven.test.skip>true</maven.test.skip>
-        <x7.boot.version>3.1.6</x7.boot.version>
+        <x7.boot.version>3.1.7</x7.boot.version>
     </properties>
 
     <modules>
@@ -70,7 +70,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.1.5</version>
+                <version>3.2.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -141,7 +141,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>