Java DSL - Reduce number of enrich/pollEnrich methods on top-level

We have too many with all the combos of their options. Instead we should have a few common, and then otherwise let users use the fluent api on the definition itself, and return back via end etc.