diff --git a/gradle/build.gradle b/gradle/build.gradle index 83ece6ce7..b7a8e8d36 100644 --- a/gradle/build.gradle +++ b/gradle/build.gradle @@ -319,7 +319,7 @@ subprojects { dependencies { // compatibility with Java 8 errorproneJavac("com.google.errorprone:javac:9+181-r4173-1") - errorprone("com.google.errorprone:error_prone_core:2.3.2") + errorprone("com.google.errorprone:error_prone_core:2.3.3") } tasks.withType(JavaCompile).configureEach { diff --git a/gradle/core/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/core/gradle/dependency-locks/annotationProcessor.lockfile index 9d5ca31d9..0045438c2 100644 --- a/gradle/core/gradle/dependency-locks/annotationProcessor.lockfile +++ b/gradle/core/gradle/dependency-locks/annotationProcessor.lockfile @@ -6,19 +6,21 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto.value:auto-value:1.6.2 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 +com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-compiler:2.21 com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.googlejavaformat:google-java-format:1.5 -com.google.guava:guava:25.0-jre +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 @@ -29,5 +31,5 @@ org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/core/gradle/dependency-locks/errorprone.lockfile b/gradle/core/gradle/dependency-locks/errorprone.lockfile index 04156ddb8..0e2d9b8d4 100644 --- a/gradle/core/gradle/dependency-locks/errorprone.lockfile +++ b/gradle/core/gradle/dependency-locks/errorprone.lockfile @@ -5,18 +5,20 @@ com.github.kevinstern:software-and-algorithms:1.0 com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 -com.google.guava:guava:23.5-jre +com.google.code.findbugs:jsr305:3.0.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile index 9d5ca31d9..0045438c2 100644 --- a/gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile +++ b/gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile @@ -6,19 +6,21 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto.value:auto-value:1.6.2 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 +com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-compiler:2.21 com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.googlejavaformat:google-java-format:1.5 -com.google.guava:guava:25.0-jre +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 @@ -29,5 +31,5 @@ org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile index 9d5ca31d9..0045438c2 100644 --- a/gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile +++ b/gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile @@ -6,19 +6,21 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto.value:auto-value:1.6.2 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 +com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-compiler:2.21 com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.googlejavaformat:google-java-format:1.5 -com.google.guava:guava:25.0-jre +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 @@ -29,5 +31,5 @@ org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/proxy/gradle/dependency-locks/errorprone.lockfile b/gradle/proxy/gradle/dependency-locks/errorprone.lockfile index 04156ddb8..0e2d9b8d4 100644 --- a/gradle/proxy/gradle/dependency-locks/errorprone.lockfile +++ b/gradle/proxy/gradle/dependency-locks/errorprone.lockfile @@ -5,18 +5,20 @@ com.github.kevinstern:software-and-algorithms:1.0 com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 -com.google.guava:guava:23.5-jre +com.google.code.findbugs:jsr305:3.0.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile index 9d5ca31d9..0045438c2 100644 --- a/gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile +++ b/gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile @@ -6,19 +6,21 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto.value:auto-value:1.6.2 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 +com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-compiler:2.21 com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.googlejavaformat:google-java-format:1.5 -com.google.guava:guava:25.0-jre +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 @@ -29,5 +31,5 @@ org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/util/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/util/gradle/dependency-locks/annotationProcessor.lockfile index 9d5ca31d9..0045438c2 100644 --- a/gradle/util/gradle/dependency-locks/annotationProcessor.lockfile +++ b/gradle/util/gradle/dependency-locks/annotationProcessor.lockfile @@ -6,19 +6,21 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto.value:auto-value:1.6.2 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 +com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-compiler:2.21 com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.googlejavaformat:google-java-format:1.5 -com.google.guava:guava:25.0-jre +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 @@ -29,5 +31,5 @@ org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/util/gradle/dependency-locks/errorprone.lockfile b/gradle/util/gradle/dependency-locks/errorprone.lockfile index 04156ddb8..0e2d9b8d4 100644 --- a/gradle/util/gradle/dependency-locks/errorprone.lockfile +++ b/gradle/util/gradle/dependency-locks/errorprone.lockfile @@ -5,18 +5,20 @@ com.github.kevinstern:software-and-algorithms:1.0 com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 -com.google.guava:guava:23.5-jre +com.google.code.findbugs:jsr305:3.0.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile index 9d5ca31d9..0045438c2 100644 --- a/gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile +++ b/gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile @@ -6,19 +6,21 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1 com.google.auto.value:auto-value:1.6.2 com.google.auto:auto-common:0.10 com.google.code.findbugs:jFormatString:3.0.0 -com.google.code.findbugs:jsr305:3.0.0 +com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-compiler:2.21 com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger:2.21 -com.google.errorprone:error_prone_annotation:2.3.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.errorprone:error_prone_check_api:2.3.2 -com.google.errorprone:error_prone_core:2.3.2 -com.google.errorprone:error_prone_type_annotations:2.3.2 +com.google.errorprone:error_prone_annotation:2.3.3 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.errorprone:error_prone_check_api:2.3.3 +com.google.errorprone:error_prone_core:2.3.3 +com.google.errorprone:error_prone_type_annotations:2.3.3 com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.googlejavaformat:google-java-format:1.5 -com.google.guava:guava:25.0-jre +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:27.0.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.1 com.google.protobuf:protobuf-java:3.4.0 com.googlecode.java-diff-utils:diffutils:1.3.0 @@ -29,5 +31,5 @@ org.checkerframework:checker-compat-qual:2.5.3 org.checkerframework:checker-qual:2.5.3 org.checkerframework:dataflow:2.5.3 org.checkerframework:javacutil:2.5.3 -org.codehaus.mojo:animal-sniffer-annotations:1.14 +org.codehaus.mojo:animal-sniffer-annotations:1.17 org.pcollections:pcollections:2.1.2 diff --git a/java/google/registry/beam/BeamUtils.java b/java/google/registry/beam/BeamUtils.java index 583503075..eaa75e347 100644 --- a/java/google/registry/beam/BeamUtils.java +++ b/java/google/registry/beam/BeamUtils.java @@ -16,7 +16,6 @@ package google.registry.beam; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import com.google.common.flogger.FluentLogger; import com.google.common.io.Resources; import google.registry.util.ResourceUtils; import org.apache.avro.generic.GenericRecord; @@ -25,8 +24,6 @@ import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord; /** Static utilities for {@code Beam} pipelines. */ public class BeamUtils { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - /** Extracts a string representation of a field in a {@link GenericRecord}. */ public static String extractField(GenericRecord record, String fieldName) { return String.valueOf(record.get(fieldName)); diff --git a/java/google/registry/beam/invoicing/BillingEvent.java b/java/google/registry/beam/invoicing/BillingEvent.java index cea9c0d7e..2b77d2550 100644 --- a/java/google/registry/beam/invoicing/BillingEvent.java +++ b/java/google/registry/beam/invoicing/BillingEvent.java @@ -21,7 +21,6 @@ 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.flogger.FluentLogger; import google.registry.model.billing.BillingEvent.Flag; import google.registry.reporting.billing.BillingModule; import java.io.IOException; @@ -51,8 +50,6 @@ import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord; @AutoValue public abstract class BillingEvent implements Serializable { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss zzz"); diff --git a/java/google/registry/beam/spec11/Subdomain.java b/java/google/registry/beam/spec11/Subdomain.java index 4a436592f..faadc7fa5 100644 --- a/java/google/registry/beam/spec11/Subdomain.java +++ b/java/google/registry/beam/spec11/Subdomain.java @@ -20,7 +20,6 @@ import static google.registry.beam.BeamUtils.extractField; import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; -import com.google.common.flogger.FluentLogger; import java.io.Serializable; import org.apache.avro.generic.GenericRecord; import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord; @@ -36,8 +35,6 @@ import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord; @AutoValue public abstract class Subdomain implements Serializable { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - private static final ImmutableList FIELD_NAMES = ImmutableList.of("fullyQualifiedDomainName", "registrarName", "registrarEmailAddress"); diff --git a/java/google/registry/bigquery/BigqueryJobFailureException.java b/java/google/registry/bigquery/BigqueryJobFailureException.java index 99a68285d..8aea0d603 100644 --- a/java/google/registry/bigquery/BigqueryJobFailureException.java +++ b/java/google/registry/bigquery/BigqueryJobFailureException.java @@ -94,9 +94,9 @@ public final class BigqueryJobFailureException extends RuntimeException { } @Override - public String toString() { + public String getMessage() { StringBuilder result = new StringBuilder(); - result.append(String.format("%s: %s", getClass().getSimpleName(), getMessage())); + result.append(String.format("%s: %s", getClass().getSimpleName(), super.getMessage())); try { if (jobStatus != null) { for (ErrorProto error : jobStatus.getErrors()) { diff --git a/java/google/registry/flows/EppTlsAction.java b/java/google/registry/flows/EppTlsAction.java index 25cc312a0..3d42cc562 100644 --- a/java/google/registry/flows/EppTlsAction.java +++ b/java/google/registry/flows/EppTlsAction.java @@ -14,7 +14,6 @@ package google.registry.flows; -import com.google.common.flogger.FluentLogger; import google.registry.request.Action; import google.registry.request.Action.Method; import google.registry.request.Payload; @@ -33,8 +32,6 @@ import javax.servlet.http.HttpSession; auth = Auth.AUTH_PUBLIC_OR_INTERNAL) public class EppTlsAction implements Runnable { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - @Inject @Payload byte[] inputXmlBytes; @Inject TlsCredentials tlsCredentials; @Inject HttpSession session; diff --git a/java/google/registry/model/common/EntityGroupRoot.java b/java/google/registry/model/common/EntityGroupRoot.java index b08262eb2..29bc9db3f 100644 --- a/java/google/registry/model/common/EntityGroupRoot.java +++ b/java/google/registry/model/common/EntityGroupRoot.java @@ -36,6 +36,7 @@ import google.registry.model.BackupGroupRoot; @Entity public class EntityGroupRoot extends BackupGroupRoot { + @SuppressWarnings("unused") @Id private String id; diff --git a/java/google/registry/model/index/EppResourceIndexBucket.java b/java/google/registry/model/index/EppResourceIndexBucket.java index 5ccd703d6..78722acc0 100644 --- a/java/google/registry/model/index/EppResourceIndexBucket.java +++ b/java/google/registry/model/index/EppResourceIndexBucket.java @@ -30,6 +30,7 @@ import google.registry.model.annotations.VirtualEntity; @VirtualEntity public class EppResourceIndexBucket extends ImmutableObject { + @SuppressWarnings("unused") @Id private long bucketId; diff --git a/java/google/registry/rdap/RdapResultSet.java b/java/google/registry/rdap/RdapResultSet.java index 0bfb84672..005081046 100644 --- a/java/google/registry/rdap/RdapResultSet.java +++ b/java/google/registry/rdap/RdapResultSet.java @@ -15,6 +15,7 @@ package google.registry.rdap; import com.google.auto.value.AutoValue; +import com.google.common.collect.ImmutableList; import google.registry.model.EppResource; import google.registry.rdap.RdapSearchResults.IncompletenessWarningType; import java.util.List; @@ -31,11 +32,11 @@ abstract class RdapResultSet { IncompletenessWarningType incompletenessWarningType, int numResourcesRetrieved) { return new AutoValue_RdapResultSet<>( - resources, incompletenessWarningType, numResourcesRetrieved); + ImmutableList.copyOf(resources), incompletenessWarningType, numResourcesRetrieved); } /** List of EPP resources. */ - abstract List resources(); + abstract ImmutableList resources(); /** Type of warning to display regarding possible incomplete data. */ abstract IncompletenessWarningType incompletenessWarningType(); diff --git a/java/google/registry/reporting/spec11/RegistrarThreatMatches.java b/java/google/registry/reporting/spec11/RegistrarThreatMatches.java index c1a2f68fa..04e32615e 100644 --- a/java/google/registry/reporting/spec11/RegistrarThreatMatches.java +++ b/java/google/registry/reporting/spec11/RegistrarThreatMatches.java @@ -15,6 +15,7 @@ package google.registry.reporting.spec11; import com.google.auto.value.AutoValue; +import com.google.common.collect.ImmutableList; import google.registry.beam.spec11.ThreatMatch; import java.util.List; @@ -24,10 +25,11 @@ public abstract class RegistrarThreatMatches { public abstract String registrarEmailAddress(); - public abstract List threatMatches(); + public abstract ImmutableList threatMatches(); static RegistrarThreatMatches create( String registrarEmailAddress, List threatMatches) { - return new AutoValue_RegistrarThreatMatches(registrarEmailAddress, threatMatches); + return new AutoValue_RegistrarThreatMatches( + registrarEmailAddress, ImmutableList.copyOf(threatMatches)); } } diff --git a/java/google/registry/util/UrlFetchException.java b/java/google/registry/util/UrlFetchException.java index 80043af68..4e2730c3b 100644 --- a/java/google/registry/util/UrlFetchException.java +++ b/java/google/registry/util/UrlFetchException.java @@ -38,14 +38,17 @@ public class UrlFetchException extends RuntimeException { } @Override - public String toString() { - StringBuilder res = new StringBuilder(2048 + rsp.getContent().length).append(String.format( - "%s: %s (HTTP Status %d)\nX-Fetch-URL: %s\nX-Final-URL: %s\n", - getClass().getSimpleName(), - getMessage(), - rsp.getResponseCode(), - req.getURL().toString(), - rsp.getFinalUrl())); + public String getMessage() { + StringBuilder res = + new StringBuilder(2048 + rsp.getContent().length) + .append( + String.format( + "%s: %s (HTTP Status %d)\nX-Fetch-URL: %s\nX-Final-URL: %s\n", + getClass().getSimpleName(), + super.getMessage(), + rsp.getResponseCode(), + req.getURL().toString(), + rsp.getFinalUrl())); for (HTTPHeader header : rsp.getHeadersUncombined()) { res.append(header.getName()); res.append(": "); diff --git a/javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java b/javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java index 8ba436f75..22b7859d4 100644 --- a/javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java +++ b/javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java @@ -149,14 +149,17 @@ public class IcannReportingStagingActionTest { RuntimeException thrown = assertThrows(RuntimeException.class, action::run); assertThat(thrown).hasCauseThat().isInstanceOf(BigqueryJobFailureException.class); assertThat(thrown).hasMessageThat().isEqualTo("Staging action failed."); - assertThat(thrown).hasCauseThat().hasMessageThat().isEqualTo("Expected failure"); + assertThat(thrown) + .hasCauseThat() + .hasMessageThat() + .isEqualTo("BigqueryJobFailureException: Expected failure"); verify(stager, times(3)).stageReports(yearMonth, subdir, ReportType.ACTIVITY); verify(action.emailService) .sendEmail( EmailMessage.create( "ICANN Monthly report staging summary [FAILURE]", - "Staging failed due to BigqueryJobFailureException: Expected failure," - + " check logs for more details.", + "Staging failed due to google.registry.bigquery.BigqueryJobFailureException: " + + "BigqueryJobFailureException: Expected failure, check logs for more details.", new InternetAddress("recipient@example.com"), new InternetAddress("sender@example.com"))); // Assert no upload task enqueued diff --git a/javatests/google/registry/testing/AppEngineRule.java b/javatests/google/registry/testing/AppEngineRule.java index a5b554381..77295c5cb 100644 --- a/javatests/google/registry/testing/AppEngineRule.java +++ b/javatests/google/registry/testing/AppEngineRule.java @@ -32,7 +32,6 @@ 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.flogger.FluentLogger; import com.google.common.io.Files; import com.googlecode.objectify.ObjectifyFilter; import google.registry.model.ofy.ObjectifyService; @@ -71,8 +70,6 @@ import org.junit.runners.model.Statement; */ public final class AppEngineRule extends ExternalResource { - private static final FluentLogger logger = FluentLogger.forEnclosingClass(); - public static final String NEW_REGISTRAR_GAE_USER_ID = "666"; public static final String THE_REGISTRAR_GAE_USER_ID = "31337";