zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-15 08:57:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Migrate to internal FormattingLogger in preparation of migration to Flogger

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=197744904
This commit is contained in:
jianglai 2018-05-23 10:15:28 -07:00
parent 86dd6bd59e
commit fc60890136
188 changed files with 217 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/mapreduce/BUILD
View file

@ -8,8 +8,8 @@ java_library(
name = "mapreduce",
srcs = glob(["*.java"]),
deps = [
"//java/com/google/common/logging:formatting_logger",
"//java/google/registry/mapreduce/inputs",
"//java/google/registry/model",
"//java/google/registry/request",
"//java/google/registry/util",
"//third_party/objectify:objectify-v4_1",

6
java/google/registry/mapreduce/MapreduceRunner.java
View file

@ -33,9 +33,9 @@ import com.google.appengine.tools.mapreduce.outputs.NoOutput;
import com.google.appengine.tools.pipeline.Job0;
import com.google.appengine.tools.pipeline.JobSetting;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.logging.FormattingLogger;
import google.registry.mapreduce.inputs.ConcatenatingInput;
import google.registry.request.Parameter;
import google.registry.util.FormattingLogger;
import google.registry.util.PipelineUtils;
import java.io.Serializable;
import java.util.Optional;
@ -112,13 +112,13 @@ public class MapreduceRunner {
return this;
}
/** Set the default number of mappers, if not overriden by the http param. */
/** Set the default number of mappers, if not overridden by the http param. */
public MapreduceRunner setDefaultMapShards(int defaultMapShards) {
this.defaultMapShards = defaultMapShards;
return this;
}
/** Set the default number of reducers, if not overriden by the http param. */
/** Set the default number of reducers, if not overridden by the http param. */
public MapreduceRunner setDefaultReduceShards(int defaultReduceShards) {
this.defaultReduceShards = defaultReduceShards;
return this;

1
java/google/registry/mapreduce/inputs/BUILD
View file

@ -8,6 +8,7 @@ java_library(
name = "inputs",
srcs = glob(["*.java"]),
deps = [
"//java/com/google/common/logging:formatting_logger",
"//java/google/registry/model",
"//java/google/registry/util",
"//third_party/objectify:objectify-v4_1",

4
java/google/registry/mapreduce/inputs/ChildEntityReader.java
View file

@ -23,13 +23,13 @@ import com.google.appengine.tools.mapreduce.InputReader;
import com.google.appengine.tools.mapreduce.ShardContext;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.logging.FormattingLogger;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.annotation.Entity;
import google.registry.model.EppResource;
import google.registry.model.ImmutableObject;
import google.registry.model.index.EppResourceIndex;
import google.registry.model.index.EppResourceIndexBucket;
import google.registry.util.FormattingLogger;
import java.io.IOException;
import java.util.NoSuchElementException;
import javax.annotation.Nullable;
@ -248,7 +248,7 @@ class ChildEntityReader<R extends EppResource, I extends ImmutableObject> extend
return nextQueryResult();
}
/** Retruns a new ChildReader of the same ancestor for the given type. */
/** Returns a new ChildReader of the same ancestor for the given type. */
public <J> ChildReader<J> withType(Class<J> type) {
return create(type, ancestor);
}

2
java/google/registry/mapreduce/inputs/CommitLogManifestReader.java
View file

@ -19,11 +19,11 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
import com.google.appengine.api.datastore.Cursor;
import com.google.appengine.api.datastore.QueryResultIterator;
import com.google.appengine.tools.mapreduce.InputReader;
import com.google.common.logging.FormattingLogger;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.cmd.Query;
import google.registry.model.ofy.CommitLogBucket;
import google.registry.model.ofy.CommitLogManifest;
import google.registry.util.FormattingLogger;
import java.util.NoSuchElementException;
import javax.annotation.Nullable;
import org.joda.time.DateTime;

2
java/google/registry/mapreduce/inputs/EppResourceBaseReader.java
View file

@ -21,12 +21,12 @@ import com.google.appengine.api.datastore.Cursor;
import com.google.appengine.api.datastore.QueryResultIterator;
import com.google.appengine.tools.mapreduce.InputReader;
import com.google.common.collect.ImmutableSet;
import com.google.common.logging.FormattingLogger;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.cmd.Query;
import google.registry.model.EppResource;
import google.registry.model.index.EppResourceIndex;
import google.registry.model.index.EppResourceIndexBucket;
import google.registry.util.FormattingLogger;
import javax.annotation.Nullable;
/** Base class for {@link InputReader} classes that map over {@link EppResourceIndex}. */

2
java/google/registry/mapreduce/inputs/RetryingInputReader.java
View file

@ -21,8 +21,8 @@ import com.google.appengine.api.datastore.Cursor;
import com.google.appengine.api.datastore.DatastoreTimeoutException;
import com.google.appengine.api.datastore.QueryResultIterator;
import com.google.appengine.tools.mapreduce.InputReader;
import com.google.common.logging.FormattingLogger;
import com.googlecode.objectify.cmd.Query;
import google.registry.util.FormattingLogger;
import google.registry.util.Retrier;
import google.registry.util.SystemSleeper;
import java.util.NoSuchElementException;