Avoid anonymous inner classes usage, and using lambda if possible.

[He-Pin]

Once we drop 2.12 support, we can change many anonymous inner classes to lambda.

[pjfanning]

I can help with this one later in the weekend.