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

Add sort (by summary) of processes - for stability (and just to be a little nicer)

Browse Source
This commit is contained in:
darin.kelkhoff
2023-10-03 08:31:40 -05:00
parent 6c2c9b83ed
commit d979c985f6
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,6 +859,9 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
apiProcessMetaDataList.add(Pair.of(apiProcessMetaData, processMetaData)); apiProcessMetaDataList.add(Pair.of(apiProcessMetaData, processMetaData));
} }
apiProcessMetaDataList.sort(Comparator.comparing(apiProcessMetaDataQProcessMetaDataPair -> getProcessSummary(apiProcessMetaDataQProcessMetaDataPair.getA(), apiProcessMetaDataQProcessMetaDataPair.getB())));
return (apiProcessMetaDataList); return (apiProcessMetaDataList);
} }
@ -885,7 +888,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
Method methodForProcess = new Method() Method methodForProcess = new Method()
.withOperationId(apiProcessMetaData.getApiProcessName()) .withOperationId(apiProcessMetaData.getApiProcessName())
.withTags(tags) .withTags(tags)
.withSummary(ObjectUtils.requireConditionElse(apiProcessMetaData.getSummary(), StringUtils::hasContent, processMetaData.getLabel())) .withSummary(getProcessSummary(apiProcessMetaData, processMetaData))
.withDescription(description) .withDescription(description)
.withSecurity(getSecurity(apiInstanceMetaData, processMetaData.getName())); .withSecurity(getSecurity(apiInstanceMetaData, processMetaData.getName()));
@ -1018,6 +1021,16 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
/*******************************************************************************
**
*******************************************************************************/
private static String getProcessSummary(ApiProcessMetaData apiProcessMetaData, QProcessMetaData processMetaData)
{
return ObjectUtils.requireConditionElse(apiProcessMetaData.getSummary(), StringUtils::hasContent, processMetaData.getLabel());
}
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
@ -1029,7 +1042,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
Method methodForProcess = new Method() Method methodForProcess = new Method()
.withOperationId("getStatusFor" + StringUtils.ucFirst(apiProcessMetaData.getApiProcessName())) .withOperationId("getStatusFor" + StringUtils.ucFirst(apiProcessMetaData.getApiProcessName()))
.withTags(tags) .withTags(tags)
.withSummary("Get Status of Job: " + ObjectUtils.requireConditionElse(apiProcessMetaData.getSummary(), StringUtils::hasContent, processMetaData.getLabel())) .withSummary("Get Status of Job: " + getProcessSummary(apiProcessMetaData, processMetaData))
.withDescription("Get the status for a previous asynchronous call to the process named " + processMetaData.getLabel()) .withDescription("Get the status for a previous asynchronous call to the process named " + processMetaData.getLabel())
.withSecurity(getSecurity(apiInstanceMetaData, processMetaData.getName())); .withSecurity(getSecurity(apiInstanceMetaData, processMetaData.getName()));
@ -1158,6 +1171,12 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
apiProcessMetaDataList.add(Pair.of(apiProcessMetaData, processMetaData)); apiProcessMetaDataList.add(Pair.of(apiProcessMetaData, processMetaData));
} }
/////////////////////////////////////////////////////////////////////
// sort by process summary (for stability, and just to be better) //
/////////////////////////////////////////////////////////////////////
apiProcessMetaDataList.sort(Comparator.comparing(apiProcessMetaDataQProcessMetaDataPair -> getProcessSummary(apiProcessMetaDataQProcessMetaDataPair.getA(), apiProcessMetaDataQProcessMetaDataPair.getB())));
return (apiProcessMetaDataList); return (apiProcessMetaDataList);
} }