mirror of
https://github.com/google/nomulus
synced 2026-09-04 23:27:11 +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:
@@ -14,8 +14,8 @@
|
||||
|
||||
package google.registry.tldconfig.idn;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import java.util.Optional;
|
||||
|
||||
abstract class LanguageValidator {
|
||||
|
||||
@@ -25,7 +25,7 @@ abstract class LanguageValidator {
|
||||
|
||||
/** Return the language validator for the given language code (if one exists). */
|
||||
static Optional<LanguageValidator> get(String language) {
|
||||
return Optional.fromNullable(LANGUAGE_VALIDATORS.get(language));
|
||||
return Optional.ofNullable(LANGUAGE_VALIDATORS.get(language));
|
||||
}
|
||||
|
||||
/** Returns true if the label meets the context rules for this language. */
|
||||
|
||||
Reference in New Issue
Block a user