Skip to content

Commit b73bd87

Browse files
committed
chore: bump flamingock-java version
1 parent 227eb6a commit b73bd87

3 files changed

Lines changed: 15 additions & 9 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description = "Flamingock CLI for executing changes in applications"
99

1010
val jacksonVersion = "2.16.0"
1111
val picocliVersion = "4.7.5"
12-
val flamingockVersion = "1.3.0"
12+
val flamingockVersion = "1.4.0"
1313

1414
repositories {
1515
mavenLocal() // For local development with unpublished versions

src/main/java/io/flamingock/cli/executor/output/ExecutionResultFormatter.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ public static String format(ExecuteResponseData result) {
5858
sb.append(formatStagesSummary(result));
5959
sb.append(formatChangesSummary(result));
6060

61-
// Print error details if failed
62-
if (result.isFailed() && result.getError() != null) {
63-
sb.append(formatErrorDetails(result.getError()));
61+
// Print error details from failed stages
62+
if (result.isFailed()) {
63+
for (StageResult stage : result.getStages()) {
64+
if (stage.isFailed() && stage.getState().getErrorInfo().isPresent()) {
65+
sb.append(formatErrorDetails(stage.getState().getErrorInfo().get()));
66+
}
67+
}
6468
}
6569

6670
sb.append(SEPARATOR).append("\n");
@@ -149,8 +153,9 @@ private static String formatStagesSummary(ExecuteResponseData result) {
149153
* Formats the changes summary line.
150154
*/
151155
private static String formatChangesSummary(ExecuteResponseData result) {
156+
int skipped = result.getAlreadyAppliedChanges() + result.getNotReachedChanges();
152157
return String.format(" Changes: %d applied, %d skipped, %d failed%n",
153-
result.getAppliedChanges(), result.getSkippedChanges(), result.getFailedChanges());
158+
result.getAppliedChanges(), skipped, result.getFailedChanges());
154159
}
155160

156161
/**
@@ -159,8 +164,8 @@ private static String formatChangesSummary(ExecuteResponseData result) {
159164
private static String formatErrorDetails(ErrorInfo error) {
160165
StringBuilder sb = new StringBuilder();
161166
sb.append("\n Error:\n");
162-
if (error.getChangeId() != null) {
163-
sb.append(String.format(" Change: %s%n", error.getChangeId()));
167+
if (error.getChangeIds() != null && !error.getChangeIds().isEmpty()) {
168+
sb.append(String.format(" Changes: %s%n", String.join(", ", error.getChangeIds())));
164169
}
165170
if (error.getStageId() != null) {
166171
sb.append(String.format(" Stage: %s%n", error.getStageId()));

src/test/java/io/flamingock/cli/executor/result/ResponseResultReaderTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ void shouldParseValidExecuteResponse() throws IOException {
6464
" \"failedStages\": 0,\n" +
6565
" \"totalChanges\": 5,\n" +
6666
" \"appliedChanges\": 3,\n" +
67-
" \"skippedChanges\": 2,\n" +
67+
" \"alreadyAppliedChanges\": 2,\n" +
68+
" \"notReachedChanges\": 0,\n" +
6869
" \"failedChanges\": 0,\n" +
6970
" \"totalDurationMs\": 1200\n" +
7071
" }\n" +
@@ -85,7 +86,7 @@ void shouldParseValidExecuteResponse() throws IOException {
8586
assertEquals(2, result.getData().getCompletedStages());
8687
assertEquals(5, result.getData().getTotalChanges());
8788
assertEquals(3, result.getData().getAppliedChanges());
88-
assertEquals(2, result.getData().getSkippedChanges());
89+
assertEquals(2, result.getData().getAlreadyAppliedChanges());
8990
assertEquals(0, result.getData().getFailedChanges());
9091
assertEquals(1500, result.getDurationMs());
9192
}

0 commit comments

Comments
 (0)