Issue Summary

CQL search on /rest/api/content/search should not only support in-built types like PAGE, BLOG. ect. it should support CUSTOM types.

Currently you can't find custom types in search results.

On the cloud repo this issue may have already been fixed but the changes have not made their way into server.

Changes required to be made likely reside here: DefaultCQLSearchService.java:241 in confluence-cql-plugin-parent.

Related ticket: https://jira.atlassian.com/browse/CRA-341

For reference check the cloud's implementation: https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-cql-plugin/browse/conf[…]an/confluence/plugins/cql/impl/DefaultCQLSearchService.java

Seems as though while field handlers support custom content types, custom content is being filtered completely out due to how the ContentTypeQuery is defined.

Need to pay particular care to whether this change will cause regressions in how we expect CQL to work for all queries. Should be ok as long as we want custom to be enabled by default.

It could be worthwhile to try improve testing/simplify code in DefaultCQLSearchService as it seems quite obfuscated at a glance. Documentation regarding supported types is also missing.

Testing/larger refactors will be done in separate ticket.

Important note: 

Only affects /rest/api/content/search endpoint.

/rest/api/search endpoint is not affected. Both have support different types due to using different CQLSearchService methods search() vs searchContent.

Steps to Reproduce

Perform a CQL query through the /rest/api/content/search endpoint for custom types:

e.g type = <custom-content-plugin-key>

e.g id = <id-of-custom-content>

This incorrect behaviour is not limited to those specific queries.

Expected Results

You should expect to get custom content in the result and information about them just like any other built-in content.

Actual Results

Custom content will not appear in results, but content of a built-in type will.

Workaround

None.