Skip to content

Commit 2573113

Browse files
dieppadieppa
authored
refactor/cloud api (#883)
1 parent b3acfeb commit 2573113

File tree

48 files changed

+293
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+293
-157
lines changed

‎.github/workflows/release.yml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,19 @@ jobs:
9696
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
9797
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
9898

99+
flamingock-bom:
100+
needs: [ build ]
101+
uses: ./.github/workflows/module-release-graalvm.yml
102+
with:
103+
module: flamingock-bom
104+
secrets:
105+
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
106+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
107+
FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_PASSWORD }}
108+
FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PUBLIC_KEY }}
109+
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
110+
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
111+
99112
flamingock-cloud:
100113
needs: [ build ]
101114
uses: ./.github/workflows/module-release-graalvm.yml
@@ -109,11 +122,11 @@ jobs:
109122
FLAMINGOCK_JRELEASER_GPG_SECRET_KEY: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_SECRET_KEY }}
110123
FLAMINGOCK_JRELEASER_GPG_PASSPHRASE: ${{ secrets.FLAMINGOCK_JRELEASER_GPG_PASSPHRASE }}
111124

112-
flamingock-cloud-bom:
125+
flamingock-cloud-api:
113126
needs: [ build ]
114127
uses: ./.github/workflows/module-release-graalvm.yml
115128
with:
116-
module: flamingock-cloud-bom
129+
module: flamingock-cloud-api
117130
secrets:
118131
FLAMINGOCK_JRELEASER_GITHUB_TOKEN: ${{ secrets.FLAMINGOCK_JRELEASER_GITHUB_TOKEN }}
119132
FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.FLAMINGOCK_JRELEASER_MAVENCENTRAL_USERNAME }}
@@ -533,8 +546,9 @@ jobs:
533546
flamingock-core-commons,
534547
flamingock-processor,
535548
flamingock-graalvm,
549+
flamingock-bom,
536550
flamingock-cloud,
537-
flamingock-cloud-bom,
551+
flamingock-cloud-api,
538552
flamingock-community,
539553
flamingock-community-bom,
540554
flamingock-mongodb-sync-auditstore,

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ plugins {
1616

1717
allprojects {
1818
group = "io.flamingock"
19-
version = "1.2.0-SNAPSHOT"
19+
version = "1.3.0-SNAPSHOT"
2020

2121
extra["generalUtilVersion"] = "1.5.1"
2222
extra["templateApiVersion"] = "1.3.2"
2323
extra["coreApiVersion"] = "1.3.1"
24-
extra["sqlVersion"] = "1.2.0-beta.5"
25-
extra["mongodbTemplateVersion"] = "1.2.0-beta.4"
24+
extra["sqlVersion"] = "1.2.0"
25+
extra["mongodbTemplateVersion"] = "1.2.0"
2626

2727
repositories {
2828
mavenLocal()

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ val coreProjects = setOf(
1111
"flamingock-template-api",
1212
"flamingock-processor",
1313
"flamingock-graalvm",
14-
"flamingock-test-support"
14+
"flamingock-test-support",
15+
"flamingock-bom"
1516
)
1617

1718
val cloudProjects = setOf(
1819
"flamingock-cloud",
19-
"flamingock-cloud-bom"
20+
"flamingock-cloud-api"
2021
)
2122

2223
val communityProjects = setOf(
@@ -76,7 +77,7 @@ val allProjects = coreProjects + cloudProjects + communityProjects + pluginProje
7677

7778
// Project classification utilities
7879
fun Project.isBomModule(): Boolean = name.endsWith("-bom")
79-
fun Project.isLibraryModule(): Boolean = name !in setOf("flamingock-community-bom", "flamingock-cloud-bom", "flamingock-community-bom")
80+
fun Project.isLibraryModule(): Boolean = name !in setOf("flamingock-bom", "flamingock-community-bom")
8081

8182
// Module category lookup
8283
fun Project.getProjectCategory(): String? = when (name) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55

66
fun Project.isBomModule(): Boolean = name.endsWith("-bom")
77
fun Project.isLibraryModule(): Boolean = name !in setOf(
8-
"flamingock-community-bom",
9-
"flamingock-cloud-bom"
8+
"flamingock-bom",
9+
"flamingock-community-bom"
1010
)
1111

1212
val fromComponentPublishing = if (isBomModule()) "javaPlatform" else "java"

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
dependencies {
2+
}
3+
4+
description = "Cloud Edition public API definitions"
5+
6+
java {
7+
toolchain {
8+
languageVersion.set(JavaLanguageVersion.of(8))
9+
}
10+
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.flamingock.internal.common.cloud.planner.request;
16+
package io.flamingock.cloud.api.request;
1717

1818
import java.util.List;
1919

2020
public class ClientSubmission {
21-
private final List<StageRequest> stages;
21+
private List<StageRequest> stages;
22+
23+
public ClientSubmission() {
24+
}
2225

2326
public ClientSubmission(List<StageRequest> stages) {
2427
this.stages = stages;
@@ -27,4 +30,8 @@ public ClientSubmission(List<StageRequest> stages) {
2730
public List<StageRequest> getStages() {
2831
return stages;
2932
}
33+
34+
public void setStages(List<StageRequest> stages) {
35+
this.stages = stages;
36+
}
3037
}

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,38 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.flamingock.internal.common.cloud.planner.request;
16+
package io.flamingock.cloud.api.request;
1717

1818
import java.util.List;
1919

2020
public class ExecutionPlanRequest {
2121

22-
private final long lockAcquiredForMillis;
22+
private ClientSubmission clientSubmission;
23+
private long lockAcquiredForMillis;
2324

24-
private final ClientSubmission clientSubmission;
25+
public ExecutionPlanRequest() {
26+
}
2527

2628
public ExecutionPlanRequest(long lockAcquiredForMillis, List<StageRequest> stages) {
2729
this.lockAcquiredForMillis = lockAcquiredForMillis;
2830
this.clientSubmission = new ClientSubmission(stages);
2931
}
3032

33+
public void setClientSubmission(ClientSubmission clientSubmission) {
34+
this.clientSubmission = clientSubmission;
35+
}
36+
37+
public void setLockAcquiredForMillis(long lockAcquiredForMillis) {
38+
this.lockAcquiredForMillis = lockAcquiredForMillis;
39+
}
40+
3141
public long getLockAcquiredForMillis() {
3242
return lockAcquiredForMillis;
3343
}
3444

3545
public ClientSubmission getClientSubmission() {
3646
return clientSubmission;
3747
}
48+
3849
}
3950

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,19 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.flamingock.internal.common.cloud.planner.request;
16+
package io.flamingock.cloud.api.request;
1717

1818
import java.util.List;
1919

2020
public class StageRequest {
21-
private final String name;
21+
private String name;
2222

23-
private final int order;
23+
private int order;
2424

25-
private final List<TaskRequest> tasks;
25+
private List<TaskRequest> tasks;
26+
27+
public StageRequest() {
28+
}
2629

2730
public StageRequest(String name, int order, List<TaskRequest> tasks) {
2831
this.name = name;
@@ -42,5 +45,15 @@ public List<TaskRequest> getTasks() {
4245
return tasks;
4346
}
4447

48+
public void setName(String name) {
49+
this.name = name;
50+
}
4551

52+
public void setOrder(int order) {
53+
this.order = order;
54+
}
55+
56+
public void setTasks(List<TaskRequest> tasks) {
57+
this.tasks = tasks;
58+
}
4659
}

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,22 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.flamingock.internal.common.cloud.planner.request;
16+
package io.flamingock.cloud.api.request;
1717

1818

19-
import io.flamingock.internal.common.cloud.vo.TargetSystemAuditMarkType;
19+
import io.flamingock.cloud.api.vo.TargetSystemAuditMarkType;
2020

2121
//TODO add recoveryStrategy, so we can determin the acction in the server
2222
public class TaskRequest {
2323

24-
private final String id;
24+
private String id;
2525

26-
private final TargetSystemAuditMarkType ongoingStatus;
26+
private TargetSystemAuditMarkType ongoingStatus;
2727

28-
private final boolean transactional;
28+
private boolean transactional;
29+
30+
public TaskRequest() {
31+
}
2932

3033
public static TaskRequest task(String id, boolean transactional) {
3134
return new TaskRequest(id, TargetSystemAuditMarkType.NONE, transactional);
@@ -56,4 +59,16 @@ public TargetSystemAuditMarkType getOngoingStatus() {
5659
public boolean isTransactional() {
5760
return transactional;
5861
}
62+
63+
public void setId(String id) {
64+
this.id = id;
65+
}
66+
67+
public void setOngoingStatus(TargetSystemAuditMarkType ongoingStatus) {
68+
this.ongoingStatus = ongoingStatus;
69+
}
70+
71+
public void setTransactional(boolean transactional) {
72+
this.transactional = transactional;
73+
}
5974
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,45 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.flamingock.internal.common.cloud.planner.response;
16+
package io.flamingock.cloud.api.response;
1717

18-
import io.flamingock.internal.common.cloud.vo.ActionResponse;
18+
import io.flamingock.cloud.api.vo.ExecutionAction;
1919

2020
import java.util.Collections;
2121
import java.util.List;
2222

2323
public class ExecutionPlanResponse {
2424

2525

26-
private ActionResponse action;
26+
private ExecutionAction action;
2727

2828
private String executionId;
2929

30-
private LockResponse lock;
30+
private LockInfo lock;
3131

3232
private List<StageResponse> stages;
3333

3434

3535
public ExecutionPlanResponse() {
3636
}
3737

38-
public ExecutionPlanResponse(ActionResponse action,
38+
public ExecutionPlanResponse(ExecutionAction action,
3939
String executionId,
40-
LockResponse lock) {
40+
LockInfo lock) {
4141
this(action, executionId, lock, Collections.emptyList());
4242
}
4343

44-
public ExecutionPlanResponse(ActionResponse action,
44+
public ExecutionPlanResponse(ExecutionAction action,
4545
String executionId,
46-
LockResponse lock,
46+
LockInfo lock,
4747
List<StageResponse> stages) {
4848
this.action = action;
4949
this.executionId = executionId;
5050
this.lock = lock;
5151
this.stages = stages;
5252
}
5353

54-
public void setAction(ActionResponse action) {
54+
public void setAction(ExecutionAction action) {
5555
this.action = action;
5656
}
5757

@@ -63,11 +63,11 @@ public void setExecutionId(String executionId) {
6363
this.executionId = executionId;
6464
}
6565

66-
public LockResponse getLock() {
66+
public LockInfo getLock() {
6767
return lock;
6868
}
6969

70-
public void setLock(LockResponse lock) {
70+
public void setLock(LockInfo lock) {
7171
this.lock = lock;
7272
}
7373

@@ -80,19 +80,19 @@ public void setStages(List<StageResponse> stages) {
8080
}
8181

8282
public boolean isContinue() {
83-
return action == ActionResponse.CONTINUE;
83+
return action == ExecutionAction.CONTINUE;
8484
}
8585

86-
public ActionResponse getAction() {
86+
public ExecutionAction getAction() {
8787
return action;
8888
}
8989

9090
public boolean isExecute() {
91-
return action == ActionResponse.EXECUTE;
91+
return action == ExecutionAction.EXECUTE;
9292
}
9393

9494
public boolean isAwait() {
95-
return action == ActionResponse.AWAIT;
95+
return action == ExecutionAction.AWAIT;
9696
}
9797

9898
public void validate() {

0 commit comments

Comments
 (0)