Issue30 builderclasses

src/main/java/io/aiven/klaw/controller/TopicController.java

@@ -1,6 +1,7 @@
 package io.aiven.klaw.controller;
 
 import io.aiven.klaw.error.KlawException;
+import io.aiven.klaw.model.ApiResponse;
 import io.aiven.klaw.model.TopicInfo;
 import io.aiven.klaw.model.TopicRequestModel;
 import io.aiven.klaw.service.TopicControllerService;
@@ -101,10 +102,18 @@ public ResponseEntity<String> deleteTopicRequests(@RequestParam("topicId") Strin
   @PostMapping(
       value = "/execTopicRequests",
       produces = {MediaType.APPLICATION_JSON_VALUE})
-  public ResponseEntity<String> approveTopicRequests(@RequestParam("topicId") String topicId)
-      throws KlawException {
-    return new ResponseEntity<>(
-        topicControllerService.approveTopicRequests(topicId), HttpStatus.OK);
+  public ResponseEntity<ApiResponse> approveTopicRequests(@RequestParam("topicId") String topicId) {
+    try {
+      return new ResponseEntity<>(
+          topicControllerService.approveTopicRequests(topicId), HttpStatus.OK);
+    } catch (KlawException e) {
+      return new ResponseEntity<>(
+          ApiResponse.builder()
+              .message(e.getMessage())
+              .status(HttpStatus.INTERNAL_SERVER_ERROR)
+              .build(),
+          HttpStatus.INTERNAL_SERVER_ERROR);
+    }
   }
 
   @PostMapping(

src/main/java/io/aiven/klaw/model/ApiResponse.java

@@ -0,0 +1,26 @@
+package io.aiven.klaw.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@Builder
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApiResponse {
+  private HttpStatus status;
+
+  @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy hh:mm:ss")
+  private LocalDateTime timestamp;
+
+  private String message;
+
+  private String debugMessage;
+
+  private String result;
+}

src/main/java/io/aiven/klaw/model/ApiResultStatus.java

@@ -0,0 +1,14 @@
+package io.aiven.klaw.model;
+
+public enum ApiResultStatus {
+  SUCCESS("success"),
+  FAILURE("failure"),
+  NOT_AUTHORIZED("Not Authorized"),
+  ERROR("error");
+
+  public final String value;
+
+  ApiResultStatus(String value) {
+    this.value = value;
+  }
+}

src/main/java/io/aiven/klaw/model/ClusterStatus.java

@@ -0,0 +1,13 @@
+package io.aiven.klaw.model;
+
+public enum ClusterStatus {
+  OFFLINE("OFFLINE"),
+  ONLINE("ONLINE"),
+  NOT_KNOWN("NOT_KNOWN");
+
+  public final String value;
+
+  ClusterStatus(String value) {
+    this.value = value;
+  }
+}

src/main/java/io/aiven/klaw/model/ClusterTopicRequest.java

@@ -0,0 +1,21 @@
+package io.aiven.klaw.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import lombok.Builder;
+
+@Builder(toBuilder = true)
+public class ClusterTopicRequest implements Serializable {
+
+  @JsonProperty private String env;
+
+  @JsonProperty private int partitions;
+
+  @JsonProperty private short replicationFactor;
+
+  @JsonProperty private String protocol;
+
+  @JsonProperty private String clusterName;
+
+  @JsonProperty private String topicName;
+}