mirror of
https://github.com/google/nomulus
synced 2026-08-30 04:37:00 +00:00
Switch from Guava Optionals to Java 8 Optionals
This was a surprisingly involved change. Some of the difficulties included java.util.Optional purposely not being Serializable (so I had to move a few Optionals in mapreduce classes to @Nullable) and having to add the Truth Java8 extension library for assertion support. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=171863777
This commit is contained in:
@@ -18,9 +18,9 @@ import static com.google.common.base.Ascii.toLowerCase;
|
||||
import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
|
||||
import static google.registry.util.ResourceUtils.readResourceUtf8;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import google.registry.util.FormattingLogger;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import org.yaml.snakeyaml.Yaml;
|
||||
|
||||
/**
|
||||
@@ -134,7 +134,7 @@ public final class YamlUtils {
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Optional<Map<String, Object>> loadAsMap(Yaml yaml, String yamlString) {
|
||||
return Optional.fromNullable((Map<String, Object>) yaml.load(yamlString));
|
||||
return Optional.ofNullable((Map<String, Object>) yaml.load(yamlString));
|
||||
}
|
||||
|
||||
private YamlUtils() {}
|
||||
|
||||
Reference in New Issue
Block a user