DATAES-2 Applied spring-data formatting to all sources