refactoring
Signed-off-by:jonathanlermitage <jonathan.lermitage@gmail.com>
removed Lombok 0.11.8 lib since it is not compatible with JDK8 compiler
Signed-off-by:jonathanlermitage <jonathan.lermitage@gmail.com>