zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-16 01:17:14 +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

4
java/google/registry/util/DatastoreServiceUtils.java
View file

@ -16,7 +16,7 @@ package google.registry.util;
import com.google.appengine.api.datastore.Key;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import java.util.Optional;
/** Utility methods for working with the App Engine Datastore service. */
public class DatastoreServiceUtils {
@ -26,6 +26,6 @@ public class DatastoreServiceUtils {
/** Returns the name or id of a key, which may be a string or a long. */
public static Object getNameOrId(Key key) {
return Optional.<Object>fromNullable(key.getName()).or(key.getId());
return Optional.<Object>ofNullable(key.getName()).orElse(key.getId());
}
}

2
java/google/registry/util/PreconditionsUtils.java
View file

@ -16,7 +16,7 @@ package google.registry.util;
import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.base.Optional;
import java.util.Optional;
import javax.annotation.Nullable;
/** Utility methods related to preconditions checking. */

4
java/google/registry/util/UrlFetchUtils.java
View file

@ -27,9 +27,9 @@ import com.google.appengine.api.urlfetch.HTTPHeader;
import com.google.appengine.api.urlfetch.HTTPRequest;
import com.google.appengine.api.urlfetch.HTTPResponse;
import com.google.common.base.Ascii;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.net.MediaType;
import java.util.Optional;
import java.util.Random;
/** Helper methods for the App Engine URL fetch service. */
@ -55,7 +55,7 @@ public final class UrlFetchUtils {
return Optional.of(header.getValue());
}
}
return Optional.absent();
return Optional.empty();
}
/**