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

More consistent behavior of field labels & descriptions everywhere

Browse Source
This commit is contained in:
darin.kelkhoff
2023-06-21 16:17:32 -05:00
parent 6bfe0cd3ea
commit 900484c01c
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -913,7 +913,13 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
ApiFieldMetaDataContainer apiFieldMetaDataContainer = ApiFieldMetaDataContainer.ofOrNew(bodyField); ApiFieldMetaDataContainer apiFieldMetaDataContainer = ApiFieldMetaDataContainer.ofOrNew(bodyField);
ApiFieldMetaData apiFieldMetaData = apiFieldMetaDataContainer.getApiFieldMetaData(apiInstanceMetaData.getName()); ApiFieldMetaData apiFieldMetaData = apiFieldMetaDataContainer.getApiFieldMetaData(apiInstanceMetaData.getName());
String bodyDescription = "Value for the " + bodyField.getLabel(); String fieldLabel = bodyField.getLabel();
if(!StringUtils.hasContent(fieldLabel))
{
fieldLabel = QInstanceEnricher.nameToLabel(bodyField.getName());
}
String bodyDescription = "Value for the " + fieldLabel;
if(apiFieldMetaData != null && StringUtils.hasContent(apiFieldMetaData.getDescription())) if(apiFieldMetaData != null && StringUtils.hasContent(apiFieldMetaData.getDescription()))
{ {
bodyDescription = apiFieldMetaData.getDescription(); bodyDescription = apiFieldMetaData.getDescription();
@ -1070,7 +1076,18 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
ApiFieldMetaDataContainer apiFieldMetaDataContainer = ApiFieldMetaDataContainer.ofOrNew(field); ApiFieldMetaDataContainer apiFieldMetaDataContainer = ApiFieldMetaDataContainer.ofOrNew(field);
ApiFieldMetaData apiFieldMetaData = apiFieldMetaDataContainer.getApiFieldMetaData(apiInstanceMetaData.getName()); ApiFieldMetaData apiFieldMetaData = apiFieldMetaDataContainer.getApiFieldMetaData(apiInstanceMetaData.getName());
String description = "Value for the " + field.getLabel() + " field."; String fieldLabel = field.getLabel();
if(!StringUtils.hasContent(fieldLabel))
{
fieldLabel = QInstanceEnricher.nameToLabel(field.getName());
}
String description = "Value for the " + fieldLabel + " field.";
if(apiFieldMetaData.getDescription() != null)
{
description = apiFieldMetaData.getDescription();
}
if(field.getDefaultValue() != null) if(field.getDefaultValue() != null)
{ {
description += " Default value is " + field.getDefaultValue() + ", if not given."; description += " Default value is " + field.getDefaultValue() + ", if not given.";