Skip to content

refactor: minor internal refactor #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dieppa merged 1 commit into from
Feb 27, 2026
+6 −7
Merged

refactor: minor internal refactor #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...main/java/io/flamingock/internal/core/task/executable/AbstractTemplateExecutableTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected void setConfigurationData(ChangeTemplate<CONFIG, ?, ?> instance) {
CONFIG data = descriptor.getConfigurationPayload();

if (data != null && Void.class != parameterClass) {
instance.setConfiguration(FileUtil.getFromMap(parameterClass, data));
instance.setConfiguration(FileUtil.convertToType(parameterClass, data));
} else if (Void.class != parameterClass) {
logger.warn("No 'Configuration' section provided for template-based change[{}] of type[{}]",
descriptor.getId(), descriptor.getTemplateClass().getName());
Expand Down
8 changes: 4 additions & 4 deletions ...core/src/main/java/io/flamingock/internal/core/task/loaded/TemplateLoadedTaskBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ private Pair<Object, Object> convertPayloads(Constructor<?> constructor, Object
Class<?> applyClass = templateInstance.getApplyPayloadClass();
Class<?> rollbackClass = templateInstance.getRollbackPayloadClass();

Object applyPayload = FileUtil.getFromMap(applyClass, applyData);
Object applyPayload = FileUtil.convertToType(applyClass, applyData);
Object rollbackPayload = null;

if (rollbackData != null && Void.class != rollbackClass) {
rollbackPayload = FileUtil.getFromMap(rollbackClass, rollbackData);
rollbackPayload = FileUtil.convertToType(rollbackClass, rollbackData);
}

return new Pair<>(applyPayload, rollbackPayload);
Expand Down Expand Up @@ -317,12 +317,12 @@ private List<TemplateStep<Object, Object>> convertSteps(Constructor<?> construct

Object applyItemData = stepMap.get("apply");
if (applyItemData != null && Void.class != applyClass) {
step.setApplyPayload(FileUtil.getFromMap(applyClass, applyItemData));
step.setApplyPayload(FileUtil.convertToType(applyClass, applyItemData));
}

Object rollbackItemData = stepMap.get("rollback");
if (rollbackItemData != null && Void.class != rollbackClass) {
step.setRollbackPayload(FileUtil.getFromMap(rollbackClass, rollbackItemData));
step.setRollbackPayload(FileUtil.convertToType(rollbackClass, rollbackItemData));
}

result.add(step);
Expand Down
3 changes: 1 addition & 2 deletions utils/general-util/src/main/java/io/flamingock/internal/util/FileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.nio.file.Files;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;

public final class FileUtil {
Expand Down Expand Up @@ -77,7 +76,7 @@ public static <T> T getFromYamlFile(File file, Class<T> type) {
}
}

public static <T> T getFromMap(Class<T> type, Object source) {
public static <T> T convertToType(Class<T> type, Object source) {
// Direct match shortcut
if (type.isInstance(source)) {
return type.cast(source);
Expand Down
Loading