diff --git a/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/executable/AbstractTemplateExecutableTask.java b/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/executable/AbstractTemplateExecutableTask.java index 0b5729ec9..818070e12 100644 --- a/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/executable/AbstractTemplateExecutableTask.java +++ b/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/executable/AbstractTemplateExecutableTask.java @@ -53,7 +53,7 @@ protected void setConfigurationData(ChangeTemplate 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()); diff --git a/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/loaded/TemplateLoadedTaskBuilder.java b/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/loaded/TemplateLoadedTaskBuilder.java index 4dc4f15c9..175dbd651 100644 --- a/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/loaded/TemplateLoadedTaskBuilder.java +++ b/core/flamingock-core/src/main/java/io/flamingock/internal/core/task/loaded/TemplateLoadedTaskBuilder.java @@ -267,11 +267,11 @@ private Pair 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); @@ -317,12 +317,12 @@ private List> 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); diff --git a/utils/general-util/src/main/java/io/flamingock/internal/util/FileUtil.java b/utils/general-util/src/main/java/io/flamingock/internal/util/FileUtil.java index f05502c41..3637e8e09 100644 --- a/utils/general-util/src/main/java/io/flamingock/internal/util/FileUtil.java +++ b/utils/general-util/src/main/java/io/flamingock/internal/util/FileUtil.java @@ -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 { @@ -77,7 +76,7 @@ public static T getFromYamlFile(File file, Class type) { } } - public static T getFromMap(Class type, Object source) { + public static T convertToType(Class type, Object source) { // Direct match shortcut if (type.isInstance(source)) { return type.cast(source);