not-omer/135

rsc client #135 refactor

Java