spring checkstyle fixes

Could you have a single enumeration-value per line? Makes it a lot easier to read.