DATAGRAPH-460 fix for java8