mirror of
https://github.com/google/nomulus.git
synced 2025-05-01 20:47:52 +02:00
7023b818b7
Async tasks will now re-enqueue themselves after completion if there are additional pending future actions. This allows all parts of domain delete flows to be successfully re-saved as the parts happen, without going past the maximum allowed 30 day task ETA limit. The first task runs at 30 days out when the redemption grace period ends, and that task then enqueues another task to run 5 more days in the future, when the deletion is final and the pending delete status gets removed. No data migration plan is necessary because future resaves defaults to empty, and indeed will always be empty on transfers. So previously enqueued tasks will still be valid. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=202949677
101 lines
3.6 KiB
Java
101 lines
3.6 KiB
Java
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.batch;
|
|
|
|
import static google.registry.flows.async.AsyncFlowEnqueuer.PARAM_REQUESTED_TIME;
|
|
import static google.registry.flows.async.AsyncFlowEnqueuer.PARAM_RESAVE_TIMES;
|
|
import static google.registry.flows.async.AsyncFlowEnqueuer.PARAM_RESOURCE_KEY;
|
|
import static google.registry.request.RequestParameters.extractOptionalBooleanParameter;
|
|
import static google.registry.request.RequestParameters.extractOptionalIntParameter;
|
|
import static google.registry.request.RequestParameters.extractOptionalParameter;
|
|
import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter;
|
|
import static google.registry.request.RequestParameters.extractRequiredParameter;
|
|
import static google.registry.request.RequestParameters.extractSetOfDatetimeParameters;
|
|
|
|
import com.google.api.services.bigquery.model.TableFieldSchema;
|
|
import com.google.common.collect.ImmutableList;
|
|
import com.google.common.collect.ImmutableSet;
|
|
import com.googlecode.objectify.Key;
|
|
import dagger.Module;
|
|
import dagger.Provides;
|
|
import dagger.multibindings.IntoMap;
|
|
import dagger.multibindings.StringKey;
|
|
import google.registry.model.ImmutableObject;
|
|
import google.registry.request.Parameter;
|
|
import java.util.Optional;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import org.joda.time.DateTime;
|
|
|
|
/**
|
|
* Dagger module for injecting common settings for batch actions.
|
|
*/
|
|
@Module
|
|
public class BatchModule {
|
|
|
|
@Provides
|
|
@IntoMap
|
|
@StringKey(EntityIntegrityAlertsSchema.TABLE_ID)
|
|
static ImmutableList<TableFieldSchema> provideEntityIntegrityAlertsSchema() {
|
|
return EntityIntegrityAlertsSchema.SCHEMA_FIELDS;
|
|
}
|
|
|
|
@Provides
|
|
@Parameter("jobName")
|
|
static Optional<String> provideJobName(HttpServletRequest req) {
|
|
return extractOptionalParameter(req, "jobName");
|
|
}
|
|
|
|
@Provides
|
|
@Parameter("jobId")
|
|
static Optional<String> provideJobId(HttpServletRequest req) {
|
|
return extractOptionalParameter(req, "jobId");
|
|
}
|
|
|
|
@Provides
|
|
@Parameter("numJobsToDelete")
|
|
static Optional<Integer> provideNumJobsToDelete(HttpServletRequest req) {
|
|
return extractOptionalIntParameter(req, "numJobsToDelete");
|
|
}
|
|
|
|
@Provides
|
|
@Parameter("daysOld")
|
|
static Optional<Integer> provideDaysOld(HttpServletRequest req) {
|
|
return extractOptionalIntParameter(req, "daysOld");
|
|
}
|
|
|
|
@Provides
|
|
@Parameter("force")
|
|
static Optional<Boolean> provideForce(HttpServletRequest req) {
|
|
return extractOptionalBooleanParameter(req, "force");
|
|
}
|
|
|
|
@Provides
|
|
@Parameter(PARAM_RESOURCE_KEY)
|
|
static Key<ImmutableObject> provideResourceKey(HttpServletRequest req) {
|
|
return Key.create(extractRequiredParameter(req, PARAM_RESOURCE_KEY));
|
|
}
|
|
|
|
@Provides
|
|
@Parameter(PARAM_REQUESTED_TIME)
|
|
static DateTime provideRequestedTime(HttpServletRequest req) {
|
|
return extractRequiredDatetimeParameter(req, PARAM_REQUESTED_TIME);
|
|
}
|
|
|
|
@Provides
|
|
@Parameter(PARAM_RESAVE_TIMES)
|
|
static ImmutableSet<DateTime> provideResaveTimes(HttpServletRequest req) {
|
|
return extractSetOfDatetimeParameters(req, PARAM_RESAVE_TIMES, null);
|
|
}
|
|
}
|