From c972f9cecc28aad3e48ef35200e3f75f10f5ded6 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Wed, 25 Jan 2023 10:09:45 -0600 Subject: [PATCH] Update to allow _qStepTimeoutMillis to come from formBody --- .../javalin/QJavalinImplementation.java | 18 ++++++++++++++++++ .../javalin/QJavalinProcessHandler.java | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java index 92e9a1fa..99eb41ea 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java @@ -1295,6 +1295,24 @@ public class QJavalinImplementation + /******************************************************************************* + ** Returns Integer if context has a valid int form parameter by the given name, + ** Returns null if no param (or empty value). + ** Throws QValueException for malformed numbers. + *******************************************************************************/ + public static Integer integerFormParam(Context context, String name) throws QValueException + { + String value = context.formParam(name); + if(StringUtils.hasContent(value)) + { + return (ValueUtils.getValueAsInteger(value)); + } + + return (null); + } + + + /******************************************************************************* ** Returns String if context has a valid query parameter by the given name, * Returns null if no param (or empty value). diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java index ccea9e19..234a1b07 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java @@ -737,7 +737,11 @@ public class QJavalinProcessHandler Integer timeout = QJavalinImplementation.integerQueryParam(context, "_qStepTimeoutMillis"); if(timeout == null) { - timeout = ASYNC_STEP_TIMEOUT_MILLIS; + timeout = QJavalinImplementation.integerFormParam(context, "_qStepTimeoutMillis"); + if(timeout == null) + { + timeout = ASYNC_STEP_TIMEOUT_MILLIS; + } } return timeout; }