Add @AnnotateWith support to other non bean mapping methods #2983

I believe that the new @AnnotateWith only works for bean mapping methods. We should add this support to all of the methods that we generate. Most likely we need to add it to NormalTypeMappingMethod and ValueMappingMethod