Refactor of WhoisRestService to make RDAP changes easier to maintain