Please Check if Lombok package is compatible with Android.
If it is compatible, use it for Getters, Setters, Constructors etc.
Also use Lombok for logging if it is compatible with Android. Espcially, @slf4j annotation.
See
Lombok Project
TODO
If Lombok is supported, then use as much of it as you can to reduce the boilerplate code in the already pushed code.
If it is not supported, then notify and I will close this issue.