Preparing for Confluence 9.0 - EAP out now

Confluence Development Confluence Data Center Announcements
, , , ,
546

Hi, Facing below issue on upgrading the app to Confluence 9. I see the ExpansionParser is deprecated in Confluence 9. Can you help me to find replacement which works for both Confluence 9 and 8.x.
java.lang.NoClassDefFoundError: com/atlassian/confluence/rest/api/model/ExpansionsParser
The code we use,

cqlSearchService.searchContent(
              cqlContentSearchQuery,
              new SimplePageRequest(start, cqlResultStep),
              ExpansionsParser.parseSingle(
                  Expansion.combine(Expansions.BODY, ContentRepresentation.STORAGE)
                      .getPropertyName()))

I do not see reference related to ExpansionParser in the doc Bitbucket. I would appreciate if you can provide any workaround or document.

Posted as other question as well java.lang.NoClassDefFoundError: com/atlassian/confluence/rest/api/model/ExpansionsParser

Thanks In Advance