class CloudSiteCatalogUtils {

    protected Optional<CloudSite> getCloudSite(String id) {
        if (id == null) {
            return Optional.empty();
        }
        CloudSite cloudSite = catalogDbClient.getCloudSite(id);

        if (cloudSite != null) {
            return Optional.of(cloudSite);
        } else {
            return (Optional.of(catalogDbClient.getCloudSiteByClliAndAicVersion(id, "2.5")));
        }
    }

}