Skip to content

Commit 2e61fe7

Browse files
committed
fix: some PR comments
1 parent 18b2194 commit 2e61fe7

File tree

4 files changed

+26
-34
lines changed

4 files changed

+26
-34
lines changed

core/flamingock-core/src/main/java/io/flamingock/internal/core/builder/runner/CliRunner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ public void run() {
9292

9393
private void writeResponse(AbstractOperationResult result, Throwable error, long durationMs) {
9494
ResponseEnvelope envelope;
95-
String operationName = flamingockArgs.getOperation().isPresent() ? flamingockArgs.getOperation().get().name() : "unknown";
95+
String operationName = flamingockArgs.getOperation()
96+
.map(Enum::name)
97+
.orElse("unknown");
9698

9799
if (error != null) {
98100
envelope = ResponseEnvelope.failure(operationName, ResponseError.from(error), durationMs);

core/flamingock-core/src/main/java/io/flamingock/internal/core/operation/AbstractPipelineTraverseOperation.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,23 @@ public AbstractPipelineTraverseOperation(RunnerId runnerId,
8585
this.finalizer = finalizer;
8686
}
8787

88+
protected abstract boolean validateOnlyMode();
89+
90+
@Override
91+
public ExecuteResult execute(ExecuteArgs args) {
92+
ExecuteResponseData result;
93+
try {
94+
result = this.execute(args.getPipeline());
95+
} catch (OperationException operationException) {
96+
throw operationException;
97+
} catch (Throwable throwable) {
98+
throw processAndGetFlamingockException(throwable, null);
99+
} finally {
100+
this.finalizer.run();
101+
}
102+
return new ExecuteResult(result);
103+
}
104+
88105
private static List<AbstractLoadedStage> validateAndGetExecutableStages(LoadedPipeline pipeline) {
89106
pipeline.validate();
90107
List<AbstractLoadedStage> stages = new ArrayList<>();
@@ -95,7 +112,7 @@ private static List<AbstractLoadedStage> validateAndGetExecutableStages(LoadedPi
95112
return stages;
96113
}
97114

98-
protected ExecuteResponseData execute(LoadedPipeline pipeline, Boolean validateOnly) throws FlamingockException {
115+
protected ExecuteResponseData execute(LoadedPipeline pipeline) throws FlamingockException {
99116
List<AbstractLoadedStage> allStages = validateAndGetExecutableStages(pipeline);
100117
int stageCount = allStages.size();
101118
long changeCount = allStages.stream()
@@ -114,7 +131,7 @@ protected ExecuteResponseData execute(LoadedPipeline pipeline, Boolean validateO
114131
execution.validate();
115132

116133
if (execution.isExecutionRequired()) {
117-
if (validateOnly) {
134+
if (validateOnlyMode()) {
118135
throw new PendingChangesException();
119136
}
120137
execution.applyOnEach((executionId, lock, executableStage) -> {

core/flamingock-core/src/main/java/io/flamingock/internal/core/operation/execute/ExecuteApplyOperation.java

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

18-
import io.flamingock.internal.common.core.response.data.ExecuteResponseData;
1918
import io.flamingock.internal.core.event.EventPublisher;
2019
import io.flamingock.internal.core.operation.AbstractPipelineTraverseOperation;
21-
import io.flamingock.internal.core.operation.OperationException;
2220
import io.flamingock.internal.core.pipeline.execution.*;
2321
import io.flamingock.internal.core.plan.ExecutionPlanner;
2422
import io.flamingock.internal.util.id.RunnerId;
@@ -39,18 +37,7 @@ public ExecuteApplyOperation(RunnerId runnerId,
3937
}
4038

4139
@Override
42-
public ExecuteResult execute(ExecuteArgs args) {
43-
ExecuteResponseData result;
44-
try {
45-
result = this.execute(args.getPipeline(), false);
46-
} catch (OperationException operationException) {
47-
result = operationException.getResult();
48-
throw operationException;
49-
} catch (Throwable throwable) {
50-
throw processAndGetFlamingockException(throwable, null);
51-
} finally {
52-
finalizer.run();
53-
}
54-
return new ExecuteResult(result);
40+
protected boolean validateOnlyMode() {
41+
return false;
5542
}
5643
}

core/flamingock-core/src/main/java/io/flamingock/internal/core/operation/validate/ValidateOperation.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
*/
1616
package io.flamingock.internal.core.operation.validate;
1717

18-
import io.flamingock.internal.common.core.error.FlamingockException;
1918
import io.flamingock.internal.common.core.error.PendingChangesException;
20-
import io.flamingock.internal.common.core.response.data.ExecuteResponseData;
2119
import io.flamingock.internal.core.event.EventPublisher;
2220
import io.flamingock.internal.core.operation.AbstractPipelineTraverseOperation;
23-
import io.flamingock.internal.core.operation.execute.ExecuteArgs;
24-
import io.flamingock.internal.core.operation.execute.ExecuteResult;
2521
import io.flamingock.internal.core.pipeline.execution.OrphanExecutionContext;
2622
import io.flamingock.internal.core.pipeline.execution.StageExecutor;
2723
import io.flamingock.internal.core.plan.ExecutionPlanner;
@@ -44,17 +40,7 @@ public ValidateOperation(RunnerId runnerId,
4440
}
4541

4642
@Override
47-
public ExecuteResult execute(ExecuteArgs args) {
48-
ExecuteResponseData result;
49-
try {
50-
result = super.execute(args.getPipeline(), true);
51-
} catch (FlamingockException flamingockException) {
52-
throw flamingockException;
53-
} catch (Throwable throwable) {
54-
throw new FlamingockException(throwable);
55-
} finally {
56-
super.finalizer.run();
57-
}
58-
return new ExecuteResult(result);
43+
protected boolean validateOnlyMode() {
44+
return true;
5945
}
6046
}

0 commit comments

Comments
 (0)