Convert raptor to java.util.Optional

You should be able to remove these type hints