More on deprecation of datasource bean to simple structs