diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index 3779addd8..9530d0de0 100644 --- a/java/google/registry/backup/BUILD +++ b/java/google/registry/backup/BUILD @@ -8,6 +8,7 @@ java_library( name = "backup", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/cron", "//java/google/registry/mapreduce", diff --git a/java/google/registry/backup/CommitLogCheckpointAction.java b/java/google/registry/backup/CommitLogCheckpointAction.java index 73fbfb70f..602f6a5ea 100644 --- a/java/google/registry/backup/CommitLogCheckpointAction.java +++ b/java/google/registry/backup/CommitLogCheckpointAction.java @@ -16,18 +16,18 @@ package google.registry.backup; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM; import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM; import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.DateTimeUtils.isBeforeOrAt; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; +import com.google.common.logging.FormattingLogger; import google.registry.model.ofy.CommitLogCheckpoint; import google.registry.model.ofy.CommitLogCheckpointRoot; import google.registry.request.Action; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/backup/DeleteOldCommitLogsAction.java b/java/google/registry/backup/DeleteOldCommitLogsAction.java index e1d250ec6..cf3973229 100644 --- a/java/google/registry/backup/DeleteOldCommitLogsAction.java +++ b/java/google/registry/backup/DeleteOldCommitLogsAction.java @@ -16,9 +16,9 @@ package google.registry.backup; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN; import static google.registry.model.ofy.ObjectifyService.ofy; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.PipelineUtils.createJobPath; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; @@ -29,6 +29,7 @@ import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultiset; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.mapreduce.MapreduceRunner; @@ -43,7 +44,6 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/java/google/registry/backup/ExportCommitLogDiffAction.java b/java/google/registry/backup/ExportCommitLogDiffAction.java index 966d41dc8..99d6a3e12 100644 --- a/java/google/registry/backup/ExportCommitLogDiffAction.java +++ b/java/google/registry/backup/ExportCommitLogDiffAction.java @@ -20,6 +20,7 @@ import static com.google.common.base.Verify.verifyNotNull; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Lists.partition; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT; import static google.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTIONS; import static google.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT; @@ -28,7 +29,6 @@ import static google.registry.model.ofy.CommitLogBucket.getBucketKey; import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.isAtOrAfter; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static java.nio.channels.Channels.newOutputStream; import static java.util.Arrays.asList; import static java.util.Comparator.comparingLong; @@ -39,6 +39,7 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.model.ImmutableObject; @@ -49,7 +50,6 @@ import google.registry.model.ofy.CommitLogMutation; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.OutputStream; import java.util.Collection; diff --git a/java/google/registry/backup/GcsDiffFileLister.java b/java/google/registry/backup/GcsDiffFileLister.java index b4c2c1e86..6fda85797 100644 --- a/java/google/registry/backup/GcsDiffFileLister.java +++ b/java/google/registry/backup/GcsDiffFileLister.java @@ -27,12 +27,12 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.ListItem; import com.google.appengine.tools.cloudstorage.ListOptions; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import google.registry.backup.BackupModule.Backups; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.Iterator; import java.util.Map; diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index 72ad1db9c..20389c89f 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -29,6 +29,7 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.common.collect.Lists; import com.google.common.collect.PeekingIterator; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; import com.googlecode.objectify.util.ResultNow; @@ -42,7 +43,6 @@ import google.registry.model.ofy.CommitLogMutation; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD index f438f8239..a95c804d4 100644 --- a/java/google/registry/batch/BUILD +++ b/java/google/registry/batch/BUILD @@ -8,6 +8,7 @@ java_library( name = "batch", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/dns", diff --git a/java/google/registry/batch/DeleteContactsAndHostsAction.java b/java/google/registry/batch/DeleteContactsAndHostsAction.java index 1e070eb28..7a862f222 100644 --- a/java/google/registry/batch/DeleteContactsAndHostsAction.java +++ b/java/google/registry/batch/DeleteContactsAndHostsAction.java @@ -19,6 +19,7 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static com.google.common.math.IntMath.divide; import static com.googlecode.objectify.Key.getKind; import static google.registry.flows.ResourceFlowUtils.denyPendingTransfer; @@ -39,7 +40,6 @@ import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_DELETE; import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_DELETE_FAILURE; import static google.registry.model.reporting.HistoryEntry.Type.HOST_DELETE; import static google.registry.model.reporting.HistoryEntry.Type.HOST_DELETE_FAILURE; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.PipelineUtils.createJobPath; import static java.math.RoundingMode.CEILING; import static java.util.concurrent.TimeUnit.DAYS; @@ -58,6 +58,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; import com.google.common.collect.Multiset; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.batch.DeleteContactsAndHostsAction.DeletionResult.Type; import google.registry.dns.DnsQueue; @@ -85,7 +86,6 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.Retrier; import google.registry.util.SystemClock; diff --git a/java/google/registry/batch/DeleteLoadTestDataAction.java b/java/google/registry/batch/DeleteLoadTestDataAction.java index c3862c2e5..08ed6538c 100644 --- a/java/google/registry/batch/DeleteLoadTestDataAction.java +++ b/java/google/registry/batch/DeleteLoadTestDataAction.java @@ -24,6 +24,7 @@ import static google.registry.request.Action.Method.POST; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryEnvironment; import google.registry.mapreduce.MapreduceRunner; @@ -36,7 +37,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.PipelineUtils; import java.util.List; import javax.inject.Inject; diff --git a/java/google/registry/batch/DeleteProberDataAction.java b/java/google/registry/batch/DeleteProberDataAction.java index d85b4ee76..655b87816 100644 --- a/java/google/registry/batch/DeleteProberDataAction.java +++ b/java/google/registry/batch/DeleteProberDataAction.java @@ -33,6 +33,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryEnvironment; @@ -52,7 +53,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.PipelineUtils; import java.util.List; import javax.inject.Inject; diff --git a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java b/java/google/registry/batch/ExpandRecurringBillingEventsAction.java index da5e05e20..cd038ff2f 100644 --- a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java +++ b/java/google/registry/batch/ExpandRecurringBillingEventsAction.java @@ -37,6 +37,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.NullInput; @@ -58,7 +59,6 @@ import google.registry.request.Parameter; 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; diff --git a/java/google/registry/batch/MapreduceEntityCleanupAction.java b/java/google/registry/batch/MapreduceEntityCleanupAction.java index 4dffa74cf..74d10a5af 100644 --- a/java/google/registry/batch/MapreduceEntityCleanupAction.java +++ b/java/google/registry/batch/MapreduceEntityCleanupAction.java @@ -19,6 +19,7 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.appengine.api.datastore.DatastoreService; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.batch.MapreduceEntityCleanupUtil.EligibleJobResults; import google.registry.mapreduce.MapreduceRunner; import google.registry.request.Action; @@ -26,7 +27,6 @@ import google.registry.request.Parameter; 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; diff --git a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java b/java/google/registry/batch/RefreshDnsOnHostRenameAction.java index 31933e7cd..f031400ad 100644 --- a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java +++ b/java/google/registry/batch/RefreshDnsOnHostRenameAction.java @@ -41,6 +41,7 @@ import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.dns.DnsQueue; import google.registry.flows.async.AsyncFlowMetrics; @@ -53,7 +54,6 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.Retrier; import google.registry.util.SystemClock; diff --git a/java/google/registry/batch/VerifyEntityIntegrityAction.java b/java/google/registry/batch/VerifyEntityIntegrityAction.java index 29f73d613..272372c0b 100644 --- a/java/google/registry/batch/VerifyEntityIntegrityAction.java +++ b/java/google/registry/batch/VerifyEntityIntegrityAction.java @@ -17,6 +17,7 @@ package google.registry.batch; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static com.googlecode.objectify.Key.getKind; import static google.registry.model.EppResourceUtils.isActive; import static google.registry.model.ofy.ObjectifyService.ofy; @@ -26,7 +27,6 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.earliestOf; import static google.registry.util.DateTimeUtils.isAtOrAfter; import static google.registry.util.DateTimeUtils.isBeforeOrAt; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.PipelineUtils.createJobPath; import static org.joda.time.DateTimeZone.UTC; @@ -38,6 +38,7 @@ import com.google.appengine.tools.mapreduce.inputs.DatastoreKeyInput; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; @@ -59,7 +60,6 @@ import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/google/registry/beam/BUILD b/java/google/registry/beam/BUILD index 95553cef8..206d85c32 100644 --- a/java/google/registry/beam/BUILD +++ b/java/google/registry/beam/BUILD @@ -9,6 +9,7 @@ java_library( srcs = glob(["*.java"]), resources = glob(["sql/*"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/reporting/billing", "//java/google/registry/util", diff --git a/java/google/registry/beam/BillingEvent.java b/java/google/registry/beam/BillingEvent.java index f7b8e9ff8..95031f580 100644 --- a/java/google/registry/beam/BillingEvent.java +++ b/java/google/registry/beam/BillingEvent.java @@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import google.registry.reporting.billing.BillingModule; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/java/google/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD index efcc8ef42..c128bc92b 100644 --- a/java/google/registry/bigquery/BUILD +++ b/java/google/registry/bigquery/BUILD @@ -8,8 +8,8 @@ java_library( name = "bigquery", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", - "//java/google/registry/request", "//java/google/registry/util", "@com_google_api_client", "@com_google_api_client_appengine", diff --git a/java/google/registry/bigquery/BigqueryConnection.java b/java/google/registry/bigquery/BigqueryConnection.java index 581c38e29..3ef3a7d1e 100644 --- a/java/google/registry/bigquery/BigqueryConnection.java +++ b/java/google/registry/bigquery/BigqueryConnection.java @@ -54,6 +54,7 @@ import com.google.api.services.bigquery.model.ViewDefinition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableTable; import com.google.common.io.BaseEncoding; +import com.google.common.logging.FormattingLogger; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; @@ -62,7 +63,6 @@ import google.registry.bigquery.BigqueryUtils.DestinationFormat; import google.registry.bigquery.BigqueryUtils.SourceFormat; import google.registry.bigquery.BigqueryUtils.TableType; import google.registry.bigquery.BigqueryUtils.WriteDisposition; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.Sleeper; import google.registry.util.SqlTemplate; diff --git a/java/google/registry/bigquery/BigqueryFactory.java b/java/google/registry/bigquery/BigqueryFactory.java index 980b5d81f..bf1a0cb32 100644 --- a/java/google/registry/bigquery/BigqueryFactory.java +++ b/java/google/registry/bigquery/BigqueryFactory.java @@ -16,7 +16,7 @@ package google.registry.bigquery; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Sets.newConcurrentHashSet; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import com.google.api.client.extensions.appengine.http.UrlFetchTransport; import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential; @@ -33,7 +33,7 @@ import com.google.api.services.bigquery.model.TableFieldSchema; import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.TableSchema; import com.google.common.collect.ImmutableList; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/java/google/registry/config/BUILD b/java/google/registry/config/BUILD index 77d3be5a9..3037e68a1 100644 --- a/java/google/registry/config/BUILD +++ b/java/google/registry/config/BUILD @@ -9,6 +9,7 @@ java_library( srcs = glob(["*.java"]), resources = glob(["files/*.yaml"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/util", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", diff --git a/java/google/registry/config/YamlUtils.java b/java/google/registry/config/YamlUtils.java index 218f55fb1..24c1f7357 100644 --- a/java/google/registry/config/YamlUtils.java +++ b/java/google/registry/config/YamlUtils.java @@ -15,10 +15,10 @@ package google.registry.config; import static com.google.common.base.Ascii.toLowerCase; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.ResourceUtils.readResourceUtf8; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.util.Map; import java.util.Optional; import org.yaml.snakeyaml.Yaml; diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD index e30e26a73..5bac03378 100644 --- a/java/google/registry/cron/BUILD +++ b/java/google/registry/cron/BUILD @@ -8,6 +8,7 @@ java_library( name = "cron", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/request/auth", diff --git a/java/google/registry/cron/TldFanoutAction.java b/java/google/registry/cron/TldFanoutAction.java index c6ff7c5b8..621d605ec 100644 --- a/java/google/registry/cron/TldFanoutAction.java +++ b/java/google/registry/cron/TldFanoutAction.java @@ -36,13 +36,13 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.ParameterMap; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import java.util.Optional; import java.util.Random; diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD index b98d9df43..8bf53128b 100644 --- a/java/google/registry/dns/BUILD +++ b/java/google/registry/dns/BUILD @@ -20,6 +20,7 @@ java_library( ), deps = [ ":constants", + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns/writer", "//java/google/registry/model", diff --git a/java/google/registry/dns/DnsQueue.java b/java/google/registry/dns/DnsQueue.java index 1a50f5e9f..4862d822d 100644 --- a/java/google/registry/dns/DnsQueue.java +++ b/java/google/registry/dns/DnsQueue.java @@ -34,12 +34,12 @@ import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.apphosting.api.DeadlineExceededException; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InternetDomainName; import com.google.common.util.concurrent.RateLimiter; import google.registry.dns.DnsConstants.TargetType; import google.registry.model.registry.Registries; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; import java.util.List; diff --git a/java/google/registry/dns/DnsWriterProxy.java b/java/google/registry/dns/DnsWriterProxy.java index 1708533c0..fee29cafc 100644 --- a/java/google/registry/dns/DnsWriterProxy.java +++ b/java/google/registry/dns/DnsWriterProxy.java @@ -15,12 +15,12 @@ package google.registry.dns; import static com.google.common.base.Preconditions.checkState; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import google.registry.dns.writer.DnsWriter; import google.registry.model.registry.Registry; -import google.registry.util.FormattingLogger; import java.util.Map; import javax.inject.Inject; diff --git a/java/google/registry/dns/PublishDnsUpdatesAction.java b/java/google/registry/dns/PublishDnsUpdatesAction.java index 9bf075da3..a60b1603a 100644 --- a/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -18,6 +18,7 @@ import static google.registry.request.Action.Method.POST; import static google.registry.request.RequestParameters.PARAM_TLD; import static google.registry.util.CollectionUtils.nullToEmpty; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InternetDomainName; import google.registry.config.RegistryConfig.Config; import google.registry.dns.DnsMetrics.ActionStatus; @@ -32,7 +33,6 @@ import google.registry.request.auth.Auth; import google.registry.request.lock.LockHandler; import google.registry.util.Clock; import google.registry.util.DomainNameUtils; -import google.registry.util.FormattingLogger; import java.util.Set; import java.util.concurrent.Callable; import javax.inject.Inject; diff --git a/java/google/registry/dns/ReadDnsQueueAction.java b/java/google/registry/dns/ReadDnsQueueAction.java index 1ea056e96..ff15aaa71 100644 --- a/java/google/registry/dns/ReadDnsQueueAction.java +++ b/java/google/registry/dns/ReadDnsQueueAction.java @@ -37,6 +37,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.dns.DnsConstants.TargetType; import google.registry.model.registry.Registries; @@ -46,7 +47,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import java.io.UnsupportedEncodingException; import java.util.Collection; diff --git a/java/google/registry/dns/writer/BUILD b/java/google/registry/dns/writer/BUILD index 488e1731c..5437163be 100644 --- a/java/google/registry/dns/writer/BUILD +++ b/java/google/registry/dns/writer/BUILD @@ -8,7 +8,7 @@ java_library( name = "writer", srcs = glob(["*.java"]), deps = [ - "//java/google/registry/util", + "//java/com/google/common/logging:formatting_logger", "@com_google_dagger", "@com_google_guava", ], diff --git a/java/google/registry/dns/writer/VoidDnsWriter.java b/java/google/registry/dns/writer/VoidDnsWriter.java index 2baa1f46d..0a990feb1 100644 --- a/java/google/registry/dns/writer/VoidDnsWriter.java +++ b/java/google/registry/dns/writer/VoidDnsWriter.java @@ -14,7 +14,7 @@ package google.registry.dns.writer; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; diff --git a/java/google/registry/dns/writer/clouddns/BUILD b/java/google/registry/dns/writer/clouddns/BUILD index 036b5cd4f..557a7dfe3 100644 --- a/java/google/registry/dns/writer/clouddns/BUILD +++ b/java/google/registry/dns/writer/clouddns/BUILD @@ -8,6 +8,7 @@ java_library( name = "clouddns", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns/writer", "//java/google/registry/model", diff --git a/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java b/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java index 574716c13..c6d024cda 100644 --- a/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java +++ b/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InternetDomainName; import com.google.common.util.concurrent.RateLimiter; import google.registry.config.RegistryConfig.Config; @@ -41,7 +42,6 @@ import google.registry.model.host.HostResource; import google.registry.model.registry.Registries; import google.registry.util.Clock; import google.registry.util.Concurrent; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import java.io.IOException; import java.net.Inet4Address; diff --git a/java/google/registry/dns/writer/clouddns/MultiplyingCloudDnsWriter.java b/java/google/registry/dns/writer/clouddns/MultiplyingCloudDnsWriter.java index 44dac91a4..6f114abb3 100644 --- a/java/google/registry/dns/writer/clouddns/MultiplyingCloudDnsWriter.java +++ b/java/google/registry/dns/writer/clouddns/MultiplyingCloudDnsWriter.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InternetDomainName; import com.google.common.util.concurrent.RateLimiter; import google.registry.config.RegistryConfig.Config; @@ -41,7 +42,6 @@ import google.registry.model.host.HostResource; import google.registry.model.registry.Registries; import google.registry.util.Clock; import google.registry.util.Concurrent; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import java.io.IOException; import java.net.Inet4Address; diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index 9e4aa2c43..653744133 100644 --- a/java/google/registry/export/BUILD +++ b/java/google/registry/export/BUILD @@ -8,6 +8,7 @@ java_library( name = "export", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/gcs", diff --git a/java/google/registry/export/BigqueryPollJobAction.java b/java/google/registry/export/BigqueryPollJobAction.java index 1174c91d2..cd2322f4f 100644 --- a/java/google/registry/export/BigqueryPollJobAction.java +++ b/java/google/registry/export/BigqueryPollJobAction.java @@ -25,6 +25,7 @@ import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; +import com.google.common.logging.FormattingLogger; import dagger.Lazy; import google.registry.request.Action; import google.registry.request.Header; @@ -32,7 +33,6 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.NotModifiedException; import google.registry.request.Payload; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/java/google/registry/export/CheckSnapshotAction.java b/java/google/registry/export/CheckSnapshotAction.java index 540128728..7367cf1db 100644 --- a/java/google/registry/export/CheckSnapshotAction.java +++ b/java/google/registry/export/CheckSnapshotAction.java @@ -15,10 +15,10 @@ package google.registry.export; import static com.google.common.collect.Sets.intersection; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.export.LoadSnapshotAction.enqueueLoadSnapshotTask; import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.appengine.api.taskqueue.QueueFactory; import com.google.appengine.api.taskqueue.TaskHandle; @@ -28,6 +28,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import google.registry.export.DatastoreBackupInfo.BackupStatus; import google.registry.request.Action; import google.registry.request.HttpException.BadRequestException; @@ -37,7 +38,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestMethod; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.util.Set; import javax.inject.Inject; import org.joda.time.Duration; diff --git a/java/google/registry/export/ExportDomainListsAction.java b/java/google/registry/export/ExportDomainListsAction.java index d0eb808f1..619b6f709 100644 --- a/java/google/registry/export/ExportDomainListsAction.java +++ b/java/google/registry/export/ExportDomainListsAction.java @@ -31,6 +31,7 @@ import com.google.appengine.tools.mapreduce.ReducerInput; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; @@ -42,7 +43,6 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import java.io.IOException; import java.io.OutputStream; diff --git a/java/google/registry/export/ExportReservedTermsAction.java b/java/google/registry/export/ExportReservedTermsAction.java index 5eed08047..0fdcade4a 100644 --- a/java/google/registry/export/ExportReservedTermsAction.java +++ b/java/google/registry/export/ExportReservedTermsAction.java @@ -21,6 +21,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.model.registry.Registry; import google.registry.request.Action; @@ -29,7 +30,6 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; -import google.registry.util.FormattingLogger; import javax.inject.Inject; /** Action that exports the publicly viewable reserved terms list for a TLD to Google Drive. */ diff --git a/java/google/registry/export/ExportSnapshotAction.java b/java/google/registry/export/ExportSnapshotAction.java index 2bfb2f03e..1eb29ae6c 100644 --- a/java/google/registry/export/ExportSnapshotAction.java +++ b/java/google/registry/export/ExportSnapshotAction.java @@ -17,12 +17,12 @@ package google.registry.export; import static google.registry.export.CheckSnapshotAction.enqueuePollTask; import static google.registry.request.Action.Method.POST; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import javax.inject.Inject; /** diff --git a/java/google/registry/export/LoadSnapshotAction.java b/java/google/registry/export/LoadSnapshotAction.java index 402637aa5..96545b4ff 100644 --- a/java/google/registry/export/LoadSnapshotAction.java +++ b/java/google/registry/export/LoadSnapshotAction.java @@ -17,9 +17,9 @@ package google.registry.export; import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.export.UpdateSnapshotViewAction.createViewUpdateTask; import static google.registry.request.Action.Method.POST; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.api.services.bigquery.Bigquery; import com.google.api.services.bigquery.model.Job; @@ -34,6 +34,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.bigquery.BigqueryFactory; import google.registry.bigquery.BigqueryUtils.SourceFormat; import google.registry.bigquery.BigqueryUtils.WriteDisposition; @@ -45,7 +46,6 @@ import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import java.io.IOException; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/export/PublishDetailReportAction.java b/java/google/registry/export/PublishDetailReportAction.java index 6f242127e..5d8f3faf7 100644 --- a/java/google/registry/export/PublishDetailReportAction.java +++ b/java/google/registry/export/PublishDetailReportAction.java @@ -21,6 +21,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentPresent; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.gcs.GcsUtils; import google.registry.model.registrar.Registrar; @@ -31,7 +32,6 @@ import google.registry.request.JsonActionRunner; import google.registry.request.JsonActionRunner.JsonAction; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; -import google.registry.util.FormattingLogger; import java.io.FileNotFoundException; import java.io.InputStream; import java.util.Map; diff --git a/java/google/registry/export/SyncGroupMembersAction.java b/java/google/registry/export/SyncGroupMembersAction.java index 1cd2e14c2..d0a976e63 100644 --- a/java/google/registry/export/SyncGroupMembersAction.java +++ b/java/google/registry/export/SyncGroupMembersAction.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.groups.GroupsConnection; import google.registry.groups.GroupsConnection.Role; @@ -35,7 +36,6 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import java.io.IOException; import java.util.ArrayList; diff --git a/java/google/registry/export/UpdateSnapshotViewAction.java b/java/google/registry/export/UpdateSnapshotViewAction.java index 06ea12f1e..d3f199555 100644 --- a/java/google/registry/export/UpdateSnapshotViewAction.java +++ b/java/google/registry/export/UpdateSnapshotViewAction.java @@ -23,13 +23,13 @@ import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.ViewDefinition; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; +import com.google.common.logging.FormattingLogger; import google.registry.bigquery.BigqueryFactory; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.SqlTemplate; import java.io.IOException; import javax.inject.Inject; diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD index 63a10d9d1..67ca6d2a2 100644 --- a/java/google/registry/export/sheet/BUILD +++ b/java/google/registry/export/sheet/BUILD @@ -8,6 +8,7 @@ java_library( name = "sheet", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/request", diff --git a/java/google/registry/export/sheet/SheetSynchronizer.java b/java/google/registry/export/sheet/SheetSynchronizer.java index ae7b7a668..c2c9b5cb6 100644 --- a/java/google/registry/export/sheet/SheetSynchronizer.java +++ b/java/google/registry/export/sheet/SheetSynchronizer.java @@ -25,7 +25,7 @@ import com.google.api.services.sheets.v4.model.ClearValuesResponse; import com.google.api.services.sheets.v4.model.ValueRange; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java index d872b6d2b..478726bef 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java @@ -27,13 +27,13 @@ import com.google.appengine.api.modules.ModulesService; import com.google.appengine.api.modules.ModulesServiceFactory; import com.google.appengine.api.taskqueue.TaskHandle; import com.google.appengine.api.taskqueue.TaskOptions.Method; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.request.lock.LockHandler; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import java.io.IOException; import java.util.Optional; diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD index c188d40f0..7bc5c8a5d 100644 --- a/java/google/registry/flows/BUILD +++ b/java/google/registry/flows/BUILD @@ -23,6 +23,7 @@ java_library( visibility = ["//visibility:public"], deps = [ ":soy_java_wrappers", + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/model", diff --git a/java/google/registry/flows/CheckApiAction.java b/java/google/registry/flows/CheckApiAction.java index cfd2b00ea..fe06b0b40 100644 --- a/java/google/registry/flows/CheckApiAction.java +++ b/java/google/registry/flows/CheckApiAction.java @@ -29,6 +29,7 @@ import static org.json.simple.JSONValue.toJSONString; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InternetDomainName; import com.google.common.net.MediaType; import com.google.template.soy.SoyFileSet; @@ -46,7 +47,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.util.Map; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/flows/EppController.java b/java/google/registry/flows/EppController.java index 36b6865f5..66ab98cf9 100644 --- a/java/google/registry/flows/EppController.java +++ b/java/google/registry/flows/EppController.java @@ -24,6 +24,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import google.registry.flows.FlowModule.EppExceptionInProviderException; import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; @@ -33,7 +34,6 @@ import google.registry.model.eppoutput.Result; import google.registry.model.eppoutput.Result.Code; import google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer; import google.registry.monitoring.whitebox.EppMetric; -import google.registry.util.FormattingLogger; import java.util.Optional; import java.util.logging.Level; import javax.inject.Inject; diff --git a/java/google/registry/flows/EppRequestHandler.java b/java/google/registry/flows/EppRequestHandler.java index 3ad1831ea..e98c1176c 100644 --- a/java/google/registry/flows/EppRequestHandler.java +++ b/java/google/registry/flows/EppRequestHandler.java @@ -20,10 +20,10 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.model.eppoutput.EppOutput; import google.registry.request.Response; -import google.registry.util.FormattingLogger; import javax.inject.Inject; /** Handle an EPP request and response. */ diff --git a/java/google/registry/flows/EppTlsAction.java b/java/google/registry/flows/EppTlsAction.java index 259f1e85d..832ff6f18 100644 --- a/java/google/registry/flows/EppTlsAction.java +++ b/java/google/registry/flows/EppTlsAction.java @@ -14,11 +14,11 @@ package google.registry.flows; +import com.google.common.logging.FormattingLogger; import google.registry.request.Action; import google.registry.request.Action.Method; import google.registry.request.Payload; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import javax.inject.Inject; import javax.servlet.http.HttpSession; diff --git a/java/google/registry/flows/EppXmlTransformer.java b/java/google/registry/flows/EppXmlTransformer.java index 84b112dda..afe93b010 100644 --- a/java/google/registry/flows/EppXmlTransformer.java +++ b/java/google/registry/flows/EppXmlTransformer.java @@ -22,6 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import google.registry.flows.EppException.ParameterValueRangeErrorException; import google.registry.flows.EppException.ParameterValueSyntaxErrorException; import google.registry.flows.EppException.SyntaxErrorException; @@ -33,7 +34,6 @@ import google.registry.model.eppinput.EppInput.WrongProtocolVersionException; import google.registry.model.eppoutput.EppOutput; import google.registry.model.host.InetAddressAdapter.IpVersionMismatchException; import google.registry.model.translators.CurrencyUnitAdapter.UnknownCurrencyException; -import google.registry.util.FormattingLogger; import google.registry.xml.ValidationMode; import google.registry.xml.XmlException; import google.registry.xml.XmlTransformer; diff --git a/java/google/registry/flows/ExtensionManager.java b/java/google/registry/flows/ExtensionManager.java index b76c5d265..47b530790 100644 --- a/java/google/registry/flows/ExtensionManager.java +++ b/java/google/registry/flows/ExtensionManager.java @@ -22,6 +22,7 @@ import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtensio import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.flows.EppException.CommandUseErrorException; import google.registry.flows.EppException.SyntaxErrorException; import google.registry.flows.EppException.UnimplementedExtensionException; @@ -33,7 +34,6 @@ import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.domain.superuser.SuperuserExtension; import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.EppInput.CommandExtension; -import google.registry.util.FormattingLogger; import java.util.Set; import javax.inject.Inject; diff --git a/java/google/registry/flows/FlowReporter.java b/java/google/registry/flows/FlowReporter.java index 3006c3dea..56ae9f09f 100644 --- a/java/google/registry/flows/FlowReporter.java +++ b/java/google/registry/flows/FlowReporter.java @@ -24,12 +24,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import google.registry.flows.FlowModule.ClientId; import google.registry.flows.FlowModule.InputXml; import google.registry.flows.annotations.ReportingSpec; import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; -import google.registry.util.FormattingLogger; import java.util.Optional; import java.util.logging.Level; import javax.inject.Inject; diff --git a/java/google/registry/flows/FlowRunner.java b/java/google/registry/flows/FlowRunner.java index 6a214ad76..4267d1572 100644 --- a/java/google/registry/flows/FlowRunner.java +++ b/java/google/registry/flows/FlowRunner.java @@ -18,6 +18,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.xml.XmlTransformer.prettyPrint; import com.google.common.base.Strings; +import com.google.common.logging.FormattingLogger; import google.registry.flows.FlowModule.ClientId; import google.registry.flows.FlowModule.DryRun; import google.registry.flows.FlowModule.InputXml; @@ -27,7 +28,6 @@ import google.registry.flows.session.LoginFlow; import google.registry.model.eppcommon.Trid; import google.registry.model.eppoutput.EppOutput; import google.registry.monitoring.whitebox.EppMetric; -import google.registry.util.FormattingLogger; import java.util.logging.Level; import javax.inject.Inject; import javax.inject.Provider; diff --git a/java/google/registry/flows/TlsCredentials.java b/java/google/registry/flows/TlsCredentials.java index 43344f66c..a5329299b 100644 --- a/java/google/registry/flows/TlsCredentials.java +++ b/java/google/registry/flows/TlsCredentials.java @@ -21,6 +21,7 @@ import static google.registry.request.RequestParameters.extractRequiredHeader; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.google.common.net.HostAndPort; import com.google.common.net.InetAddresses; import dagger.Module; @@ -29,7 +30,6 @@ import google.registry.flows.EppException.AuthenticationErrorException; import google.registry.model.registrar.Registrar; import google.registry.request.Header; import google.registry.util.CidrAddressBlock; -import google.registry.util.FormattingLogger; import java.net.InetAddress; import java.util.Optional; import javax.inject.Inject; diff --git a/java/google/registry/flows/async/AsyncFlowEnqueuer.java b/java/google/registry/flows/async/AsyncFlowEnqueuer.java index ce186ff3f..c45ceb9a5 100644 --- a/java/google/registry/flows/async/AsyncFlowEnqueuer.java +++ b/java/google/registry/flows/async/AsyncFlowEnqueuer.java @@ -19,12 +19,12 @@ import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.annotations.VisibleForTesting; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.model.EppResource; import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostResource; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import javax.inject.Inject; import javax.inject.Named; diff --git a/java/google/registry/flows/async/AsyncFlowMetrics.java b/java/google/registry/flows/async/AsyncFlowMetrics.java index ba00ab668..7645379f9 100644 --- a/java/google/registry/flows/async/AsyncFlowMetrics.java +++ b/java/google/registry/flows/async/AsyncFlowMetrics.java @@ -15,13 +15,14 @@ package google.registry.flows.async; import static com.google.appengine.api.taskqueue.QueueConstants.maxLeaseCount; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static com.google.monitoring.metrics.EventMetric.DEFAULT_FITTER; import static google.registry.flows.async.AsyncFlowMetrics.OperationType.CONTACT_AND_HOST_DELETE; import static google.registry.flows.async.AsyncFlowMetrics.OperationType.DNS_REFRESH; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import com.google.monitoring.metrics.DistributionFitter; import com.google.monitoring.metrics.EventMetric; import com.google.monitoring.metrics.FibonacciFitter; @@ -29,7 +30,6 @@ import com.google.monitoring.metrics.IncrementableMetric; import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/flows/session/LoginFlow.java b/java/google/registry/flows/session/LoginFlow.java index 0d3bb5718..0a8830849 100644 --- a/java/google/registry/flows/session/LoginFlow.java +++ b/java/google/registry/flows/session/LoginFlow.java @@ -18,6 +18,7 @@ import static com.google.common.collect.Sets.difference; import static google.registry.util.CollectionUtils.nullToEmpty; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.flows.EppException; import google.registry.flows.EppException.AuthenticationErrorClosingConnectionException; import google.registry.flows.EppException.AuthenticationErrorException; @@ -40,7 +41,6 @@ import google.registry.model.eppinput.EppInput.Options; import google.registry.model.eppinput.EppInput.Services; import google.registry.model.eppoutput.EppResponse; import google.registry.model.registrar.Registrar; -import google.registry.util.FormattingLogger; import java.util.Optional; import java.util.Set; import javax.inject.Inject; diff --git a/java/google/registry/gcs/BUILD b/java/google/registry/gcs/BUILD index db3066c12..b1f52274f 100644 --- a/java/google/registry/gcs/BUILD +++ b/java/google/registry/gcs/BUILD @@ -8,8 +8,8 @@ java_library( name = "gcs", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", - "//java/google/registry/util", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/java/google/registry/gcs/GcsUtils.java b/java/google/registry/gcs/GcsUtils.java index 2a756e0a0..90c816d90 100644 --- a/java/google/registry/gcs/GcsUtils.java +++ b/java/google/registry/gcs/GcsUtils.java @@ -26,9 +26,9 @@ import com.google.appengine.tools.cloudstorage.ListResult; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/java/google/registry/groups/BUILD b/java/google/registry/groups/BUILD index d860a2644..9dedd55b7 100644 --- a/java/google/registry/groups/BUILD +++ b/java/google/registry/groups/BUILD @@ -8,8 +8,8 @@ java_library( name = "groups", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", - "//java/google/registry/request", "//java/google/registry/util", "@com_google_api_client", "@com_google_apis_google_api_services_admin_directory", diff --git a/java/google/registry/groups/DirectoryGroupsConnection.java b/java/google/registry/groups/DirectoryGroupsConnection.java index d5e2db3eb..b36464c1a 100644 --- a/java/google/registry/groups/DirectoryGroupsConnection.java +++ b/java/google/registry/groups/DirectoryGroupsConnection.java @@ -29,8 +29,8 @@ import com.google.api.services.groupssettings.model.Groups; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.Set; import javax.inject.Inject; diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD index 315e945c7..9adb5fde3 100644 --- a/java/google/registry/keyring/api/BUILD +++ b/java/google/registry/keyring/api/BUILD @@ -9,6 +9,7 @@ java_library( srcs = glob(["*.java"]), resources = glob(["*.asc"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/util", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/java/google/registry/keyring/api/ComparatorKeyring.java b/java/google/registry/keyring/api/ComparatorKeyring.java index d4d263610..48b1f89ce 100644 --- a/java/google/registry/keyring/api/ComparatorKeyring.java +++ b/java/google/registry/keyring/api/ComparatorKeyring.java @@ -16,8 +16,8 @@ package google.registry.keyring.api; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; +import com.google.common.logging.FormattingLogger; import google.registry.util.ComparingInvocationHandler; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD index 75a9ebba1..9ad1c5872 100644 --- a/java/google/registry/loadtest/BUILD +++ b/java/google/registry/loadtest/BUILD @@ -9,6 +9,7 @@ java_library( srcs = glob(["*.java"]), resources = glob(["templates/*.xml"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/request", "//java/google/registry/request/auth", diff --git a/java/google/registry/loadtest/LoadTestAction.java b/java/google/registry/loadtest/LoadTestAction.java index 4161ee76c..39027b5d0 100644 --- a/java/google/registry/loadtest/LoadTestAction.java +++ b/java/google/registry/loadtest/LoadTestAction.java @@ -19,8 +19,8 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Lists.partition; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.util.Arrays.asList; import static org.joda.time.DateTimeZone.UTC; @@ -28,12 +28,12 @@ import static org.joda.time.DateTimeZone.UTC; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryEnvironment; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.security.XsrfTokenManager; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import java.util.Arrays; import java.util.Iterator; diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD index e0acb238a..95095c413 100644 --- a/java/google/registry/mapreduce/BUILD +++ b/java/google/registry/mapreduce/BUILD @@ -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", diff --git a/java/google/registry/mapreduce/MapreduceRunner.java b/java/google/registry/mapreduce/MapreduceRunner.java index ed2ab79a2..1261fa806 100644 --- a/java/google/registry/mapreduce/MapreduceRunner.java +++ b/java/google/registry/mapreduce/MapreduceRunner.java @@ -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; diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index 6ef427eeb..b92dece7a 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/java/google/registry/mapreduce/inputs/BUILD @@ -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", diff --git a/java/google/registry/mapreduce/inputs/ChildEntityReader.java b/java/google/registry/mapreduce/inputs/ChildEntityReader.java index 2bbab5cf2..9e5011bfc 100644 --- a/java/google/registry/mapreduce/inputs/ChildEntityReader.java +++ b/java/google/registry/mapreduce/inputs/ChildEntityReader.java @@ -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 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 ChildReader withType(Class type) { return create(type, ancestor); } diff --git a/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java b/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java index eb8d3aaa0..aedc0f33b 100644 --- a/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java +++ b/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java @@ -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; diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java index 2b843f16f..c1938bbb3 100644 --- a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java +++ b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java @@ -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}. */ diff --git a/java/google/registry/mapreduce/inputs/RetryingInputReader.java b/java/google/registry/mapreduce/inputs/RetryingInputReader.java index 8812295d1..a9b2ebe3d 100644 --- a/java/google/registry/mapreduce/inputs/RetryingInputReader.java +++ b/java/google/registry/mapreduce/inputs/RetryingInputReader.java @@ -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; diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index 73bfe0a0a..175ea901b 100644 --- a/java/google/registry/model/BUILD +++ b/java/google/registry/model/BUILD @@ -13,6 +13,7 @@ java_library( ]), visibility = ["//visibility:public"], deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/util", "//java/google/registry/xml", diff --git a/java/google/registry/model/EppResourceUtils.java b/java/google/registry/model/EppResourceUtils.java index b837bfe97..90f37ad01 100644 --- a/java/google/registry/model/EppResourceUtils.java +++ b/java/google/registry/model/EppResourceUtils.java @@ -22,6 +22,7 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt; import static google.registry.util.DateTimeUtils.latestOf; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.Result; import com.googlecode.objectify.cmd.Query; @@ -41,7 +42,6 @@ import google.registry.model.ofy.CommitLogMutation; import google.registry.model.registry.Registry; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; -import google.registry.util.FormattingLogger; import java.util.List; import java.util.Map.Entry; import java.util.Set; diff --git a/java/google/registry/model/ofy/Ofy.java b/java/google/registry/model/ofy/Ofy.java index 5bc77ad24..038e945c7 100644 --- a/java/google/registry/model/ofy/Ofy.java +++ b/java/google/registry/model/ofy/Ofy.java @@ -28,6 +28,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import com.googlecode.objectify.Objectify; import com.googlecode.objectify.ObjectifyFactory; @@ -39,7 +40,6 @@ import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.VirtualEntity; import google.registry.model.ofy.ReadOnlyWork.KillTransactionException; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.Sleeper; import google.registry.util.SystemClock; diff --git a/java/google/registry/model/server/Lock.java b/java/google/registry/model/server/Lock.java index f8579d97e..048b51555 100644 --- a/java/google/registry/model/server/Lock.java +++ b/java/google/registry/model/server/Lock.java @@ -21,13 +21,13 @@ import static google.registry.util.DateTimeUtils.isAtOrAfter; import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.annotation.Entity; import com.googlecode.objectify.annotation.Id; import google.registry.model.ImmutableObject; import google.registry.model.annotations.NotBackedUp; import google.registry.model.annotations.NotBackedUp.Reason; -import google.registry.util.FormattingLogger; import google.registry.util.RequestStatusChecker; import google.registry.util.RequestStatusCheckerImpl; import java.util.Optional; diff --git a/java/google/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD index 0a1034d01..b46a5a01d 100644 --- a/java/google/registry/module/backend/BUILD +++ b/java/google/registry/module/backend/BUILD @@ -8,6 +8,7 @@ java_library( name = "backend", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/backup", "//java/google/registry/batch", "//java/google/registry/bigquery", diff --git a/java/google/registry/module/backend/BackendServlet.java b/java/google/registry/module/backend/BackendServlet.java index e425dfef6..50302e609 100644 --- a/java/google/registry/module/backend/BackendServlet.java +++ b/java/google/registry/module/backend/BackendServlet.java @@ -15,9 +15,9 @@ package google.registry.module.backend; import com.google.appengine.api.LifecycleManager; +import com.google.common.logging.FormattingLogger; import com.google.monitoring.metrics.MetricReporter; import dagger.Lazy; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.security.Security; import java.util.concurrent.TimeUnit; diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD index 6dd190579..c373ff3b3 100644 --- a/java/google/registry/module/frontend/BUILD +++ b/java/google/registry/module/frontend/BUILD @@ -8,6 +8,7 @@ java_library( name = "frontend", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/dns", @@ -26,6 +27,8 @@ java_library( "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", "@com_google_dagger", + "@com_google_flogger", + "@com_google_flogger_system_backend", "@com_google_guava", "@com_google_monitoring_client_metrics", "@javax_servlet_api", diff --git a/java/google/registry/module/frontend/FrontendServlet.java b/java/google/registry/module/frontend/FrontendServlet.java index ead034534..ec4cb7592 100644 --- a/java/google/registry/module/frontend/FrontendServlet.java +++ b/java/google/registry/module/frontend/FrontendServlet.java @@ -15,9 +15,10 @@ package google.registry.module.frontend; import com.google.appengine.api.LifecycleManager; +import com.google.common.flogger.FluentLogger; +import com.google.common.logging.FormattingLogger; import com.google.monitoring.metrics.MetricReporter; import dagger.Lazy; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.security.Security; import java.util.concurrent.TimeUnit; @@ -34,6 +35,8 @@ public final class FrontendServlet extends HttpServlet { private static final FrontendRequestHandler requestHandler = component.requestHandler(); private static final Lazy metricReporter = component.metricReporter(); private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); + // TODO(b/): Remove this static field. + private static final FluentLogger flogger = FluentLogger.forEnclosingClass(); @Override public void init() { @@ -62,7 +65,7 @@ public final class FrontendServlet extends HttpServlet { @Override public void service(HttpServletRequest req, HttpServletResponse rsp) throws IOException { - logger.info("Received frontend request"); + flogger.atInfo().log("Received frontend request"); requestHandler.handleRequest(req, rsp); } } diff --git a/java/google/registry/module/pubapi/BUILD b/java/google/registry/module/pubapi/BUILD index 9e52e21e5..ea6a27be9 100644 --- a/java/google/registry/module/pubapi/BUILD +++ b/java/google/registry/module/pubapi/BUILD @@ -8,6 +8,7 @@ java_library( name = "pubapi", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/flows", diff --git a/java/google/registry/module/pubapi/PubApiServlet.java b/java/google/registry/module/pubapi/PubApiServlet.java index aab42779b..a6e7f15ab 100644 --- a/java/google/registry/module/pubapi/PubApiServlet.java +++ b/java/google/registry/module/pubapi/PubApiServlet.java @@ -15,9 +15,9 @@ package google.registry.module.pubapi; import com.google.appengine.api.LifecycleManager; +import com.google.common.logging.FormattingLogger; import com.google.monitoring.metrics.MetricReporter; import dagger.Lazy; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.security.Security; import java.util.concurrent.TimeUnit; diff --git a/java/google/registry/module/tools/BUILD b/java/google/registry/module/tools/BUILD index 8578e0c20..b149da1fd 100644 --- a/java/google/registry/module/tools/BUILD +++ b/java/google/registry/module/tools/BUILD @@ -8,6 +8,7 @@ java_library( name = "tools", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/backup", "//java/google/registry/config", "//java/google/registry/dns", diff --git a/java/google/registry/module/tools/ToolsServlet.java b/java/google/registry/module/tools/ToolsServlet.java index 903f2d0a8..c2212ca18 100644 --- a/java/google/registry/module/tools/ToolsServlet.java +++ b/java/google/registry/module/tools/ToolsServlet.java @@ -14,7 +14,7 @@ package google.registry.module.tools; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.IOException; import java.security.Security; import javax.servlet.http.HttpServlet; diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD index a32572d68..b3c2fedbe 100644 --- a/java/google/registry/monitoring/whitebox/BUILD +++ b/java/google/registry/monitoring/whitebox/BUILD @@ -8,6 +8,7 @@ java_library( name = "whitebox", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/model", diff --git a/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java b/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java index a99546f1d..e85055f39 100644 --- a/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java +++ b/java/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuer.java @@ -21,7 +21,7 @@ import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.base.Supplier; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.util.Map.Entry; import javax.inject.Inject; import javax.inject.Named; diff --git a/java/google/registry/monitoring/whitebox/MetricsExportAction.java b/java/google/registry/monitoring/whitebox/MetricsExportAction.java index 0a3c54a87..eddf4ec24 100644 --- a/java/google/registry/monitoring/whitebox/MetricsExportAction.java +++ b/java/google/registry/monitoring/whitebox/MetricsExportAction.java @@ -17,8 +17,8 @@ package google.registry.monitoring.whitebox; import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; import static com.google.common.collect.Multimaps.filterKeys; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.request.Action.Method.POST; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static java.util.stream.Collectors.joining; import com.google.api.services.bigquery.Bigquery; @@ -28,13 +28,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.bigquery.BigqueryFactory; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.ParameterMap; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.Map; import javax.inject.Inject; diff --git a/java/google/registry/rdap/BUILD b/java/google/registry/rdap/BUILD index c464d7a4b..1166f6203 100644 --- a/java/google/registry/rdap/BUILD +++ b/java/google/registry/rdap/BUILD @@ -8,6 +8,7 @@ java_library( name = "rdap", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/flows", "//java/google/registry/model", diff --git a/java/google/registry/rdap/RdapActionBase.java b/java/google/registry/rdap/RdapActionBase.java index 47358a5fa..f369f2c73 100644 --- a/java/google/registry/rdap/RdapActionBase.java +++ b/java/google/registry/rdap/RdapActionBase.java @@ -27,6 +27,7 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import com.google.re2j.Pattern; import com.googlecode.objectify.Key; @@ -48,7 +49,6 @@ import google.registry.request.Response; import google.registry.request.auth.AuthResult; import google.registry.request.auth.UserAuthInfo; import google.registry.ui.server.registrar.SessionUtils; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/java/google/registry/rdap/RdapDomainSearchAction.java b/java/google/registry/rdap/RdapDomainSearchAction.java index ef724d27e..9e1fd90f7 100644 --- a/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/java/google/registry/rdap/RdapDomainSearchAction.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InetAddresses; import com.google.common.primitives.Booleans; import com.googlecode.objectify.Key; @@ -45,7 +46,6 @@ import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.Idn; import java.net.InetAddress; import java.util.ArrayList; diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java index e1e6a4b64..62de932cb 100644 --- a/java/google/registry/rdap/RdapJsonFormatter.java +++ b/java/google/registry/rdap/RdapJsonFormatter.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InetAddresses; import com.googlecode.objectify.Key; import google.registry.config.RdapNoticeDescriptor; @@ -49,7 +50,6 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.model.reporting.HistoryEntry; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.HttpException.NotFoundException; -import google.registry.util.FormattingLogger; import google.registry.util.Idn; import java.net.Inet4Address; import java.net.Inet6Address; diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index 78454b222..930bf3440 100644 --- a/java/google/registry/rde/BUILD +++ b/java/google/registry/rde/BUILD @@ -8,6 +8,7 @@ java_library( name = "rde", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/keyring/api", diff --git a/java/google/registry/rde/BrdaCopyAction.java b/java/google/registry/rde/BrdaCopyAction.java index 358fb5cca..6da0f31a9 100644 --- a/java/google/registry/rde/BrdaCopyAction.java +++ b/java/google/registry/rde/BrdaCopyAction.java @@ -20,6 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule.Key; @@ -28,7 +29,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/rde/DomainResourceToXjcConverter.java b/java/google/registry/rde/DomainResourceToXjcConverter.java index f2767ca7c..272b3dc4a 100644 --- a/java/google/registry/rde/DomainResourceToXjcConverter.java +++ b/java/google/registry/rde/DomainResourceToXjcConverter.java @@ -15,12 +15,13 @@ package google.registry.rde; import static com.google.common.base.Preconditions.checkState; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.model.ofy.ObjectifyService.ofy; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import com.google.common.base.Ascii; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.model.contact.ContactResource; import google.registry.model.domain.DesignatedContact; @@ -31,7 +32,6 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.rde.RdeMode; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; -import google.registry.util.FormattingLogger; import google.registry.util.Idn; import google.registry.xjc.domain.XjcDomainContactAttrType; import google.registry.xjc.domain.XjcDomainContactType; @@ -126,7 +126,7 @@ final class DomainResourceToXjcConverter { // o An OPTIONAL element that contains the date and time of // the most recent domain object successful transfer. This element // MUST NOT be present if the domain name object has never been - // transfered. + // transferred. bean.setTrDate(model.getLastTransferTime()); // o One or more elements that contain the current status diff --git a/java/google/registry/rde/EscrowTaskRunner.java b/java/google/registry/rde/EscrowTaskRunner.java index 4a7ed35b0..46260b396 100644 --- a/java/google/registry/rde/EscrowTaskRunner.java +++ b/java/google/registry/rde/EscrowTaskRunner.java @@ -16,6 +16,7 @@ package google.registry.rde; import static google.registry.model.ofy.ObjectifyService.ofy; +import com.google.common.logging.FormattingLogger; import google.registry.model.common.Cursor; import google.registry.model.common.Cursor.CursorType; import google.registry.model.registry.Registry; @@ -23,7 +24,6 @@ import google.registry.request.HttpException.NoContentException; import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.request.lock.LockHandler; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import java.util.concurrent.Callable; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/rde/Ghostryde.java b/java/google/registry/rde/Ghostryde.java index 5497b4701..59088fd02 100644 --- a/java/google/registry/rde/Ghostryde.java +++ b/java/google/registry/rde/Ghostryde.java @@ -24,8 +24,8 @@ import static org.bouncycastle.openpgp.PGPLiteralData.BINARY; import static org.joda.time.DateTimeZone.UTC; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import google.registry.util.ImprovedInputStream; import google.registry.util.ImprovedOutputStream; import java.io.ByteArrayInputStream; diff --git a/java/google/registry/rde/JSchSshSession.java b/java/google/registry/rde/JSchSshSession.java index 7496a5877..a770d67c2 100644 --- a/java/google/registry/rde/JSchSshSession.java +++ b/java/google/registry/rde/JSchSshSession.java @@ -15,13 +15,13 @@ package google.registry.rde; import com.google.common.base.Splitter; +import com.google.common.logging.FormattingLogger; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpException; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import java.io.Closeable; import java.io.IOException; import java.net.URI; diff --git a/java/google/registry/rde/RdeMarshaller.java b/java/google/registry/rde/RdeMarshaller.java index db4f243ff..f73d22f02 100644 --- a/java/google/registry/rde/RdeMarshaller.java +++ b/java/google/registry/rde/RdeMarshaller.java @@ -17,6 +17,7 @@ package google.registry.rde; import static com.google.common.base.Verify.verify; import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.model.ImmutableObject; import google.registry.model.contact.ContactResource; @@ -25,7 +26,6 @@ import google.registry.model.host.HostResource; import google.registry.model.rde.RdeMode; import google.registry.model.registrar.Registrar; import google.registry.tldconfig.idn.IdnTable; -import google.registry.util.FormattingLogger; import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.rde.XjcRdeContentsType; import google.registry.xjc.rde.XjcRdeDeposit; diff --git a/java/google/registry/rde/RdeReportAction.java b/java/google/registry/rde/RdeReportAction.java index fefcfb71c..ae058ed8f 100644 --- a/java/google/registry/rde/RdeReportAction.java +++ b/java/google/registry/rde/RdeReportAction.java @@ -23,6 +23,7 @@ import static google.registry.request.Action.Method.POST; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule.Key; @@ -37,7 +38,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.InputStream; import javax.inject.Inject; diff --git a/java/google/registry/rde/RdeReporter.java b/java/google/registry/rde/RdeReporter.java index 2f48f6beb..64707e8ac 100644 --- a/java/google/registry/rde/RdeReporter.java +++ b/java/google/registry/rde/RdeReporter.java @@ -28,10 +28,10 @@ import com.google.appengine.api.urlfetch.HTTPHeader; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.keyring.api.KeyModule.Key; import google.registry.request.HttpException.InternalServerErrorException; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import google.registry.util.UrlFetchException; import google.registry.xjc.XjcXmlTransformer; diff --git a/java/google/registry/rde/RdeStagingAction.java b/java/google/registry/rde/RdeStagingAction.java index a540d24d1..050cc3e41 100644 --- a/java/google/registry/rde/RdeStagingAction.java +++ b/java/google/registry/rde/RdeStagingAction.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimaps; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.mapreduce.MapreduceRunner; import google.registry.mapreduce.inputs.EppResourceInputs; @@ -45,7 +46,6 @@ import google.registry.request.RequestParameters; 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 javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/rde/RdeStagingReducer.java b/java/google/registry/rde/RdeStagingReducer.java index 1a99bb962..7b9466469 100644 --- a/java/google/registry/rde/RdeStagingReducer.java +++ b/java/google/registry/rde/RdeStagingReducer.java @@ -30,6 +30,7 @@ import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.Reducer; import com.google.appengine.tools.mapreduce.ReducerInput; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.keyring.api.KeyModule; @@ -43,7 +44,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.lock.LockHandler; import google.registry.tldconfig.idn.IdnTableEnum; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdeheader.XjcRdeHeaderElement; diff --git a/java/google/registry/rde/RdeUploadAction.java b/java/google/registry/rde/RdeUploadAction.java index 194e6ce81..42fe03db6 100644 --- a/java/google/registry/rde/RdeUploadAction.java +++ b/java/google/registry/rde/RdeUploadAction.java @@ -30,6 +30,7 @@ import com.google.appengine.api.taskqueue.Queue; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import dagger.Lazy; @@ -50,7 +51,6 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import google.registry.util.TaskQueueUtils; import google.registry.util.TeeOutputStream; diff --git a/java/google/registry/rde/imports/BUILD b/java/google/registry/rde/imports/BUILD index 42dd253f3..e791054fe 100644 --- a/java/google/registry/rde/imports/BUILD +++ b/java/google/registry/rde/imports/BUILD @@ -8,6 +8,7 @@ java_library( name = "imports", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/flows", diff --git a/java/google/registry/rde/imports/RdeContactImportAction.java b/java/google/registry/rde/imports/RdeContactImportAction.java index c977dfb7e..091c36e13 100644 --- a/java/google/registry/rde/imports/RdeContactImportAction.java +++ b/java/google/registry/rde/imports/RdeContactImportAction.java @@ -23,6 +23,7 @@ import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.VoidWork; import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryConfig.ConfigModule; @@ -33,7 +34,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.SystemClock; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdecontact.XjcRdeContact; diff --git a/java/google/registry/rde/imports/RdeContactReader.java b/java/google/registry/rde/imports/RdeContactReader.java index 04e1b40e2..a20138565 100644 --- a/java/google/registry/rde/imports/RdeContactReader.java +++ b/java/google/registry/rde/imports/RdeContactReader.java @@ -19,9 +19,9 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.InputReader; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.ConfigModule; import google.registry.gcs.GcsUtils; -import google.registry.util.FormattingLogger; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdecontact.XjcRdeContactElement; import java.io.IOException; diff --git a/java/google/registry/rde/imports/RdeDomainImportAction.java b/java/google/registry/rde/imports/RdeDomainImportAction.java index 004ad1261..dfd84b240 100644 --- a/java/google/registry/rde/imports/RdeDomainImportAction.java +++ b/java/google/registry/rde/imports/RdeDomainImportAction.java @@ -34,6 +34,7 @@ import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.VoidWork; import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryConfig.ConfigModule; @@ -54,7 +55,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.SystemClock; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdedomain.XjcRdeDomain; diff --git a/java/google/registry/rde/imports/RdeDomainReader.java b/java/google/registry/rde/imports/RdeDomainReader.java index 630a27840..b00d9c611 100644 --- a/java/google/registry/rde/imports/RdeDomainReader.java +++ b/java/google/registry/rde/imports/RdeDomainReader.java @@ -19,9 +19,9 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.InputReader; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.ConfigModule; import google.registry.gcs.GcsUtils; -import google.registry.util.FormattingLogger; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdedomain.XjcRdeDomainElement; import java.io.IOException; diff --git a/java/google/registry/rde/imports/RdeHostImportAction.java b/java/google/registry/rde/imports/RdeHostImportAction.java index 79353f440..da86d69f7 100644 --- a/java/google/registry/rde/imports/RdeHostImportAction.java +++ b/java/google/registry/rde/imports/RdeHostImportAction.java @@ -23,6 +23,7 @@ import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.VoidWork; import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryConfig.ConfigModule; @@ -33,7 +34,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.SystemClock; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdehost.XjcRdeHost; diff --git a/java/google/registry/rde/imports/RdeHostLinkAction.java b/java/google/registry/rde/imports/RdeHostLinkAction.java index 09892233f..dba5838d2 100644 --- a/java/google/registry/rde/imports/RdeHostLinkAction.java +++ b/java/google/registry/rde/imports/RdeHostLinkAction.java @@ -24,6 +24,7 @@ import static java.util.stream.Collectors.joining; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InternetDomainName; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; @@ -37,7 +38,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rdehost.XjcRdeHostElement; diff --git a/java/google/registry/rde/imports/RdeHostReader.java b/java/google/registry/rde/imports/RdeHostReader.java index 8c606cbc6..94a86d911 100644 --- a/java/google/registry/rde/imports/RdeHostReader.java +++ b/java/google/registry/rde/imports/RdeHostReader.java @@ -19,9 +19,9 @@ import com.google.appengine.tools.cloudstorage.GcsService; import com.google.appengine.tools.cloudstorage.GcsServiceFactory; import com.google.appengine.tools.cloudstorage.RetryParams; import com.google.appengine.tools.mapreduce.InputReader; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.ConfigModule; import google.registry.gcs.GcsUtils; -import google.registry.util.FormattingLogger; import google.registry.xjc.JaxbFragment; import google.registry.xjc.rdehost.XjcRdeHostElement; import java.io.IOException; diff --git a/java/google/registry/rde/imports/RdeImportUtils.java b/java/google/registry/rde/imports/RdeImportUtils.java index 48895bbc0..d3c2bbdb9 100644 --- a/java/google/registry/rde/imports/RdeImportUtils.java +++ b/java/google/registry/rde/imports/RdeImportUtils.java @@ -26,6 +26,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.collect.ImmutableSet; import com.google.common.io.BaseEncoding; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.flows.ServerTridProvider; @@ -48,7 +49,6 @@ import google.registry.model.registry.Registry.RegistryNotFoundException; import google.registry.model.registry.Registry.TldState; import google.registry.model.reporting.HistoryEntry; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.rdedomain.XjcRdeDomain; import google.registry.xjc.rdedomain.XjcRdeDomainElement; diff --git a/java/google/registry/reporting/billing/BUILD b/java/google/registry/reporting/billing/BUILD index ebe1165f6..287d3430f 100644 --- a/java/google/registry/reporting/billing/BUILD +++ b/java/google/registry/reporting/billing/BUILD @@ -11,6 +11,7 @@ java_library( "@com_google_apis_google_api_services_bigquery", ], deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/model", diff --git a/java/google/registry/reporting/billing/BillingEmailUtils.java b/java/google/registry/reporting/billing/BillingEmailUtils.java index 32382d277..22faf741a 100644 --- a/java/google/registry/reporting/billing/BillingEmailUtils.java +++ b/java/google/registry/reporting/billing/BillingEmailUtils.java @@ -20,10 +20,10 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.collect.ImmutableList; import com.google.common.io.CharStreams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.reporting.billing.BillingModule.InvoiceDirectoryPrefix; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import google.registry.util.SendEmailService; import java.io.IOException; diff --git a/java/google/registry/reporting/billing/CopyDetailReportsAction.java b/java/google/registry/reporting/billing/CopyDetailReportsAction.java index 89ab3fdf2..f7ce343a5 100644 --- a/java/google/registry/reporting/billing/CopyDetailReportsAction.java +++ b/java/google/registry/reporting/billing/CopyDetailReportsAction.java @@ -22,6 +22,7 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.appengine.tools.cloudstorage.GcsFilename; import com.google.common.collect.ImmutableList; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; @@ -31,7 +32,6 @@ import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/reporting/billing/GenerateInvoicesAction.java b/java/google/registry/reporting/billing/GenerateInvoicesAction.java index 55e539520..302a94df6 100644 --- a/java/google/registry/reporting/billing/GenerateInvoicesAction.java +++ b/java/google/registry/reporting/billing/GenerateInvoicesAction.java @@ -27,13 +27,13 @@ import com.google.api.services.dataflow.model.RuntimeEnvironment; import com.google.appengine.api.taskqueue.QueueFactory; import com.google.appengine.api.taskqueue.TaskOptions; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import javax.inject.Inject; import org.joda.time.Duration; diff --git a/java/google/registry/reporting/billing/PublishInvoicesAction.java b/java/google/registry/reporting/billing/PublishInvoicesAction.java index adbbed9d2..36db89c6f 100644 --- a/java/google/registry/reporting/billing/PublishInvoicesAction.java +++ b/java/google/registry/reporting/billing/PublishInvoicesAction.java @@ -25,13 +25,13 @@ import com.google.api.services.dataflow.Dataflow; import com.google.api.services.dataflow.model.Job; import com.google.appengine.api.taskqueue.QueueFactory; import com.google.appengine.api.taskqueue.TaskOptions; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import javax.inject.Inject; import org.joda.time.YearMonth; diff --git a/java/google/registry/reporting/icann/BUILD b/java/google/registry/reporting/icann/BUILD index 092985f0c..662dbedae 100644 --- a/java/google/registry/reporting/icann/BUILD +++ b/java/google/registry/reporting/icann/BUILD @@ -9,6 +9,7 @@ java_library( srcs = glob(["*.java"]), resources = glob(["sql/*"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/gcs", diff --git a/java/google/registry/reporting/icann/IcannHttpReporter.java b/java/google/registry/reporting/icann/IcannHttpReporter.java index b752bf708..8f33308e2 100644 --- a/java/google/registry/reporting/icann/IcannHttpReporter.java +++ b/java/google/registry/reporting/icann/IcannHttpReporter.java @@ -28,10 +28,10 @@ import com.google.api.client.http.HttpTransport; import com.google.common.base.Ascii; import com.google.common.base.Splitter; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.keyring.api.KeyModule.Key; import google.registry.reporting.icann.IcannReportingModule.ReportType; -import google.registry.util.FormattingLogger; import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.iirdea.XjcIirdeaResponseElement; import google.registry.xjc.iirdea.XjcIirdeaResult; diff --git a/java/google/registry/reporting/icann/IcannReportingStager.java b/java/google/registry/reporting/icann/IcannReportingStager.java index 0f5e26050..72a69750d 100644 --- a/java/google/registry/reporting/icann/IcannReportingStager.java +++ b/java/google/registry/reporting/icann/IcannReportingStager.java @@ -30,13 +30,13 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableTable; import com.google.common.collect.ListMultimap; +import com.google.common.logging.FormattingLogger; import google.registry.bigquery.BigqueryConnection; import google.registry.bigquery.BigqueryUtils.TableType; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.reporting.icann.IcannReportingModule.ReportType; import google.registry.reporting.icann.IcannReportingModule.ReportingSubdir; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/java/google/registry/reporting/icann/IcannReportingStagingAction.java b/java/google/registry/reporting/icann/IcannReportingStagingAction.java index e452fecf3..a77335cc6 100644 --- a/java/google/registry/reporting/icann/IcannReportingStagingAction.java +++ b/java/google/registry/reporting/icann/IcannReportingStagingAction.java @@ -24,6 +24,7 @@ import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TaskOptions.Method; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.bigquery.BigqueryJobFailureException; import google.registry.reporting.icann.IcannReportingModule.ReportType; @@ -31,7 +32,6 @@ import google.registry.reporting.icann.IcannReportingModule.ReportingSubdir; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import javax.inject.Inject; import org.joda.time.Duration; diff --git a/java/google/registry/reporting/icann/IcannReportingUploadAction.java b/java/google/registry/reporting/icann/IcannReportingUploadAction.java index 20d58a1ff..c007f5c8a 100644 --- a/java/google/registry/reporting/icann/IcannReportingUploadAction.java +++ b/java/google/registry/reporting/icann/IcannReportingUploadAction.java @@ -26,13 +26,13 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.reporting.icann.IcannReportingModule.ReportingSubdir; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/reporting/icann/ReportingEmailUtils.java b/java/google/registry/reporting/icann/ReportingEmailUtils.java index fa734b945..ba7663274 100644 --- a/java/google/registry/reporting/icann/ReportingEmailUtils.java +++ b/java/google/registry/reporting/icann/ReportingEmailUtils.java @@ -14,8 +14,8 @@ package google.registry.reporting.icann; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import google.registry.util.SendEmailService; import javax.inject.Inject; import javax.mail.Message; diff --git a/java/google/registry/request/BUILD b/java/google/registry/request/BUILD index 0974abe30..8dfbe9577 100644 --- a/java/google/registry/request/BUILD +++ b/java/google/registry/request/BUILD @@ -11,6 +11,7 @@ java_library( exclude = ["Modules.java"], ), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/request/auth", "//java/google/registry/request/lock", "//java/google/registry/util", diff --git a/java/google/registry/request/HttpException.java b/java/google/registry/request/HttpException.java index d5597f4aa..2b6c28496 100644 --- a/java/google/registry/request/HttpException.java +++ b/java/google/registry/request/HttpException.java @@ -16,7 +16,7 @@ package google.registry.request; import static com.google.common.html.HtmlEscapers.htmlEscaper; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.IOException; import javax.servlet.http.HttpServletResponse; diff --git a/java/google/registry/request/RequestHandler.java b/java/google/registry/request/RequestHandler.java index 1d2b8918d..f7d15b177 100644 --- a/java/google/registry/request/RequestHandler.java +++ b/java/google/registry/request/RequestHandler.java @@ -20,9 +20,9 @@ import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import com.google.common.logging.FormattingLogger; import google.registry.request.auth.AuthResult; import google.registry.request.auth.RequestAuthenticator; -import google.registry.util.FormattingLogger; import google.registry.util.TypeUtils.TypeInstantiator; import java.io.IOException; import java.util.Optional; diff --git a/java/google/registry/request/auth/BUILD b/java/google/registry/request/auth/BUILD index 26d201e3e..d4e327965 100644 --- a/java/google/registry/request/auth/BUILD +++ b/java/google/registry/request/auth/BUILD @@ -8,9 +8,9 @@ java_library( name = "auth", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/security", - "//java/google/registry/util", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/request/auth/OAuthAuthenticationMechanism.java b/java/google/registry/request/auth/OAuthAuthenticationMechanism.java index 4d00807e1..aff5190d3 100644 --- a/java/google/registry/request/auth/OAuthAuthenticationMechanism.java +++ b/java/google/registry/request/auth/OAuthAuthenticationMechanism.java @@ -24,8 +24,8 @@ import com.google.appengine.api.oauth.OAuthServiceFailureException; import com.google.appengine.api.users.User; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/request/auth/RequestAuthenticator.java b/java/google/registry/request/auth/RequestAuthenticator.java index 3d3596b4c..f54faca6c 100644 --- a/java/google/registry/request/auth/RequestAuthenticator.java +++ b/java/google/registry/request/auth/RequestAuthenticator.java @@ -20,8 +20,8 @@ import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; +import com.google.common.logging.FormattingLogger; import com.google.errorprone.annotations.Immutable; -import google.registry.util.FormattingLogger; import java.util.Optional; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/request/lock/BUILD b/java/google/registry/request/lock/BUILD index 061079191..5f833f006 100644 --- a/java/google/registry/request/lock/BUILD +++ b/java/google/registry/request/lock/BUILD @@ -8,6 +8,7 @@ java_library( name = "lock", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/model", "//java/google/registry/util", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/request/lock/LockHandlerImpl.java b/java/google/registry/request/lock/LockHandlerImpl.java index df45f4fc4..1dcaa1b0e 100644 --- a/java/google/registry/request/lock/LockHandlerImpl.java +++ b/java/google/registry/request/lock/LockHandlerImpl.java @@ -20,10 +20,10 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSortedSet; +import com.google.common.logging.FormattingLogger; import com.google.common.util.concurrent.UncheckedExecutionException; import google.registry.model.server.Lock; import google.registry.util.AppEngineTimeLimiter; -import google.registry.util.FormattingLogger; import google.registry.util.RequestStatusChecker; import java.util.HashSet; import java.util.Optional; diff --git a/java/google/registry/security/BUILD b/java/google/registry/security/BUILD index e2f7fac06..ba1d8bb5b 100644 --- a/java/google/registry/security/BUILD +++ b/java/google/registry/security/BUILD @@ -11,6 +11,7 @@ java_library( exclude = glob(["*Servlet.java"]), ), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/model", "//java/google/registry/util", "//third_party/objectify:objectify-v4_1", diff --git a/java/google/registry/security/JsonHttp.java b/java/google/registry/security/JsonHttp.java index e0132ccb4..3d46f4d34 100644 --- a/java/google/registry/security/JsonHttp.java +++ b/java/google/registry/security/JsonHttp.java @@ -20,8 +20,8 @@ import static com.google.common.net.HttpHeaders.X_CONTENT_TYPE_OPTIONS; import static com.google.common.net.MediaType.JSON_UTF_8; import static org.json.simple.JSONValue.writeJSONString; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.Reader; import java.io.Writer; diff --git a/java/google/registry/security/XsrfTokenManager.java b/java/google/registry/security/XsrfTokenManager.java index 5be95b7e0..aa92ce4bb 100644 --- a/java/google/registry/security/XsrfTokenManager.java +++ b/java/google/registry/security/XsrfTokenManager.java @@ -23,9 +23,9 @@ import com.google.appengine.api.users.UserService; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.hash.Hashing; +import com.google.common.logging.FormattingLogger; import google.registry.model.server.ServerSecret; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import java.util.List; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD index 5fc8417dc..7e943a0be 100644 --- a/java/google/registry/tmch/BUILD +++ b/java/google/registry/tmch/BUILD @@ -13,6 +13,7 @@ java_library( "*.asc", ]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/keyring/api", "//java/google/registry/model", diff --git a/java/google/registry/tmch/NordnUploadAction.java b/java/google/registry/tmch/NordnUploadAction.java index d1442cc95..1807ec759 100644 --- a/java/google/registry/tmch/NordnUploadAction.java +++ b/java/google/registry/tmch/NordnUploadAction.java @@ -34,13 +34,13 @@ import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.TaskQueueUtils; import google.registry.util.UrlFetchException; import java.io.IOException; diff --git a/java/google/registry/tmch/NordnVerifyAction.java b/java/google/registry/tmch/NordnVerifyAction.java index 865e9dc11..5633e33ad 100644 --- a/java/google/registry/tmch/NordnVerifyAction.java +++ b/java/google/registry/tmch/NordnVerifyAction.java @@ -25,6 +25,7 @@ import com.google.appengine.api.urlfetch.HTTPResponse; import com.google.appengine.api.urlfetch.URLFetchService; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.ByteSource; +import com.google.common.logging.FormattingLogger; import google.registry.request.Action; import google.registry.request.Header; import google.registry.request.HttpException.ConflictException; @@ -32,7 +33,6 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.UrlFetchException; import java.io.IOException; import java.net.URL; diff --git a/java/google/registry/tmch/TmchDnlAction.java b/java/google/registry/tmch/TmchDnlAction.java index 9f7c7ef60..3125cfb16 100644 --- a/java/google/registry/tmch/TmchDnlAction.java +++ b/java/google/registry/tmch/TmchDnlAction.java @@ -16,11 +16,11 @@ package google.registry.tmch; import static google.registry.request.Action.Method.POST; +import com.google.common.logging.FormattingLogger; import google.registry.keyring.api.KeyModule.Key; import google.registry.model.tmch.ClaimsListShard; import google.registry.request.Action; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.security.SignatureException; import java.util.List; diff --git a/java/google/registry/tmch/TmchSmdrlAction.java b/java/google/registry/tmch/TmchSmdrlAction.java index 65ca192b9..bb6511587 100644 --- a/java/google/registry/tmch/TmchSmdrlAction.java +++ b/java/google/registry/tmch/TmchSmdrlAction.java @@ -16,11 +16,11 @@ package google.registry.tmch; import static google.registry.request.Action.Method.POST; +import com.google.common.logging.FormattingLogger; import google.registry.keyring.api.KeyModule.Key; import google.registry.model.smd.SignedMarkRevocationList; import google.registry.request.Action; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.security.SignatureException; import java.util.List; diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index 67c521c45..677ccb2c3 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -34,6 +34,7 @@ java_library( ]), visibility = [":allowed-tools"], deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/backup", "//java/google/registry/beam", "//java/google/registry/bigquery", diff --git a/java/google/registry/tools/LockDomainCommand.java b/java/google/registry/tools/LockDomainCommand.java index 7dfd79427..04e347445 100644 --- a/java/google/registry/tools/LockDomainCommand.java +++ b/java/google/registry/tools/LockDomainCommand.java @@ -16,19 +16,19 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.model.EppResourceUtils.loadByForeignKey; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.Parameters; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.google.template.soy.data.SoyMapData; import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.StatusValue; import google.registry.tools.soy.DomainUpdateSoyInfo; -import google.registry.util.FormattingLogger; import org.joda.time.DateTime; /** diff --git a/java/google/registry/tools/LogoutCommand.java b/java/google/registry/tools/LogoutCommand.java index 3fe1f9e04..764cc1289 100644 --- a/java/google/registry/tools/LogoutCommand.java +++ b/java/google/registry/tools/LogoutCommand.java @@ -17,7 +17,7 @@ package google.registry.tools; import com.beust.jcommander.Parameters; import com.google.api.client.auth.oauth2.StoredCredential; import com.google.api.client.util.store.AbstractDataStoreFactory; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.IOException; import javax.inject.Inject; diff --git a/java/google/registry/tools/UnlockDomainCommand.java b/java/google/registry/tools/UnlockDomainCommand.java index 5abee0982..934bc994e 100644 --- a/java/google/registry/tools/UnlockDomainCommand.java +++ b/java/google/registry/tools/UnlockDomainCommand.java @@ -16,19 +16,19 @@ package google.registry.tools; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.model.EppResourceUtils.loadByForeignKey; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.Parameters; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.google.template.soy.data.SoyMapData; import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.StatusValue; import google.registry.tools.soy.DomainUpdateSoyInfo; -import google.registry.util.FormattingLogger; import org.joda.time.DateTime; /** diff --git a/java/google/registry/tools/UpdateDomainCommand.java b/java/google/registry/tools/UpdateDomainCommand.java index effd8685e..463947e3e 100644 --- a/java/google/registry/tools/UpdateDomainCommand.java +++ b/java/google/registry/tools/UpdateDomainCommand.java @@ -26,12 +26,12 @@ import com.beust.jcommander.Parameters; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; +import com.google.common.logging.FormattingLogger; import com.google.template.soy.data.SoyMapData; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DomainResource; import google.registry.model.eppcommon.StatusValue; import google.registry.tools.soy.DomainUpdateSoyInfo; -import google.registry.util.FormattingLogger; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index ae66ec2ba..2cee5e626 100644 --- a/java/google/registry/tools/server/BUILD +++ b/java/google/registry/tools/server/BUILD @@ -8,6 +8,7 @@ java_library( name = "server", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/export", diff --git a/java/google/registry/tools/server/CreateGroupsAction.java b/java/google/registry/tools/server/CreateGroupsAction.java index a6cf7587c..51cc1cda3 100644 --- a/java/google/registry/tools/server/CreateGroupsAction.java +++ b/java/google/registry/tools/server/CreateGroupsAction.java @@ -19,6 +19,7 @@ import static google.registry.request.Action.Method.POST; import static java.util.Arrays.asList; import static javax.servlet.http.HttpServletResponse.SC_OK; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.groups.GroupsConnection; import google.registry.groups.GroupsConnection.Role; @@ -31,7 +32,6 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Concurrent; -import google.registry.util.FormattingLogger; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; diff --git a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java index 6415f6929..16c58df56 100644 --- a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java +++ b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java @@ -15,9 +15,9 @@ package google.registry.tools.server; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import google.registry.request.JsonResponse; import google.registry.request.Parameter; -import google.registry.util.FormattingLogger; import java.util.logging.Level; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/DeleteEntityAction.java b/java/google/registry/tools/server/DeleteEntityAction.java index 166a072b0..9b80fa443 100644 --- a/java/google/registry/tools/server/DeleteEntityAction.java +++ b/java/google/registry/tools/server/DeleteEntityAction.java @@ -24,6 +24,7 @@ import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.VoidWork; import com.googlecode.objectify.impl.EntityMetadata; import google.registry.request.Action; @@ -31,7 +32,6 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import java.util.Optional; import javax.inject.Inject; diff --git a/java/google/registry/tools/server/ListObjectsAction.java b/java/google/registry/tools/server/ListObjectsAction.java index 01252a691..9481faf29 100644 --- a/java/google/registry/tools/server/ListObjectsAction.java +++ b/java/google/registry/tools/server/ListObjectsAction.java @@ -30,10 +30,10 @@ import com.google.common.collect.ImmutableTable; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import google.registry.model.ImmutableObject; import google.registry.request.JsonResponse; import google.registry.request.Parameter; -import google.registry.util.FormattingLogger; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java b/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java index 39dfbcc30..b7ba5f704 100644 --- a/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java +++ b/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java @@ -14,16 +14,17 @@ package google.registry.tools.server; +import static com.google.common.logging.FormattingLogger.getLoggerForCallerClass; import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput; import static google.registry.model.EppResourceUtils.isActive; import static google.registry.model.registry.Registries.assertTldsExist; -import static google.registry.util.FormattingLogger.getLoggerForCallerClass; import static google.registry.util.PipelineUtils.createJobPath; import com.google.appengine.tools.mapreduce.Mapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import google.registry.dns.DnsQueue; import google.registry.mapreduce.MapreduceRunner; import google.registry.model.domain.DomainResource; @@ -31,7 +32,6 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import javax.inject.Inject; import org.joda.time.DateTime; diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index 3384d5598..3398140b9 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/java/google/registry/ui/server/registrar/BUILD @@ -12,6 +12,7 @@ java_library( "//java/google/registry/ui/css:registrar_dbg.css.js", ], deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/export/sheet", diff --git a/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java index 4e6284bbd..78ae85929 100644 --- a/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java @@ -28,6 +28,7 @@ import com.braintreegateway.TransactionRequest; import com.braintreegateway.ValidationError; import com.braintreegateway.ValidationErrors; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import com.google.re2j.Pattern; import google.registry.config.RegistryConfig.Config; import google.registry.model.registrar.Registrar; @@ -39,7 +40,6 @@ import google.registry.request.auth.AuthResult; import google.registry.security.JsonResponseHelper; import google.registry.ui.forms.FormField; import google.registry.ui.forms.FormFieldException; -import google.registry.util.FormattingLogger; import java.math.BigDecimal; import java.util.List; import java.util.Locale; diff --git a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java index a102cce22..2f6e434e3 100644 --- a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.export.sheet.SyncRegistrarsSheetAction; import google.registry.model.registrar.Registrar; @@ -44,7 +45,6 @@ import google.registry.ui.forms.FormFieldException; import google.registry.ui.server.RegistrarFormFields; import google.registry.util.CollectionUtils; import google.registry.util.DiffUtils; -import google.registry.util.FormattingLogger; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; diff --git a/java/google/registry/ui/server/registrar/SendEmailUtils.java b/java/google/registry/ui/server/registrar/SendEmailUtils.java index eeeb0ed27..8fcbe60e0 100644 --- a/java/google/registry/ui/server/registrar/SendEmailUtils.java +++ b/java/google/registry/ui/server/registrar/SendEmailUtils.java @@ -19,8 +19,8 @@ import static com.google.common.collect.Iterables.toArray; import com.google.common.base.Joiner; import com.google.common.collect.Streams; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import google.registry.util.NonFinalForTesting; import google.registry.util.SendEmailService; import java.util.List; diff --git a/java/google/registry/ui/server/registrar/SessionUtils.java b/java/google/registry/ui/server/registrar/SessionUtils.java index ceca85d35..0661deff2 100644 --- a/java/google/registry/ui/server/registrar/SessionUtils.java +++ b/java/google/registry/ui/server/registrar/SessionUtils.java @@ -21,6 +21,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentPresent; import com.google.appengine.api.users.User; import com.google.common.base.Strings; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.config.RegistryConfig.Config; import google.registry.model.registrar.Registrar; @@ -28,7 +29,6 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.request.HttpException.ForbiddenException; import google.registry.request.auth.AuthResult; import google.registry.request.auth.UserAuthInfo; -import google.registry.util.FormattingLogger; import java.util.Optional; import javax.annotation.CheckReturnValue; import javax.annotation.concurrent.Immutable; diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index 77516b9c2..f72db933f 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -8,6 +8,7 @@ java_library( name = "util", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", diff --git a/java/google/registry/util/CidrAddressBlock.java b/java/google/registry/util/CidrAddressBlock.java index 8b5e98ce4..07a322550 100644 --- a/java/google/registry/util/CidrAddressBlock.java +++ b/java/google/registry/util/CidrAddressBlock.java @@ -17,6 +17,7 @@ package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.AbstractSequentialIterator; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InetAddresses; import java.io.Serializable; import java.net.InetAddress; diff --git a/java/google/registry/util/FormattingLogger.java b/java/google/registry/util/FormattingLogger.java deleted file mode 100644 index 77a5c2752..000000000 --- a/java/google/registry/util/FormattingLogger.java +++ /dev/null @@ -1,133 +0,0 @@ -// 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.util; - -import java.util.Arrays; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.annotation.Nullable; - -/** Logging wrapper. */ -public class FormattingLogger { - - private final Logger logger; - - /** Returns an instance using the caller's class name for the underlying logger's name. */ - public static FormattingLogger getLoggerForCallerClass() { - return new FormattingLogger(new Exception().getStackTrace()[1].getClassName()); - } - - private FormattingLogger(String name) { - this.logger = Logger.getLogger(name); - } - - public void logfmt(Level level, Throwable cause, String fmt, Object... args) { - log(level, cause, String.format(fmt, args)); - } - - public void logfmt(Level level, String fmt, Object... args) { - log(level, null, String.format(fmt, args)); - } - - private void log(Level level, @Nullable Throwable cause, String msg) { - StackTraceElement callerFrame = - Arrays.stream(new Exception().getStackTrace()) - .filter(frame -> !frame.getClassName().equals(FormattingLogger.class.getName())) - .findFirst() - .get(); - if (cause == null) { - logger.logp(level, callerFrame.getClassName(), callerFrame.getMethodName(), msg); - } else { - logger.logp(level, callerFrame.getClassName(), callerFrame.getMethodName(), msg, cause); - } - } - - public void fine(String msg) { - log(Level.FINE, null, msg); - } - - public void fine(Throwable cause, String msg) { - log(Level.FINE, cause, msg); - } - - public void finefmt(String fmt, Object... args) { - log(Level.FINE, null, String.format(fmt, args)); - } - - public void finefmt(Throwable cause, String fmt, Object... args) { - log(Level.FINE, cause, String.format(fmt, args)); - } - - public void info(String msg) { - log(Level.INFO, null, msg); - } - - public void info(Throwable cause, String msg) { - log(Level.INFO, cause, msg); - } - - public void infofmt(String fmt, Object... args) { - log(Level.INFO, null, String.format(fmt, args)); - } - - public void infofmt(Throwable cause, String fmt, Object... args) { - log(Level.INFO, cause, String.format(fmt, args)); - } - - public void warning(String msg) { - log(Level.WARNING, null, msg); - } - - public void warning(Throwable cause, String msg) { - log(Level.WARNING, cause, msg); - } - - public void warningfmt(String fmt, Object... args) { - log(Level.WARNING, null, String.format(fmt, args)); - } - - public void warningfmt(Throwable cause, String fmt, Object... args) { - log(Level.WARNING, cause, String.format(fmt, args)); - } - - public void severe(String msg) { - log(Level.SEVERE, null, msg); - } - - public void severe(Throwable cause, String msg) { - log(Level.SEVERE, cause, msg); - } - - public void severefmt(String fmt, Object... args) { - log(Level.SEVERE, null, String.format(fmt, args)); - } - - public void severefmt(Throwable cause, String fmt, Object... args) { - log(Level.SEVERE, cause, String.format(fmt, args)); - } - - public boolean isLoggable(Level level) { - return logger.isLoggable(level); - } - - public void addHandler(Handler handler) { - logger.addHandler(handler); - } - - public void removeHandler(Handler handler) { - logger.removeHandler(handler); - } -} diff --git a/java/google/registry/util/ImprovedInputStream.java b/java/google/registry/util/ImprovedInputStream.java index 82204edaa..80646470f 100644 --- a/java/google/registry/util/ImprovedInputStream.java +++ b/java/google/registry/util/ImprovedInputStream.java @@ -17,6 +17,7 @@ package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.logging.FormattingLogger; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/java/google/registry/util/ImprovedOutputStream.java b/java/google/registry/util/ImprovedOutputStream.java index 8efee5bd2..a0469f4ba 100644 --- a/java/google/registry/util/ImprovedOutputStream.java +++ b/java/google/registry/util/ImprovedOutputStream.java @@ -17,6 +17,7 @@ package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.logging.FormattingLogger; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/java/google/registry/util/RequestStatusCheckerImpl.java b/java/google/registry/util/RequestStatusCheckerImpl.java index 2e56d89ba..e2ca073f1 100644 --- a/java/google/registry/util/RequestStatusCheckerImpl.java +++ b/java/google/registry/util/RequestStatusCheckerImpl.java @@ -22,6 +22,7 @@ import com.google.apphosting.api.ApiProxy; import com.google.apphosting.api.ApiProxy.Environment; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; +import com.google.common.logging.FormattingLogger; import java.util.Collections; import javax.inject.Inject; diff --git a/java/google/registry/util/Retrier.java b/java/google/registry/util/Retrier.java index 69553b440..099d18e99 100644 --- a/java/google/registry/util/Retrier.java +++ b/java/google/registry/util/Retrier.java @@ -20,6 +20,7 @@ import static com.google.common.math.IntMath.pow; import static google.registry.util.PredicateUtils.supertypeOf; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import java.io.Serializable; import java.util.Set; import java.util.concurrent.Callable; diff --git a/java/google/registry/util/TaskQueueUtils.java b/java/google/registry/util/TaskQueueUtils.java index c70becfc7..6cfac1abc 100644 --- a/java/google/registry/util/TaskQueueUtils.java +++ b/java/google/registry/util/TaskQueueUtils.java @@ -22,6 +22,7 @@ import com.google.appengine.api.taskqueue.TaskOptions; import com.google.appengine.api.taskqueue.TransientFailureException; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; +import com.google.common.logging.FormattingLogger; import java.io.Serializable; import java.util.List; import javax.inject.Inject; diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index 1f513cc0d..b47ed0abd 100644 --- a/java/google/registry/whois/BUILD +++ b/java/google/registry/whois/BUILD @@ -8,6 +8,7 @@ java_library( name = "whois", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/request", diff --git a/java/google/registry/whois/DomainWhoisResponse.java b/java/google/registry/whois/DomainWhoisResponse.java index 719a00ef6..ea5c75ddb 100644 --- a/java/google/registry/whois/DomainWhoisResponse.java +++ b/java/google/registry/whois/DomainWhoisResponse.java @@ -21,6 +21,7 @@ import static google.registry.xml.UtcDateTimeAdapter.getFormattedString; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.logging.FormattingLogger; import com.googlecode.objectify.Key; import google.registry.model.EppResource; import google.registry.model.contact.ContactPhoneNumber; @@ -34,7 +35,6 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarContact; import google.registry.model.translators.EnumToAttributeAdapter.EppEnum; -import google.registry.util.FormattingLogger; import java.util.Objects; import java.util.Optional; import java.util.Set; diff --git a/java/google/registry/whois/RegistrarLookupCommand.java b/java/google/registry/whois/RegistrarLookupCommand.java index c7dc173d7..11581298e 100644 --- a/java/google/registry/whois/RegistrarLookupCommand.java +++ b/java/google/registry/whois/RegistrarLookupCommand.java @@ -27,8 +27,8 @@ import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import google.registry.model.registrar.Registrar; -import google.registry.util.FormattingLogger; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/java/google/registry/whois/WhoisAction.java b/java/google/registry/whois/WhoisAction.java index cc63fed00..8187ccbc9 100644 --- a/java/google/registry/whois/WhoisAction.java +++ b/java/google/registry/whois/WhoisAction.java @@ -20,13 +20,13 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.appengine.api.datastore.DatastoreFailureException; import com.google.appengine.api.datastore.DatastoreTimeoutException; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.util.Retrier; import google.registry.whois.WhoisException.UncheckedWhoisException; import google.registry.whois.WhoisMetrics.WhoisMetric; diff --git a/java/google/registry/whois/WhoisHttpAction.java b/java/google/registry/whois/WhoisHttpAction.java index 60dd7eedd..b9b83f398 100644 --- a/java/google/registry/whois/WhoisHttpAction.java +++ b/java/google/registry/whois/WhoisHttpAction.java @@ -28,13 +28,13 @@ import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Joiner; import com.google.common.base.Splitter; +import com.google.common.logging.FormattingLogger; import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.RequestPath; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import google.registry.util.FormattingLogger; import google.registry.whois.WhoisMetrics.WhoisMetric; import google.registry.whois.WhoisResponse.WhoisResponseResults; import java.io.IOException; diff --git a/java/google/registry/whois/WhoisReader.java b/java/google/registry/whois/WhoisReader.java index 95f1e82c9..724f63690 100644 --- a/java/google/registry/whois/WhoisReader.java +++ b/java/google/registry/whois/WhoisReader.java @@ -22,10 +22,10 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.common.base.Joiner; import com.google.common.io.CharStreams; +import com.google.common.logging.FormattingLogger; import com.google.common.net.InetAddresses; import com.google.common.net.InternetDomainName; import google.registry.config.RegistryConfig.Config; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; diff --git a/javatests/google/registry/keyring/api/ComparatorKeyringTest.java b/javatests/google/registry/keyring/api/ComparatorKeyringTest.java index 9a1d40cf9..a541045b0 100644 --- a/javatests/google/registry/keyring/api/ComparatorKeyringTest.java +++ b/javatests/google/registry/keyring/api/ComparatorKeyringTest.java @@ -80,12 +80,12 @@ public class ComparatorKeyringTest { @Before public void setUp() { - ComparatorKeyring.logger.addHandler(testLogHandler); + ComparatorKeyring.logger.getFormattingLogger().addHandler(testLogHandler); } @After public void tearDown() { - ComparatorKeyring.logger.removeHandler(testLogHandler); + ComparatorKeyring.logger.getFormattingLogger().removeHandler(testLogHandler); } @Test diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index 45e20ddbe..107312f73 100644 --- a/javatests/google/registry/model/BUILD +++ b/javatests/google/registry/model/BUILD @@ -18,6 +18,7 @@ java_library( resources = [ ] + glob(["**/testdata/*"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns/writer", "//java/google/registry/flows", diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index 6a5e98d6d..7d7535aab 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -12,6 +12,7 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/keyring/api", diff --git a/javatests/google/registry/rde/BouncyCastleTest.java b/javatests/google/registry/rde/BouncyCastleTest.java index d18115c22..186470536 100644 --- a/javatests/google/registry/rde/BouncyCastleTest.java +++ b/javatests/google/registry/rde/BouncyCastleTest.java @@ -23,8 +23,8 @@ import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_GENERAL; import static org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags.AES_128; import com.google.common.io.CharStreams; +import com.google.common.logging.FormattingLogger; import google.registry.testing.BouncyCastleProviderRule; -import google.registry.util.FormattingLogger; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; diff --git a/javatests/google/registry/rde/RydeGpgIntegrationTest.java b/javatests/google/registry/rde/RydeGpgIntegrationTest.java index 9db22c43e..354dcb502 100644 --- a/javatests/google/registry/rde/RydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/RydeGpgIntegrationTest.java @@ -22,12 +22,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assume.assumeTrue; import com.google.common.io.CharStreams; +import com.google.common.logging.FormattingLogger; import google.registry.keyring.api.Keyring; import google.registry.testing.BouncyCastleProviderRule; import google.registry.testing.FakeKeyringModule; import google.registry.testing.GpgSystemCommandRule; import google.registry.testing.ShardableTestCase; -import google.registry.util.FormattingLogger; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index f570f708d..924e7e88c 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -17,6 +17,7 @@ java_library( ], visibility = ["//visibility:public"], deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/util", "@com_google_appengine_tools_sdk", "@com_google_auto_value", diff --git a/javatests/google/registry/server/StaticResourceServlet.java b/javatests/google/registry/server/StaticResourceServlet.java index 1480a7d72..3905ba480 100644 --- a/javatests/google/registry/server/StaticResourceServlet.java +++ b/javatests/google/registry/server/StaticResourceServlet.java @@ -20,9 +20,9 @@ import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.collect.ImmutableMap; +import com.google.common.logging.FormattingLogger; import com.google.common.net.MediaType; import com.google.common.primitives.Ints; -import google.registry.util.FormattingLogger; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index cc7b3fe6f..fb4a06b1c 100644 --- a/javatests/google/registry/testing/BUILD +++ b/javatests/google/registry/testing/BUILD @@ -21,6 +21,7 @@ java_library( ] + glob(["*.csv"]) + glob(["testdata/*"]), exports = ["//third_party/junit"], deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/dns:constants", diff --git a/javatests/google/registry/testing/ShardableTestCase.java b/javatests/google/registry/testing/ShardableTestCase.java index 3d9ba9d3b..a726632fd 100644 --- a/javatests/google/registry/testing/ShardableTestCase.java +++ b/javatests/google/registry/testing/ShardableTestCase.java @@ -14,7 +14,7 @@ package google.registry.testing; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/javatests/google/registry/testing/SystemInfo.java b/javatests/google/registry/testing/SystemInfo.java index 62783cad7..0c33dca09 100644 --- a/javatests/google/registry/testing/SystemInfo.java +++ b/javatests/google/registry/testing/SystemInfo.java @@ -17,7 +17,7 @@ package google.registry.testing; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.IOException; import java.util.concurrent.ExecutionException; import javax.annotation.concurrent.ThreadSafe; diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index 81083558c..b8cef838e 100644 --- a/javatests/google/registry/testing/mapreduce/BUILD +++ b/javatests/google/registry/testing/mapreduce/BUILD @@ -11,10 +11,10 @@ java_library( name = "mapreduce", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/config", "//java/google/registry/mapreduce", "//java/google/registry/model", - "//java/google/registry/util", "//javatests/google/registry/testing", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_api_stubs", diff --git a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java index 2748bd8c5..d6bbe3871 100644 --- a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java +++ b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java @@ -33,11 +33,11 @@ import com.google.appengine.tools.pipeline.impl.servlets.PipelineServlet; import com.google.appengine.tools.pipeline.impl.servlets.TaskHandler; import com.google.apphosting.api.ApiProxy; import com.google.common.base.CharMatcher; +import com.google.common.logging.FormattingLogger; import google.registry.mapreduce.MapreduceRunner; import google.registry.testing.AppEngineRule; import google.registry.testing.FakeClock; import google.registry.testing.ShardableTestCase; -import google.registry.util.FormattingLogger; import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; import java.io.UnsupportedEncodingException; diff --git a/javatests/google/registry/testing/sftp/BUILD b/javatests/google/registry/testing/sftp/BUILD index f79490ee8..cf31419f3 100644 --- a/javatests/google/registry/testing/sftp/BUILD +++ b/javatests/google/registry/testing/sftp/BUILD @@ -9,6 +9,7 @@ java_library( name = "sftp", srcs = glob(["*.java"]), deps = [ + "//java/com/google/common/logging:formatting_logger", "//java/google/registry/util", "@com_google_code_findbugs_jsr305", "@com_google_guava", diff --git a/javatests/google/registry/testing/sftp/TestSftpServer.java b/javatests/google/registry/testing/sftp/TestSftpServer.java index 6b46f2c3c..89e7fd5a1 100644 --- a/javatests/google/registry/testing/sftp/TestSftpServer.java +++ b/javatests/google/registry/testing/sftp/TestSftpServer.java @@ -16,7 +16,7 @@ package google.registry.testing.sftp; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import google.registry.util.FormattingLogger; +import com.google.common.logging.FormattingLogger; import java.io.File; import java.io.IOException; import java.io.StringReader; diff --git a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java index 8d5eb8820..d2b3a37ce 100644 --- a/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java +++ b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java @@ -77,7 +77,7 @@ public class SessionUtilsTest { @Before public void before() throws Exception { - SessionUtils.logger.addHandler(testLogHandler); + SessionUtils.logger.getFormattingLogger().addHandler(testLogHandler); sessionUtils = new SessionUtils(); sessionUtils.registryAdminClientId = ADMIN_CLIENT_ID; persistResource(loadRegistrar(ADMIN_CLIENT_ID)); @@ -86,7 +86,7 @@ public class SessionUtilsTest { @After public void after() throws Exception { - SessionUtils.logger.removeHandler(testLogHandler); + SessionUtils.logger.getFormattingLogger().removeHandler(testLogHandler); } /** User needs to be logged in before calling checkRegistrarConsoleLogin */ diff --git a/javatests/google/registry/util/RequestStatusCheckerImplTest.java b/javatests/google/registry/util/RequestStatusCheckerImplTest.java index bdcefaa3a..a7dd2b88a 100644 --- a/javatests/google/registry/util/RequestStatusCheckerImplTest.java +++ b/javatests/google/registry/util/RequestStatusCheckerImplTest.java @@ -69,12 +69,12 @@ public final class RequestStatusCheckerImplTest { public AppEngineRule appEngineRule = AppEngineRule.builder().build(); @Before public void setUp() { - RequestStatusCheckerImpl.logger.addHandler(logHandler); + RequestStatusCheckerImpl.logger.getFormattingLogger().addHandler(logHandler); RequestStatusCheckerImpl.logService = mock(LogService.class); } @After public void tearDown() { - RequestStatusCheckerImpl.logger.removeHandler(logHandler); + RequestStatusCheckerImpl.logger.getFormattingLogger().removeHandler(logHandler); } // If a logId is unrecognized, it could be that the log hasn't been uploaded yet - so we assume diff --git a/javatests/google/registry/whois/WhoisReaderTest.java b/javatests/google/registry/whois/WhoisReaderTest.java index 337655032..9d68ac99a 100644 --- a/javatests/google/registry/whois/WhoisReaderTest.java +++ b/javatests/google/registry/whois/WhoisReaderTest.java @@ -41,7 +41,7 @@ public class WhoisReaderTest { @Before public void init() { createTlds("tld", "xn--kgbechtv", "1.test"); - WhoisReader.logger.addHandler(testLogHandler); + WhoisReader.logger.getFormattingLogger().addHandler(testLogHandler); } @SuppressWarnings({"TypeParameterUnusedInFormals", "unchecked"})