Calvin979 commented on code in PR #2433:
URL: https://github.com/apache/hertzbeat/pull/2433#discussion_r1709804686


##########
manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java:
##########
@@ -112,23 +85,25 @@ public ResponseEntity<Message<Void>> offlineCollector(
     public ResponseEntity<Message<Void>> deleteCollector(
             @Parameter(description = "collector name", example = 
"demo-collector")
             @RequestParam(required = false) List<String> collectors) {
-        this.collectorService.deleteRegisteredCollector(collectors);
-        return ResponseEntity.ok(Message.success("Delete success"));
+        try {
+            this.collectorService.deleteRegisteredCollector(collectors);
+            return ResponseEntity.ok(Message.success("Delete success"));
+        } catch (CommonException ex) {

Review Comment:
   This can be removed because `CommonException` is handled by 
`GlobalExceptionHandler`.



##########
manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java:
##########
@@ -112,23 +85,25 @@ public ResponseEntity<Message<Void>> offlineCollector(
     public ResponseEntity<Message<Void>> deleteCollector(
             @Parameter(description = "collector name", example = 
"demo-collector")
             @RequestParam(required = false) List<String> collectors) {
-        this.collectorService.deleteRegisteredCollector(collectors);
-        return ResponseEntity.ok(Message.success("Delete success"));
+        try {
+            this.collectorService.deleteRegisteredCollector(collectors);
+            return ResponseEntity.ok(Message.success("Delete success"));
+        } catch (CommonException ex) {
+            return ResponseEntity.ok(Message.fail(CommonConstants.FAIL_CODE, 
ex.getMessage()));
+        }
     }
 
     @PostMapping("/generate/{collector}")
     @Operation(summary = "Generate deploy collector info")
     public ResponseEntity<Message<Map<String, String>>> 
generateCollectorDeployInfo(
             @Parameter(description = "collector name", example = 
"demo-collector")
             @PathVariable() String collector) {
-        if (this.collectorService.hasCollector(collector)) {
-            return ResponseEntity.ok(Message.fail(CommonConstants.FAIL_CODE, 
"There already has same collector name."));
+        try {
+            return 
ResponseEntity.ok(Message.success(collectorService.generateCollectorDeployInfo(collector)));
+        } catch (CommonException ex) {

Review Comment:
   The same



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to