refactor/cloud api

.github/workflows/release.yml

@@ -96,6 +96,19 @@ jobs:
       FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
       FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
 
+  flamingock-bom:
+    needs: [ build ]
+    uses: ./.github/workflows/module-release-graalvm.yml
+    with:
+      module: flamingock-bom
+    secrets:
+      FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
+      FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
+      FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
+      FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
+      FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
+      FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
+
   flamingock-cloud:
     needs: [ build ]
     uses: ./.github/workflows/module-release-graalvm.yml
@@ -109,11 +122,11 @@ jobs:
       FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
       FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
 
-  flamingock-cloud-bom:
+  flamingock-cloud-api:
     needs: [ build ]
     uses: ./.github/workflows/module-release-graalvm.yml
     with:
-      module: flamingock-cloud-bom
+      module: flamingock-cloud-api
     secrets:
       FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
       FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -533,8 +546,9 @@ jobs:
       flamingock-core-commons,
       flamingock-processor,
       flamingock-graalvm,
+      flamingock-bom,
       flamingock-cloud,
-      flamingock-cloud-bom,
+      flamingock-cloud-api,
       flamingock-community,
       flamingock-community-bom,
       flamingock-mongodb-sync-auditstore,

build.gradle.kts

@@ -16,13 +16,13 @@ plugins {
 
 allprojects {
     group = "io.flamingock"
-    version = "1.2.0-SNAPSHOT"
+    version = "1.3.0-SNAPSHOT"
 
     extra["generalUtilVersion"] = "1.5.1"
     extra["templateApiVersion"] = "1.3.2"
     extra["coreApiVersion"] = "1.3.1"
-    extra["sqlVersion"] = "1.2.0-beta.5"
-    extra["mongodbTemplateVersion"] = "1.2.0-beta.4"
+    extra["sqlVersion"] = "1.2.0"
+    extra["mongodbTemplateVersion"] = "1.2.0"
 
     repositories {
         mavenLocal()

buildSrc/src/main/kotlin/flamingock.project-structure.gradle.kts

@@ -11,12 +11,13 @@ val coreProjects = setOf(
     "flamingock-template-api",
     "flamingock-processor",
     "flamingock-graalvm",
-    "flamingock-test-support"
+    "flamingock-test-support",
+    "flamingock-bom"
 )
 
 val cloudProjects = setOf(
     "flamingock-cloud",
-    "flamingock-cloud-bom"
+    "flamingock-cloud-api"
 )
 
 val communityProjects = setOf(
@@ -76,7 +77,7 @@ val allProjects = coreProjects + cloudProjects + communityProjects + pluginProje
 
 // Project classification utilities
 fun Project.isBomModule(): Boolean = name.endsWith("-bom")
-fun Project.isLibraryModule(): Boolean = name !in setOf("flamingock-community-bom", "flamingock-cloud-bom", "flamingock-community-bom")
+fun Project.isLibraryModule(): Boolean = name !in setOf("flamingock-bom", "flamingock-community-bom")
 
 // Module category lookup
 fun Project.getProjectCategory(): String? = when (name) {

buildSrc/src/main/kotlin/flamingock.publishing.gradle.kts

@@ -5,8 +5,8 @@ plugins {
 
 fun Project.isBomModule(): Boolean = name.endsWith("-bom")
 fun Project.isLibraryModule(): Boolean = name !in setOf(
-    "flamingock-community-bom",
-    "flamingock-cloud-bom"
+    "flamingock-bom",
+    "flamingock-community-bom"
 )
 
 val fromComponentPublishing = if (isBomModule()) "javaPlatform" else "java"

cloud/flamingock-cloud-api/build.gradle.kts

@@ -0,0 +1,10 @@
+dependencies {
+}
+
+description = "Cloud Edition public API definitions"
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/request/ClientSubmission.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/ClientSubmission.java

@@ -13,12 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.request;
+package io.flamingock.cloud.api.request;
 
 import java.util.List;
 
 public class ClientSubmission {
-    private final List<StageRequest> stages;
+    private List<StageRequest> stages;
+
+    public ClientSubmission() {
+    }
 
     public ClientSubmission(List<StageRequest> stages) {
         this.stages = stages;
@@ -27,4 +30,8 @@ public ClientSubmission(List<StageRequest> stages) {
     public List<StageRequest> getStages() {
         return stages;
     }
+
+    public void setStages(List<StageRequest> stages) {
+        this.stages = stages;
+    }
 }

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/request/ExecutionPlanRequest.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/ExecutionPlanRequest.java

@@ -13,27 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.request;
+package io.flamingock.cloud.api.request;
 
 import java.util.List;
 
 public class ExecutionPlanRequest {
 
-    private final long lockAcquiredForMillis;
+    private ClientSubmission clientSubmission;
+    private long lockAcquiredForMillis;
 
-    private final ClientSubmission clientSubmission;
+    public ExecutionPlanRequest() {
+    }
 
     public ExecutionPlanRequest(long lockAcquiredForMillis, List<StageRequest> stages) {
         this.lockAcquiredForMillis = lockAcquiredForMillis;
         this.clientSubmission = new ClientSubmission(stages);
     }
 
+    public void setClientSubmission(ClientSubmission clientSubmission) {
+        this.clientSubmission = clientSubmission;
+    }
+
+    public void setLockAcquiredForMillis(long lockAcquiredForMillis) {
+        this.lockAcquiredForMillis = lockAcquiredForMillis;
+    }
+
     public long getLockAcquiredForMillis() {
         return lockAcquiredForMillis;
     }
 
     public ClientSubmission getClientSubmission() {
         return clientSubmission;
     }
+
 }
 

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/request/StageRequest.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/StageRequest.java

@@ -13,16 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.request;
+package io.flamingock.cloud.api.request;
 
 import java.util.List;
 
 public class StageRequest {
-    private final String name;
+    private String name;
 
-    private final int order;
+    private int order;
 
-    private final List<TaskRequest> tasks;
+    private List<TaskRequest> tasks;
+
+    public StageRequest() {
+    }
 
     public StageRequest(String name, int order, List<TaskRequest> tasks) {
         this.name = name;
@@ -42,5 +45,15 @@ public List<TaskRequest> getTasks() {
         return tasks;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
 
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public void setTasks(List<TaskRequest> tasks) {
+        this.tasks = tasks;
+    }
 }

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/request/TaskRequest.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/request/TaskRequest.java

@@ -13,19 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.request;
+package io.flamingock.cloud.api.request;
 
 
-import io.flamingock.internal.common.cloud.vo.TargetSystemAuditMarkType;
+import io.flamingock.cloud.api.vo.TargetSystemAuditMarkType;
 
 //TODO add recoveryStrategy, so we can determin the acction in the server
 public class TaskRequest {
 
-    private final String id;
+    private String id;
 
-    private final TargetSystemAuditMarkType ongoingStatus;
+    private TargetSystemAuditMarkType ongoingStatus;
 
-    private final boolean transactional;
+    private boolean transactional;
+
+    public TaskRequest() {
+    }
 
     public static TaskRequest task(String id, boolean transactional) {
         return new TaskRequest(id, TargetSystemAuditMarkType.NONE, transactional);
@@ -56,4 +59,16 @@ public TargetSystemAuditMarkType getOngoingStatus() {
     public boolean isTransactional() {
         return transactional;
     }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setOngoingStatus(TargetSystemAuditMarkType ongoingStatus) {
+        this.ongoingStatus = ongoingStatus;
+    }
+
+    public void setTransactional(boolean transactional) {
+        this.transactional = transactional;
+    }
 }

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/response/ExecutionPlanResponse.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/response/ExecutionPlanResponse.java

@@ -13,45 +13,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.response;
+package io.flamingock.cloud.api.response;
 
-import io.flamingock.internal.common.cloud.vo.ActionResponse;
+import io.flamingock.cloud.api.vo.ExecutionAction;
 
 import java.util.Collections;
 import java.util.List;
 
 public class ExecutionPlanResponse {
 
 
-    private ActionResponse action;
+    private ExecutionAction action;
 
     private String executionId;
 
-    private LockResponse lock;
+    private LockInfo lock;
 
     private List<StageResponse> stages;
 
 
     public ExecutionPlanResponse() {
     }
 
-    public ExecutionPlanResponse(ActionResponse action,
+    public ExecutionPlanResponse(ExecutionAction action,
                                  String executionId,
-                                 LockResponse lock) {
+                                 LockInfo lock) {
         this(action, executionId, lock, Collections.emptyList());
     }
 
-    public ExecutionPlanResponse(ActionResponse action,
+    public ExecutionPlanResponse(ExecutionAction action,
                                  String executionId,
-                                 LockResponse lock,
+                                 LockInfo lock,
                                  List<StageResponse> stages) {
         this.action = action;
         this.executionId = executionId;
         this.lock = lock;
         this.stages = stages;
     }
 
-    public void setAction(ActionResponse action) {
+    public void setAction(ExecutionAction action) {
         this.action = action;
     }
 
@@ -63,11 +63,11 @@ public void setExecutionId(String executionId) {
         this.executionId = executionId;
     }
 
-    public LockResponse getLock() {
+    public LockInfo getLock() {
         return lock;
     }
 
-    public void setLock(LockResponse lock) {
+    public void setLock(LockInfo lock) {
         this.lock = lock;
     }
 
@@ -80,19 +80,19 @@ public void setStages(List<StageResponse> stages) {
     }
 
     public boolean isContinue() {
-        return action == ActionResponse.CONTINUE;
+        return action == ExecutionAction.CONTINUE;
     }
 
-    public ActionResponse getAction() {
+    public ExecutionAction getAction() {
         return action;
     }
 
     public boolean isExecute() {
-        return action == ActionResponse.EXECUTE;
+        return action == ExecutionAction.EXECUTE;
     }
 
     public boolean isAwait() {
-        return action == ActionResponse.AWAIT;
+        return action == ExecutionAction.AWAIT;
     }
 
     public void validate() {

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/response/LockResponse.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/response/LockInfo.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.response;
+package io.flamingock.cloud.api.response;
 
-public class LockResponse {
+public class LockInfo {
 
     private String key;
 
@@ -26,7 +26,7 @@ public class LockResponse {
     private long acquiredForMillis;
 
 
-    public LockResponse() {
+    public LockInfo() {
     }
 
     public String getKey() {

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/response/StageResponse.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/response/StageResponse.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.response;
+package io.flamingock.cloud.api.response;
 
 import java.util.List;
 

core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/planner/response/TaskResponse.java → cloud/flamingock-cloud-api/src/main/java/io/flamingock/cloud/api/response/TaskResponse.java

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.flamingock.internal.common.cloud.planner.response;
+package io.flamingock.cloud.api.response;
+
+import io.flamingock.cloud.api.vo.CloudChangeAction;
 
 public class TaskResponse {
     private String id;