refactoring + jdk7 migration
Signed-off-by:jonathanlermitage <jonathan.lermitage@gmail.com>