mirror of
https://github.com/google/nomulus.git
synced 2025-05-15 08:57:12 +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:
mcilwain
jianglai
parent
184b2b56ac
commit
c0f8da0c6e
581 changed files with 1325 additions and 932 deletions
|
|
@ -19,13 +19,13 @@ import static google.registry.request.RequestParameters.extractOptionalIntParame
|
|||
import static google.registry.request.RequestParameters.extractOptionalParameter;
|
||||
|
||||
import com.google.api.services.bigquery.model.TableFieldSchema;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
import dagger.multibindings.IntoMap;
|
||||
import dagger.multibindings.StringKey;
|
||||
import google.registry.request.Parameter;
|
||||
import java.util.Optional;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ import static google.registry.util.PipelineUtils.createJobPath;
|
|||
import com.google.appengine.tools.mapreduce.Mapper;
|
||||
import com.google.appengine.tools.mapreduce.Reducer;
|
||||
import com.google.appengine.tools.mapreduce.ReducerInput;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Range;
|
||||
|
|
@ -62,6 +61,7 @@ import google.registry.request.Response;
|
|||
import google.registry.request.auth.Auth;
|
||||
import google.registry.util.Clock;
|
||||
import google.registry.util.FormattingLogger;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.money.Money;
|
||||
|
|
@ -97,7 +97,7 @@ public class ExpandRecurringBillingEventsAction implements Runnable {
|
|||
Cursor cursor = ofy().load().key(Cursor.createGlobalKey(RECURRING_BILLING)).now();
|
||||
DateTime executeTime = clock.nowUtc();
|
||||
DateTime persistedCursorTime = (cursor == null ? START_OF_TIME : cursor.getCursorTime());
|
||||
DateTime cursorTime = cursorTimeParam.or(persistedCursorTime);
|
||||
DateTime cursorTime = cursorTimeParam.orElse(persistedCursorTime);
|
||||
checkArgument(
|
||||
cursorTime.isBefore(executeTime),
|
||||
"Cursor time must be earlier than execution time.");
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
|
|||
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
|
||||
|
||||
import com.google.appengine.api.datastore.DatastoreService;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import google.registry.batch.MapreduceEntityCleanupUtil.EligibleJobResults;
|
||||
import google.registry.mapreduce.MapreduceRunner;
|
||||
|
|
@ -28,6 +27,7 @@ import google.registry.request.Response;
|
|||
import google.registry.request.auth.Auth;
|
||||
import google.registry.util.Clock;
|
||||
import google.registry.util.FormattingLogger;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.time.DateTime;
|
||||
|
|
@ -164,7 +164,7 @@ public class MapreduceEntityCleanupAction implements Runnable {
|
|||
handleBadRequest(ERROR_NON_POSITIVE_JOBS_TO_DELETE);
|
||||
return;
|
||||
}
|
||||
int defaultedDaysOld = daysOld.or(DEFAULT_DAYS_OLD);
|
||||
int defaultedDaysOld = daysOld.orElse(DEFAULT_DAYS_OLD);
|
||||
// Only generate the detailed response payload if there aren't too many jobs involved.
|
||||
boolean verbose =
|
||||
numJobsToDelete.isPresent() && (numJobsToDelete.get() <= DEFAULT_MAX_NUM_JOBS_TO_DELETE);
|
||||
|
|
@ -174,14 +174,14 @@ public class MapreduceEntityCleanupAction implements Runnable {
|
|||
// until we find enough, requesting deletion as we go.
|
||||
int numJobsProcessed = 0;
|
||||
DateTime cutoffDate = clock.nowUtc().minusDays(defaultedDaysOld);
|
||||
Optional<String> cursor = Optional.absent();
|
||||
Optional<String> cursor = Optional.empty();
|
||||
do {
|
||||
Optional<Integer> numJobsToRequest =
|
||||
Optional.fromNullable(
|
||||
Optional.ofNullable(
|
||||
numJobsToDelete.isPresent() ? numJobsToDelete.get() - numJobsProcessed : null);
|
||||
EligibleJobResults batch =
|
||||
mapreduceEntityCleanupUtil.findEligibleJobsByJobName(
|
||||
jobName.orNull(), cutoffDate, numJobsToRequest, force.or(false), cursor);
|
||||
jobName.orElse(null), cutoffDate, numJobsToRequest, force.orElse(false), cursor);
|
||||
cursor = batch.cursor();
|
||||
// Individual batches can come back empty if none of the returned jobs meet the requirements
|
||||
// or if all jobs have been exhausted.
|
||||
|
|
@ -200,7 +200,7 @@ public class MapreduceEntityCleanupAction implements Runnable {
|
|||
if (numJobsProcessed == 0) {
|
||||
logger.infofmt(
|
||||
"No eligible jobs found with name '%s' older than %s days old.",
|
||||
jobName.or("(any)"), defaultedDaysOld);
|
||||
jobName.orElse("(any)"), defaultedDaysOld);
|
||||
payload.append("No eligible jobs found");
|
||||
} else {
|
||||
logger.infofmt("A total of %s job(s) processed.", numJobsProcessed);
|
||||
|
|
@ -211,19 +211,19 @@ public class MapreduceEntityCleanupAction implements Runnable {
|
|||
|
||||
private String requestDeletion(Set<String> actualJobIds, boolean verbose) {
|
||||
Optional<StringBuilder> payloadChunkBuilder =
|
||||
verbose ? Optional.of(new StringBuilder()) : Optional.<StringBuilder>absent();
|
||||
verbose ? Optional.of(new StringBuilder()) : Optional.<StringBuilder>empty();
|
||||
int errorCount = 0;
|
||||
for (String actualJobId : actualJobIds) {
|
||||
Optional<String> error =
|
||||
mapreduceEntityCleanupUtil.deleteJobAsync(datastore, actualJobId, force.or(false));
|
||||
mapreduceEntityCleanupUtil.deleteJobAsync(datastore, actualJobId, force.orElse(false));
|
||||
if (error.isPresent()) {
|
||||
errorCount++;
|
||||
}
|
||||
logger.infofmt("%s: %s", actualJobId, error.or("deletion requested"));
|
||||
logger.infofmt("%s: %s", actualJobId, error.orElse("deletion requested"));
|
||||
if (payloadChunkBuilder.isPresent()) {
|
||||
payloadChunkBuilder
|
||||
.get()
|
||||
.append(String.format("%s: %s\n", actualJobId, error.or("deletion requested")));
|
||||
.append(String.format("%s: %s\n", actualJobId, error.orElse("deletion requested")));
|
||||
}
|
||||
}
|
||||
logger.infofmt(
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ import com.google.appengine.tools.pipeline.impl.PipelineManager;
|
|||
import com.google.appengine.tools.pipeline.impl.model.JobRecord;
|
||||
import com.google.appengine.tools.pipeline.util.Pair;
|
||||
import com.google.auto.value.AutoValue;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import javax.annotation.Nullable;
|
||||
import javax.inject.Inject;
|
||||
|
|
@ -92,11 +92,11 @@ class MapreduceEntityCleanupUtil {
|
|||
boolean ignoreState,
|
||||
Optional<String> cursor) {
|
||||
if (maxJobs.isPresent() && (maxJobs.get() <= 0)) {
|
||||
return EligibleJobResults.create(ImmutableSet.<String>of(), Optional.<String>absent());
|
||||
return EligibleJobResults.create(ImmutableSet.<String>of(), Optional.empty());
|
||||
}
|
||||
Set<String> eligibleJobs = new HashSet<>();
|
||||
Pair<? extends Iterable<JobRecord>, String> pair =
|
||||
PipelineManager.queryRootPipelines(jobName, cursor.orNull(), getMaxNumberOfJobsPerSearch());
|
||||
PipelineManager.queryRootPipelines(jobName, cursor.orElse(null), getMaxNumberOfJobsPerSearch());
|
||||
for (JobRecord jobRecord : pair.getFirst()) {
|
||||
if (((jobRecord.getStartTime() == null)
|
||||
|| jobRecord.getStartTime().before(cutoffDate.toDate()))
|
||||
|
|
@ -108,12 +108,12 @@ class MapreduceEntityCleanupUtil {
|
|||
eligibleJobs.add(jobRecord.getRootJobKey().getName());
|
||||
if (maxJobs.isPresent() && (eligibleJobs.size() >= maxJobs.get())) {
|
||||
return EligibleJobResults.create(
|
||||
ImmutableSet.copyOf(eligibleJobs), Optional.<String>absent());
|
||||
ImmutableSet.copyOf(eligibleJobs), Optional.empty());
|
||||
}
|
||||
}
|
||||
}
|
||||
return EligibleJobResults.create(
|
||||
ImmutableSet.copyOf(eligibleJobs), Optional.fromNullable(pair.getSecond()));
|
||||
ImmutableSet.copyOf(eligibleJobs), Optional.ofNullable(pair.getSecond()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -148,7 +148,7 @@ class MapreduceEntityCleanupUtil {
|
|||
// delete the pipeline-* entities as well.
|
||||
try {
|
||||
PipelineManager.deletePipelineRecords(jobId, force, true /* async */);
|
||||
return Optional.absent();
|
||||
return Optional.empty();
|
||||
} catch (NoSuchObjectException ex) {
|
||||
return Optional.of("No such pipeline job");
|
||||
} catch (IllegalStateException ex) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue