Convert raptor to java.util.Optional

Same