Updated DataSource to enforce desired features.
Updated formatting on javadoc comments.