QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPEs

Browse Source
This commit is contained in:
darin.kelkhoff
2023-06-21 16:23:19 -05:00
parent a367ec717c
commit 18c11d3869
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
View File

@ -1083,7 +1083,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
}
String description = "Value for the " + fieldLabel + " field.";
if(apiFieldMetaData.getDescription() != null)
if(apiFieldMetaData != null && apiFieldMetaData.getDescription() != null)
{
description = apiFieldMetaData.getDescription();
}

18
qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/utils/ApiScriptUtils.java
View File

@ -298,15 +298,19 @@ public class ApiScriptUtils implements QCodeExecutorAware, Serializable
{
validateApiNameAndVersion("runProcess(" + processApiName + ")");
Map<String, String> paramMap = new LinkedHashMap<>();
params = processBodyToJsonString(params);
String paramsString = ValueUtils.getValueAsString(params);
if(StringUtils.hasContent(paramsString))
Map<String, String> paramMap = new LinkedHashMap<>();
if(params != null)
{
JSONObject paramsJSON = new JSONObject(paramsString);
for(String fieldName : paramsJSON.keySet())
params = processBodyToJsonString(params);
String paramsString = ValueUtils.getValueAsString(params);
if(StringUtils.hasContent(paramsString))
{
paramMap.put(fieldName, paramsJSON.optString(fieldName));
JSONObject paramsJSON = new JSONObject(paramsString);
for(String fieldName : paramsJSON.keySet())
{
paramMap.put(fieldName, paramsJSON.optString(fieldName));
}
}
}