Make ResultSetMapper an interface instead of a static class and cleanup naming