http://jira.springframework.org/browse/SEC-856. Refactored class to remove the JDBC-related inner classes.