refactor: cloud api refactor

cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/error/FlamingockError.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/error/CloudFlamingockError.java

@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-public interface FlamingockError {
+public interface CloudFlamingockError {
 
     String getCode();
 

cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/AuditEntryRequest.java

@@ -15,26 +15,29 @@
  */
 package io.flamingock.cloud.api.request;
 
-import io.flamingock.api.RecoveryStrategy;
+import io.flamingock.cloud.api.vo.CloudRecoveryStrategy;
+import io.flamingock.cloud.api.vo.CloudAuditStatus;
+import io.flamingock.cloud.api.vo.CloudChangeType;
+import io.flamingock.cloud.api.vo.CloudTxStrategy;
 
 public class AuditEntryRequest {
 
     private String stageId;
     private String taskId;
     private String author;
     private long appliedAtEpochMillis;
-    private AuditEntryStatus state;
+    private CloudAuditStatus state;
     private String className;
     private String methodName;
     private Object metadata;
     private long executionMillis;
     private String executionHostname;
     private String errorTrace;
-    private ChangeType type;
-    private CloudAuditTxType txStrategy;
+    private CloudChangeType type;
+    private CloudTxStrategy txStrategy;
     private String targetSystemId;
     private String order;
-    private RecoveryStrategy recoveryStrategy;
+    private CloudRecoveryStrategy recoveryStrategy;
     private Boolean transactionFlag;
     protected Boolean systemChange;//TODO not in server
 
@@ -45,19 +48,19 @@ public AuditEntryRequest(String stageId,
                              String taskId,
                              String author,
                              long appliedAtEpochMillis,
-                             AuditEntryStatus state,
-                             ChangeType type,
+                             CloudAuditStatus state,
+                             CloudChangeType type,
                              String className,
                              String methodName,
                              long executionMillis,
                              String executionHostname,
                              Object metadata,
                              boolean systemChange,
                              String errorTrace,
-                             CloudAuditTxType txStrategy,
+                             CloudTxStrategy txStrategy,
                              String targetSystemId,
                              String order,
-                             RecoveryStrategy recoveryStrategy,
+                             CloudRecoveryStrategy recoveryStrategy,
                              Boolean transactionFlag) {
         this.stageId = stageId;
         this.taskId = taskId;
@@ -96,7 +99,7 @@ public long getAppliedAtEpochMillis() {
         return appliedAtEpochMillis;
     }
 
-    public AuditEntryStatus getState() {
+    public CloudAuditStatus getState() {
         return state;
     }
 
@@ -128,11 +131,11 @@ public Boolean getSystemChange() {
         return systemChange;
     }
 
-    public ChangeType getType() {
+    public CloudChangeType getType() {
         return type;
     }
 
-    public CloudAuditTxType getTxStrategy() {
+    public CloudTxStrategy getTxStrategy() {
         return txStrategy;
     }
 
@@ -144,28 +147,12 @@ public String getOrder() {
         return order;
     }
 
-    public RecoveryStrategy getRecoveryStrategy() {
+    public CloudRecoveryStrategy getRecoveryStrategy() {
         return recoveryStrategy;
     }
 
     public Boolean getTransactionFlag() {
         return transactionFlag;
     }
 
-    public enum ChangeType {STANDARD_CODE, STANDARD_TEMPLATE, MONGOCK_EXECUTION, MONGOCK_BEFORE}
-
-    public enum AuditEntryStatus {
-        STARTED,
-        APPLIED,
-        FAILED,
-        ROLLED_BACK,
-        ROLLBACK_FAILED,
-        MANUAL_MARKED_AS_APPLIED,
-        MANUAL_MARKED_AS_ROLLED_BACK
-    }
-
-
 }
-
-
-

cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/ChangeRequest.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2025 Flamingock (https://www.flamingock.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.flamingock.cloud.api.request;
+
+
+import io.flamingock.cloud.api.vo.CloudTargetSystemAuditMarkType;
+
+//TODO add recoveryStrategy, so we can determin the acction in the server
+public class ChangeRequest {
+
+    private String id;
+
+    private CloudTargetSystemAuditMarkType ongoingStatus;
+
+    private boolean transactional;
+
+    public ChangeRequest() {
+    }
+
+    public static ChangeRequest task(String id, boolean transactional) {
+        return new ChangeRequest(id, CloudTargetSystemAuditMarkType.NONE, transactional);
+    }
+
+    public static ChangeRequest ongoingExecution(String id, boolean transactional) {
+        return new ChangeRequest(id, CloudTargetSystemAuditMarkType.APPLIED, transactional);
+    }
+
+    public static ChangeRequest ongoingRollback(String id, boolean transactional) {
+        return new ChangeRequest(id, CloudTargetSystemAuditMarkType.ROLLBACK, transactional);
+    }
+
+    public ChangeRequest(String id, CloudTargetSystemAuditMarkType ongoingStatus, boolean transactional) {
+        this.id = id;
+        this.ongoingStatus = ongoingStatus;
+        this.transactional = transactional;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public CloudTargetSystemAuditMarkType getOngoingStatus() {
+        return ongoingStatus;
+    }
+
+    public boolean isTransactional() {
+        return transactional;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setOngoingStatus(CloudTargetSystemAuditMarkType ongoingStatus) {
+        this.ongoingStatus = ongoingStatus;
+    }
+
+    public void setTransactional(boolean transactional) {
+        this.transactional = transactional;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ChangeRequest that = (ChangeRequest) o;
+        return transactional == that.transactional
+                && java.util.Objects.equals(id, that.id)
+                && java.util.Objects.equals(ongoingStatus, that.ongoingStatus);
+    }
+
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(id, ongoingStatus, transactional);
+    }
+}

cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/ClientSubmission.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/ClientSubmissionRequest.java

@@ -17,13 +17,13 @@
 
 import java.util.List;
 
-public class ClientSubmission {
+public class ClientSubmissionRequest {
     private List<StageRequest> stages;
 
-    public ClientSubmission() {
+    public ClientSubmissionRequest() {
     }
 
-    public ClientSubmission(List<StageRequest> stages) {
+    public ClientSubmissionRequest(List<StageRequest> stages) {
         this.stages = stages;
     }
 
@@ -34,4 +34,17 @@ public List<StageRequest> getStages() {
     public void setStages(List<StageRequest> stages) {
         this.stages = stages;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ClientSubmissionRequest that = (ClientSubmissionRequest) o;
+        return java.util.Objects.equals(stages, that.stages);
+    }
+
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(stages);
+    }
 }

cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/ExecutionPlanRequest.java

@@ -19,18 +19,18 @@
 
 public class ExecutionPlanRequest {
 
-    private ClientSubmission clientSubmission;
+    private ClientSubmissionRequest clientSubmission;
     private long lockAcquiredForMillis;
 
     public ExecutionPlanRequest() {
     }
 
     public ExecutionPlanRequest(long lockAcquiredForMillis, List<StageRequest> stages) {
         this.lockAcquiredForMillis = lockAcquiredForMillis;
-        this.clientSubmission = new ClientSubmission(stages);
+        this.clientSubmission = new ClientSubmissionRequest(stages);
     }
 
-    public void setClientSubmission(ClientSubmission clientSubmission) {
+    public void setClientSubmission(ClientSubmissionRequest clientSubmission) {
         this.clientSubmission = clientSubmission;
     }
 
@@ -42,7 +42,7 @@ public long getLockAcquiredForMillis() {
         return lockAcquiredForMillis;
     }
 
-    public ClientSubmission getClientSubmission() {
+    public ClientSubmissionRequest getClientSubmission() {
         return clientSubmission;
     }
 

cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/StageRequest.java

@@ -22,12 +22,12 @@ public class StageRequest {
 
     private int order;
 
-    private List<TaskRequest> tasks;
+    private List<ChangeRequest> tasks;
 
     public StageRequest() {
     }
 
-    public StageRequest(String name, int order, List<TaskRequest> tasks) {
+    public StageRequest(String name, int order, List<ChangeRequest> tasks) {
         this.name = name;
         this.order = order;
         this.tasks = tasks;
@@ -41,7 +41,7 @@ public int getOrder() {
         return order;
     }
 
-    public List<TaskRequest> getTasks() {
+    public List<ChangeRequest> getTasks() {
         return tasks;
     }
 
@@ -53,7 +53,22 @@ public void setOrder(int order) {
         this.order = order;
     }
 
-    public void setTasks(List<TaskRequest> tasks) {
+    public void setTasks(List<ChangeRequest> tasks) {
         this.tasks = tasks;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StageRequest that = (StageRequest) o;
+        return order == that.order
+                && java.util.Objects.equals(name, that.name)
+                && java.util.Objects.equals(tasks, that.tasks);
+    }
+
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(name, order, tasks);
+    }
 }