mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-20 14:10:44 +00:00
Compare commits
3 Commits
snapshot-f
...
version-0.
Author | SHA1 | Date | |
---|---|---|---|
586f22560e | |||
c48b18ba0d | |||
d979c985f6 |
2
pom.xml
2
pom.xml
@ -44,7 +44,7 @@
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<revision>0.19.0-SNAPSHOT</revision>
|
||||
<revision>0.19.0</revision>
|
||||
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
|
@ -859,6 +859,9 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
||||
|
||||
apiProcessMetaDataList.add(Pair.of(apiProcessMetaData, processMetaData));
|
||||
}
|
||||
|
||||
apiProcessMetaDataList.sort(Comparator.comparing(apiProcessMetaDataQProcessMetaDataPair -> getProcessSummary(apiProcessMetaDataQProcessMetaDataPair.getA(), apiProcessMetaDataQProcessMetaDataPair.getB())));
|
||||
|
||||
return (apiProcessMetaDataList);
|
||||
}
|
||||
|
||||
@ -885,7 +888,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
||||
Method methodForProcess = new Method()
|
||||
.withOperationId(apiProcessMetaData.getApiProcessName())
|
||||
.withTags(tags)
|
||||
.withSummary(ObjectUtils.requireConditionElse(apiProcessMetaData.getSummary(), StringUtils::hasContent, processMetaData.getLabel()))
|
||||
.withSummary(getProcessSummary(apiProcessMetaData, processMetaData))
|
||||
.withDescription(description)
|
||||
.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()
|
||||
.withOperationId("getStatusFor" + StringUtils.ucFirst(apiProcessMetaData.getApiProcessName()))
|
||||
.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())
|
||||
.withSecurity(getSecurity(apiInstanceMetaData, processMetaData.getName()));
|
||||
|
||||
@ -1158,6 +1171,12 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user