mirror of
https://github.com/google/nomulus
synced 2026-08-20 22:26:12 +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,12 +18,12 @@ import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
import static com.google.common.base.Strings.isNullOrEmpty;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URI;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import javax.annotation.Nullable;
|
||||
import javax.annotation.concurrent.Immutable;
|
||||
|
||||
@@ -69,7 +69,7 @@ final class RdeUploadUrl implements Comparable<RdeUploadUrl> {
|
||||
public Optional<String> getUser() {
|
||||
String userInfo = uri.getUserInfo();
|
||||
if (isNullOrEmpty(userInfo)) {
|
||||
return Optional.absent();
|
||||
return Optional.empty();
|
||||
}
|
||||
int idx = userInfo.indexOf(':');
|
||||
if (idx != -1) {
|
||||
@@ -83,13 +83,13 @@ final class RdeUploadUrl implements Comparable<RdeUploadUrl> {
|
||||
public Optional<String> getPass() {
|
||||
String userInfo = uri.getUserInfo();
|
||||
if (isNullOrEmpty(userInfo)) {
|
||||
return Optional.absent();
|
||||
return Optional.empty();
|
||||
}
|
||||
int idx = userInfo.indexOf(':');
|
||||
if (idx != -1) {
|
||||
return Optional.of(userInfo.substring(idx + 1));
|
||||
} else {
|
||||
return Optional.absent();
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ final class RdeUploadUrl implements Comparable<RdeUploadUrl> {
|
||||
public Optional<String> getPath() {
|
||||
String path = uri.getPath();
|
||||
if (isNullOrEmpty(path) || path.equals("/")) {
|
||||
return Optional.absent();
|
||||
return Optional.empty();
|
||||
} else {
|
||||
return Optional.of(path.substring(1));
|
||||
}
|
||||
@@ -134,7 +134,7 @@ final class RdeUploadUrl implements Comparable<RdeUploadUrl> {
|
||||
result += String.format(":%d", getPort());
|
||||
}
|
||||
result += "/";
|
||||
result += getPath().or("");
|
||||
result += getPath().orElse("");
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user