mirror of
https://github.com/google/nomulus.git
synced 2025-05-12 22:38:16 +02: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:
parent
184b2b56ac
commit
c0f8da0c6e
581 changed files with 1325 additions and 932 deletions
|
@ -23,7 +23,6 @@ import static google.registry.util.RegistrarUtils.normalizeClientId;
|
|||
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
|
||||
import static javax.servlet.http.HttpServletResponse.SC_OK;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Sets;
|
||||
|
@ -43,6 +42,7 @@ import java.io.IOException;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import javax.annotation.Nullable;
|
||||
import javax.inject.Inject;
|
||||
|
@ -140,7 +140,7 @@ public final class SyncGroupMembersAction implements Runnable {
|
|||
return null;
|
||||
},
|
||||
RuntimeException.class);
|
||||
resultsBuilder.put(registrar, Optional.<Throwable>absent());
|
||||
resultsBuilder.put(registrar, Optional.<Throwable>empty());
|
||||
} catch (Throwable e) {
|
||||
logger.severe(e, e.getMessage());
|
||||
resultsBuilder.put(registrar, Optional.of(e));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue