Code cleanup to use Java 8 features

1 job for master
Status Job ID Name Coverage
  Test
passed #116
java gradle
test

00:01:42