Migrate sources to Java 1.7 compatibility: use switch on Strings and diamond operators for improved readability/performance.
Small improvements following automatic code analysis