Refactor after solrj-client was modified