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

37
java/google/registry/rde/PendingDeposit.java
View file

@ -15,14 +15,19 @@
package google.registry.rde;
import com.google.auto.value.AutoValue;
import com.google.common.base.Optional;
import google.registry.model.common.Cursor.CursorType;
import google.registry.model.rde.RdeMode;
import java.io.Serializable;
import java.util.Optional;
import javax.annotation.Nullable;
import org.joda.time.DateTime;
import org.joda.time.Duration;
/** Container representing a single RDE or BRDA XML escrow deposit that needs to be created. */
/**
* Container representing a single RDE or BRDA XML escrow deposit that needs to be created.
*
* <p>There are some {@code @Nullable} fields here because Optionals aren't Serializable.
*/
@AutoValue
public abstract class PendingDeposit implements Serializable {
@ -44,22 +49,26 @@ public abstract class PendingDeposit implements Serializable {
public abstract RdeMode mode();
/** The cursor type to update (not used in manual operation). */
public abstract Optional<CursorType> cursor();
@Nullable
public abstract CursorType cursor();
/** Amount of time to increment the cursor (not used in manual operation). */
public abstract Optional<Duration> interval();
@Nullable
public abstract Duration interval();
/**
* Subdirectory of bucket/manual in which files should be placed, including a trailing slash (used
* only in manual operation).
*/
public abstract Optional<String> directoryWithTrailingSlash();
@Nullable
public abstract String directoryWithTrailingSlash();
/**
* Revision number for generated files; if absent, use the next available in the sequence (used
* only in manual operation).
*/
public abstract Optional<Integer> revision();
@Nullable
public abstract Integer revision();
static PendingDeposit create(
String tld, DateTime watermark, RdeMode mode, CursorType cursor, Duration interval) {
@ -68,10 +77,10 @@ public abstract class PendingDeposit implements Serializable {
tld,
watermark,
mode,
Optional.of(cursor),
Optional.of(interval),
Optional.<String>absent(),
Optional.<Integer>absent());
cursor,
interval,
null,
null);
}
static PendingDeposit createInManualOperation(
@ -79,15 +88,15 @@ public abstract class PendingDeposit implements Serializable {
DateTime watermark,
RdeMode mode,
String directoryWithTrailingSlash,
Optional<Integer> revision) {
@Nullable Integer revision) {
return new AutoValue_PendingDeposit(
true,
tld,
watermark,
mode,
Optional.<CursorType>absent(),
Optional.<Duration>absent(),
Optional.of(directoryWithTrailingSlash),
null,
null,
directoryWithTrailingSlash,
revision);
}