mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-18 05:01:07 +00:00
don't log about omitted tables, by default
This commit is contained in:
@ -194,6 +194,8 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
|||||||
* Each input primary key will also be included in the corresponding response object.
|
* Each input primary key will also be included in the corresponding response object.
|
||||||
""";
|
""";
|
||||||
|
|
||||||
|
private static final boolean LOG_OMITTED_TABLES = false;
|
||||||
|
|
||||||
private Set<String> neededTableSchemas = new HashSet<>();
|
private Set<String> neededTableSchemas = new HashSet<>();
|
||||||
|
|
||||||
|
|
||||||
@ -314,40 +316,40 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
|||||||
|
|
||||||
if(input.getTableName() != null && !input.getTableName().equals(tableName))
|
if(input.getTableName() != null && !input.getTableName().equals(tableName))
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because it is not the requested table [" + input.getTableName() + "]");
|
logOmittedTable("Omitting table [" + tableName + "] because it is not the requested table [" + input.getTableName() + "]");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(table.getIsHidden())
|
if(table.getIsHidden())
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because it is marked as hidden");
|
logOmittedTable("Omitting table [" + tableName + "] because it is marked as hidden");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ApiTableMetaDataContainer apiTableMetaDataContainer = ApiTableMetaDataContainer.of(table);
|
ApiTableMetaDataContainer apiTableMetaDataContainer = ApiTableMetaDataContainer.of(table);
|
||||||
if(apiTableMetaDataContainer == null)
|
if(apiTableMetaDataContainer == null)
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because it does not have an apiTableMetaDataContainer");
|
logOmittedTable("Omitting table [" + tableName + "] because it does not have an apiTableMetaDataContainer");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
ApiTableMetaData apiTableMetaData = apiTableMetaDataContainer.getApiTableMetaData(apiName);
|
ApiTableMetaData apiTableMetaData = apiTableMetaDataContainer.getApiTableMetaData(apiName);
|
||||||
if(apiTableMetaData == null)
|
if(apiTableMetaData == null)
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because it does not have any apiTableMetaData");
|
logOmittedTable("Omitting table [" + tableName + "] because it does not have any apiTableMetaData");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(BooleanUtils.isTrue(apiTableMetaData.getIsExcluded()))
|
if(BooleanUtils.isTrue(apiTableMetaData.getIsExcluded()))
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because its apiTableMetaData marks it as excluded");
|
logOmittedTable("Omitting table [" + tableName + "] because its apiTableMetaData marks it as excluded");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
APIVersionRange apiVersionRange = apiTableMetaData.getApiVersionRange();
|
APIVersionRange apiVersionRange = apiTableMetaData.getApiVersionRange();
|
||||||
if(!apiVersionRange.includes(apiVersion))
|
if(!apiVersionRange.includes(apiVersion))
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because its api version range [" + apiVersionRange + "] does not include this version [" + version + "]");
|
logOmittedTable("Omitting table [" + tableName + "] because its api version range [" + apiVersionRange + "] does not include this version [" + version + "]");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -374,7 +376,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
|||||||
|
|
||||||
if(!getEnabled && !queryByQueryStringEnabled && !insertEnabled && !insertBulkEnabled && !updateEnabled && !updateBulkEnabled && !deleteEnabled && !deleteBulkEnabled && !CollectionUtils.nullSafeHasContents(apiProcessMetaDataList))
|
if(!getEnabled && !queryByQueryStringEnabled && !insertEnabled && !insertBulkEnabled && !updateEnabled && !updateBulkEnabled && !deleteEnabled && !deleteBulkEnabled && !CollectionUtils.nullSafeHasContents(apiProcessMetaDataList))
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + tableName + "] because it does not have any supported capabilities / enabled operations or processes");
|
logOmittedTable("Omitting table [" + tableName + "] because it does not have any supported capabilities / enabled operations or processes");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1442,14 +1444,14 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
|||||||
{
|
{
|
||||||
if(BooleanUtils.isTrue(apiAssociationMetaData.getIsExcluded()))
|
if(BooleanUtils.isTrue(apiAssociationMetaData.getIsExcluded()))
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + table.getName() + "] association [" + association.getName() + "] because it is marked as excluded.");
|
logOmittedTable("Omitting table [" + table.getName() + "] association [" + association.getName() + "] because it is marked as excluded.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
APIVersionRange apiVersionRange = apiAssociationMetaData.getApiVersionRange();
|
APIVersionRange apiVersionRange = apiAssociationMetaData.getApiVersionRange();
|
||||||
if(!apiVersionRange.includes(new APIVersion(version)))
|
if(!apiVersionRange.includes(new APIVersion(version)))
|
||||||
{
|
{
|
||||||
LOG.debug("Omitting table [" + table.getName() + "] association [" + association.getName() + "] because its api version range [" + apiVersionRange + "] does not include this version [" + version + "]");
|
logOmittedTable("Omitting table [" + table.getName() + "] association [" + association.getName() + "] because its api version range [" + apiVersionRange + "] does not include this version [" + version + "]");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1804,4 +1806,17 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
**
|
||||||
|
*******************************************************************************/
|
||||||
|
private void logOmittedTable(String message)
|
||||||
|
{
|
||||||
|
if(LOG_OMITTED_TABLES)
|
||||||
|
{
|
||||||
|
LOG.debug(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user