From 29e407b78238dd3ec60dec5e2bbdc0a1d6089876 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Tue, 11 Feb 2025 12:25:31 -0600 Subject: [PATCH] CE-2261: removed depricated calls with actionInput --- .../actions/templates/RenderTemplateAction.java | 3 +-- .../templates/RenderTemplateActionTest.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java index 6e0c068a..777b9c41 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java @@ -27,7 +27,6 @@ import java.util.Map; import com.kingsrook.qqq.backend.core.actions.AbstractQActionFunction; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; -import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput; import com.kingsrook.qqq.backend.core.model.actions.templates.RenderTemplateInput; import com.kingsrook.qqq.backend.core.model.actions.templates.RenderTemplateOutput; import com.kingsrook.qqq.backend.core.model.templates.TemplateType; @@ -107,7 +106,7 @@ public class RenderTemplateAction extends AbstractQActionFunction context, String code) throws QException + public static String renderVelocity(Map context, String code) throws QException { return (render(TemplateType.VELOCITY, context, code)); } diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateActionTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateActionTest.java index 1f448b69..33c36769 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateActionTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateActionTest.java @@ -66,16 +66,14 @@ public class RenderTemplateActionTest extends BaseTest @Test void testConvenientWrapper() throws QException { - RenderTemplateInput parentActionInput = new RenderTemplateInput(); - String template = "Hello, $name"; - assertEquals("Hello, Darin", RenderTemplateAction.renderVelocity(parentActionInput, Map.of("name", "Darin"), template)); - assertEquals("Hello, Tim", RenderTemplateAction.renderVelocity(parentActionInput, Map.of("name", "Tim"), template)); - assertEquals("Hello, $name", RenderTemplateAction.renderVelocity(parentActionInput, Map.of(), template)); + assertEquals("Hello, Darin", RenderTemplateAction.renderVelocity(Map.of("name", "Darin"), template)); + assertEquals("Hello, Tim", RenderTemplateAction.renderVelocity(Map.of("name", "Tim"), template)); + assertEquals("Hello, $name", RenderTemplateAction.renderVelocity(Map.of(), template)); template = "Hello, $!name"; - assertEquals("Hello, ", RenderTemplateAction.renderVelocity(parentActionInput, Map.of(), template)); - assertEquals("Hello, ", RenderTemplateAction.renderVelocity(parentActionInput, null, template)); + assertEquals("Hello, ", RenderTemplateAction.renderVelocity(Map.of(), template)); + assertEquals("Hello, ", RenderTemplateAction.renderVelocity(null, template)); } @@ -128,4 +126,4 @@ public class RenderTemplateActionTest extends BaseTest throw (new Exception("You asked to throw...")); } -} \ No newline at end of file +}