Skip to content

Commit ced409c

Browse files
dieppadieppa
authored
feat: order only from file and class name (#393)
1 parent 645849c commit ced409c

120 files changed

Lines changed: 790 additions & 651 deletions

File tree

Some content is hidden

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

‎cloud/flamingock-cloud/src/test/java/io/flamingock/cloud/audit/HttpAuditWriterMapperTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@
3030
class HttpAuditWriterMapperTest {
3131

3232
// Test classes for different recovery strategies
33-
@Change(id = "test-manual", order = "001", author = "aperezdieppa")
33+
@Change(id = "test-manual", author = "aperezdieppa")
3434
@Recovery(strategy = RecoveryStrategy.MANUAL_INTERVENTION)
35-
static class TestManualInterventionChange {
35+
static class _001__TestManualInterventionChange {
3636
@Apply
3737
public void execute() {}
3838
}
3939

40-
@Change(id = "test-default", order = "001", author = "aperezdieppa")
41-
static class TestDefaultRecoveryChange {
40+
@Change(id = "test-default", author = "aperezdieppa")
41+
static class _001__TestDefaultRecoveryChange {
4242
@Apply
4343
public void execute() {}
4444
}
4545

4646
@Test
4747
void shouldIncludeTxTypeInRequest() {
4848
// Given
49-
AuditEntry auditEntry = AuditEntryTestFactory.createTestAuditEntry("test-change", AuditEntry.Status.APPLIED, AuditTxType.TX_SHARED, TestManualInterventionChange.class);
49+
AuditEntry auditEntry = AuditEntryTestFactory.createTestAuditEntry("test-change", AuditEntry.Status.APPLIED, AuditTxType.TX_SHARED, _001__TestManualInterventionChange.class);
5050

5151
// When
5252
AuditEntryRequest request = new AuditEntryRequest(
@@ -77,7 +77,7 @@ void shouldIncludeTxTypeInRequest() {
7777
@Test
7878
void shouldHandleNullTxType() {
7979
// Given
80-
AuditEntry auditEntry = AuditEntryTestFactory.createTestAuditEntry("test-change", AuditEntry.Status.APPLIED, null, TestDefaultRecoveryChange.class);
80+
AuditEntry auditEntry = AuditEntryTestFactory.createTestAuditEntry("test-change", AuditEntry.Status.APPLIED, null, _001__TestDefaultRecoveryChange.class);
8181

8282
// When
8383
AuditEntryRequest request = new AuditEntryRequest(

‎cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/CloudAuditPersistenceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import io.flamingock.api.annotations.EnableFlamingock;
1919
import io.flamingock.api.annotations.Stage;
20-
import io.flamingock.core.cloud.changes.CloudChange1;
21-
import io.flamingock.core.cloud.changes.CloudChange2;
20+
import io.flamingock.core.cloud.changes._001__CloudChange1;
21+
import io.flamingock.core.cloud.changes._002__CloudChange2;
2222
import io.flamingock.targetsystem.nontransactional.NonTransactionalTargetSystem;
2323
import io.flamingock.common.test.cloud.deprecated.AuditEntryMatcher;
2424
import io.flamingock.common.test.cloud.deprecated.MockRunnerServerOld;
@@ -81,15 +81,15 @@ static void beforeAll() {
8181
AuditEntryMatcher(
8282
"create-persons-table-from-template",
8383
AuditEntryRequest.Status.APPLIED,
84-
CloudChange1.class.getName(),
84+
_001__CloudChange1.class.getName(),
8585
"execution"
8686
));
8787
auditEntryExpectations.add(new
8888

8989
AuditEntryMatcher(
9090
"create-persons-table-from-template-2",
9191
AuditEntryRequest.Status.APPLIED,
92-
CloudChange2.class.getName(),
92+
_002__CloudChange2.class.getName(),
9393
"execution"
9494
));
9595
}

‎cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/CloudTransactionTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.flamingock.core.cloud;
1717

18-
import io.flamingock.core.cloud.changes.CloudChange1;
19-
import io.flamingock.core.cloud.changes.CloudChange2;
18+
import io.flamingock.core.cloud.changes._001__CloudChange1;
19+
import io.flamingock.core.cloud.changes._002__CloudChange2;
2020
import io.flamingock.core.cloud.utils.TestCloudTargetSystem;
2121
import io.flamingock.common.test.cloud.deprecated.AuditEntryMatcher;
2222
import io.flamingock.common.test.cloud.deprecated.MockRunnerServerOld;
@@ -74,15 +74,15 @@ static void beforeAll() {
7474
AuditEntryMatcher(
7575
"create-persons-table-from-template",
7676
AuditEntryRequest.Status.APPLIED,
77-
CloudChange1.class.getName(),
77+
_001__CloudChange1.class.getName(),
7878
"execution"
7979
));
8080
auditEntries.add(new
8181

8282
AuditEntryMatcher(
8383
"create-persons-table-from-template-2",
8484
AuditEntryRequest.Status.APPLIED,
85-
CloudChange2.class.getName(),
85+
_002__CloudChange2.class.getName(),
8686
"execution"
8787
));
8888
}

cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/changes/CloudChange1.java renamed to cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/changes/_001__CloudChange1.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import io.flamingock.core.utils.TaskExecutionChecker;
2222

2323
@TargetSystem(id = "auth0")
24-
@Change(id = "create-persons-table-from-template", order = "001", author = "aperezdieppa")
25-
public class CloudChange1 {
24+
@Change(id = "create-persons-table-from-template", author = "aperezdieppa")
25+
public class _001__CloudChange1 {
2626
public static final TaskExecutionChecker checker = new TaskExecutionChecker();
2727

2828
@Apply
@@ -31,4 +31,4 @@ public void execution() {
3131
}
3232

3333

34-
}
34+
}

cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/changes/CloudChange2.java renamed to cloud/flamingock-cloud/src/test/java/io/flamingock/core/cloud/changes/_002__CloudChange2.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import io.flamingock.core.utils.TaskExecutionChecker;
2222

2323
@TargetSystem(id = "auth0")
24-
@Change(id = "create-persons-table-from-template-2", order = "002", author = "aperezdieppa")
25-
public class CloudChange2 {
24+
@Change(id = "create-persons-table-from-template-2", author = "aperezdieppa")
25+
public class _002__CloudChange2 {
2626
public static final TaskExecutionChecker checker = new TaskExecutionChecker();
2727

2828
@Apply
@@ -31,4 +31,4 @@ public void execution() {
3131
}
3232

3333

34-
}
34+
}

‎community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/CouchbaseAuditStoreTest.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
import com.couchbase.client.java.Cluster;
2121
import com.couchbase.client.java.Collection;
2222
import com.couchbase.client.java.json.JsonObject;
23+
import io.flamingock.community.couchbase.changes.failedWithoutRollback._001__create_index;
24+
import io.flamingock.community.couchbase.changes.failedWithoutRollback._002__insert_document;
25+
import io.flamingock.community.couchbase.changes.failedWithoutRollback._003__execution_with_exception;
26+
import io.flamingock.community.couchbase.changes.happyPath._003__insert_another_document;
2327
import io.flamingock.community.couchbase.driver.CouchbaseAuditStore;
2428
import io.flamingock.targetsystem.couchbase.CouchbaseTargetSystem;
2529
import io.flamingock.core.processor.util.Deserializer;
@@ -87,9 +91,9 @@ void happyPath() {
8791

8892
try (MockedStatic<Deserializer> mocked = Mockito.mockStatic(Deserializer.class)) {
8993
mocked.when(Deserializer::readPreviewPipelineFromFile).thenReturn(PipelineTestHelper.getPreviewPipeline(
90-
new Trio<>(io.flamingock.community.couchbase.changes.happyPath._001_create_index.class, Collections.singletonList(Collection.class)),
91-
new Trio<>(io.flamingock.community.couchbase.changes.happyPath._002_insert_document.class, Collections.singletonList(Collection.class)),
92-
new Trio<>(io.flamingock.community.couchbase.changes.happyPath._003_insert_another_document.class, Collections.singletonList(Collection.class)))
94+
new Trio<>(io.flamingock.community.couchbase.changes.happyPath._001__create_index.class, Collections.singletonList(Collection.class)),
95+
new Trio<>(io.flamingock.community.couchbase.changes.happyPath._002__insert_document.class, Collections.singletonList(Collection.class)),
96+
new Trio<>(_003__insert_another_document.class, Collections.singletonList(Collection.class)))
9397
);
9498

9599
FlamingockFactory.getCommunityBuilder()
@@ -133,9 +137,9 @@ void failedWithRollback() {
133137

134138
try (MockedStatic<Deserializer> mocked = Mockito.mockStatic(Deserializer.class)) {
135139
mocked.when(Deserializer::readPreviewPipelineFromFile).thenReturn(PipelineTestHelper.getPreviewPipeline(
136-
new Trio<>(io.flamingock.community.couchbase.changes.failedWithRollback._001_create_index.class, Collections.singletonList(Collection.class)),
137-
new Trio<>(io.flamingock.community.couchbase.changes.failedWithRollback._002_insert_document.class, Collections.singletonList(Collection.class)),
138-
new Trio<>(io.flamingock.community.couchbase.changes.failedWithRollback._003_execution_with_exception.class, Collections.singletonList(Collection.class)))
140+
new Trio<>(io.flamingock.community.couchbase.changes.failedWithRollback._001__create_index.class, Collections.singletonList(Collection.class)),
141+
new Trio<>(io.flamingock.community.couchbase.changes.failedWithRollback._002__insert_document.class, Collections.singletonList(Collection.class)),
142+
new Trio<>(io.flamingock.community.couchbase.changes.failedWithRollback._003__execution_with_exception.class, Collections.singletonList(Collection.class)))
139143
);
140144

141145
assertThrows(PipelineExecutionException.class, () -> {
@@ -178,9 +182,9 @@ void failedWithoutRollback() {
178182

179183
try (MockedStatic<Deserializer> mocked = Mockito.mockStatic(Deserializer.class)) {
180184
mocked.when(Deserializer::readPreviewPipelineFromFile).thenReturn(PipelineTestHelper.getPreviewPipeline(
181-
new Trio<>(io.flamingock.community.couchbase.changes.failedWithoutRollback._001_create_index.class, Collections.singletonList(Collection.class)),
182-
new Trio<>(io.flamingock.community.couchbase.changes.failedWithoutRollback._002_insert_document.class, Collections.singletonList(Collection.class)),
183-
new Trio<>(io.flamingock.community.couchbase.changes.failedWithoutRollback._003_execution_with_exception.class, Collections.singletonList(Collection.class)))
185+
new Trio<>(_001__create_index.class, Collections.singletonList(Collection.class)),
186+
new Trio<>(_002__insert_document.class, Collections.singletonList(Collection.class)),
187+
new Trio<>(_003__execution_with_exception.class, Collections.singletonList(Collection.class)))
184188
);
185189

186190
assertThrows(PipelineExecutionException.class, () -> {

‎community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/PipelineTestHelper.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.flamingock.api.annotations.TargetSystem;
2020
import io.flamingock.internal.common.core.task.RecoveryDescriptor;
2121
import io.flamingock.internal.common.core.task.TargetSystemDescriptor;
22+
import io.flamingock.internal.core.task.loaded.ChangeOrderUtil;
2223
import io.flamingock.internal.util.Pair;
2324
import io.flamingock.internal.util.Trio;
2425
import io.flamingock.api.annotations.Change;
@@ -41,7 +42,9 @@ public class PipelineTestHelper {
4142
Change ann = c.getAnnotation(Change.class);
4243
TargetSystem targetSystemAnn = c.getAnnotation(TargetSystem.class);
4344
String targetSystemId = targetSystemAnn != null ? targetSystemAnn.id() : null;
44-
return new ChangeInfo(ann.id(), ann.order(), ann.author(), targetSystemId, ann.transactional());
45+
String changeId = ann.id();
46+
String order = ChangeOrderUtil.getMatchedOrderFromClassName(changeId, null, c.getName());
47+
return new ChangeInfo(changeId, order, ann.author(), targetSystemId, ann.transactional());
4548
};
4649

4750
@NotNull

community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/changes/failedWithRollback/_001_create_index.java renamed to community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/changes/failedWithRollback/_001__create_index.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import java.util.Arrays;
2323

2424
@TargetSystem(id = "couchbase")
25-
@Change(id = "create-index", order = "001", transactional = false, author = "aperezdieppa")
26-
public class _001_create_index {
25+
@Change(id = "create-index", transactional = false, author = "aperezdieppa")
26+
public class _001__create_index {
2727

2828
@Apply
2929
public void execution(Collection collection) {

community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/changes/failedWithRollback/_002_insert_document.java renamed to community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/changes/failedWithRollback/_002__insert_document.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import io.flamingock.api.annotations.Rollback;
2424

2525
@TargetSystem(id = "couchbase")
26-
@Change( id="insert-document" , order = "002", transactional = false, author = "aperezdieppa")
27-
public class _002_insert_document {
26+
@Change( id="insert-document" , transactional = false, author = "aperezdieppa")
27+
public class _002__insert_document {
2828

2929
@Apply
3030
public void execution(Collection collection) {

community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/changes/failedWithRollback/_003_execution_with_exception.java renamed to community/flamingock-auditstore-couchbase/src/test/java/io/flamingock/community/couchbase/changes/failedWithRollback/_003__execution_with_exception.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import io.flamingock.api.annotations.Rollback;
2424

2525
@TargetSystem(id = "couchbase")
26-
@Change( id="execution-with-exception" , order = "003", transactional = false, author = "aperezdieppa")
27-
public class _003_execution_with_exception {
26+
@Change( id="execution-with-exception", transactional = false, author = "aperezdieppa")
27+
public class _003__execution_with_exception {
2828

2929
@Apply
3030
public void execution(Collection collection) {

0 commit comments

Comments
 (0)