zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-24 19:48:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Switch from Guava Optionals to Java 8 Optionals

Browse source 
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:
mcilwain 2017-10-11 13:09:26 -07:00 • committed by jianglai
parent 184b2b56ac
commit c0f8da0c6e
581 changed files with 1325 additions and 932 deletions
Download patch file Download diff file Expand all files Collapse all files

6
java/google/registry/tldconfig/idn/IdnLabelValidator.java
View file

@ -17,11 +17,11 @@ package google.registry.tldconfig.idn;
import static google.registry.tldconfig.idn.IdnTableEnum.EXTENDED_LATIN;
import static google.registry.tldconfig.idn.IdnTableEnum.JA;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import google.registry.util.Idn;
import google.registry.util.NonFinalForTesting;
import java.util.Optional;
/** Validates whether a given IDN label can be provisioned for a particular TLD. */
public final class IdnLabelValidator {
@ -44,12 +44,12 @@ public final class IdnLabelValidator {
public static Optional<String> findValidIdnTableForTld(String label, String tld) {
String unicodeString = Idn.toUnicode(label);
for (IdnTableEnum idnTable
: Optional.fromNullable(idnTableListsPerTld.get(tld)).or(DEFAULT_IDN_TABLES)) {
: Optional.ofNullable(idnTableListsPerTld.get(tld)).orElse(DEFAULT_IDN_TABLES)) {
if (idnTable.getTable().isValidLabel(unicodeString)) {
return Optional.of(idnTable.getTable().getName());
}
}
return Optional.absent();
return Optional.empty();
}
private IdnLabelValidator() {}

2
java/google/registry/tldconfig/idn/IdnTable.java
View file

@ -17,13 +17,13 @@ package google.registry.tldconfig.idn;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableRangeSet;
import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
import com.google.re2j.Matcher;
import com.google.re2j.Pattern;
import java.net.URI;
import java.util.Optional;
/** An IDN table for a particular TLD. */
public final class IdnTable {

4
java/google/registry/tldconfig/idn/LanguageValidator.java
View file

@ -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. */