Usage of Optional.ofNullable is unnecessary when value is known. If it's null value Optional.empty() should be preferred, as it doesn't perform redundant null check.