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

Upgrade the version of google/errorprone plug-in

Browse source 
This CL upgraded google/errorprone plug-in to 2.3.3 and resolved
some warnings detected from the plug-in.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=238047862
This commit is contained in:
shicong 2019-03-12 10:41:49 -07:00 • committed by Ben McIlwain
parent 058c12c343
commit 4b6ace920b
22 changed files with 119 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle/build.gradle
View file

@ -319,7 +319,7 @@ subprojects {
dependencies { dependencies {
// compatibility with Java 8 // compatibility with Java 8
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1") 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 { tasks.withType(JavaCompile).configureEach {

18
gradle/core/gradle/dependency-locks/annotationProcessor.lockfile
View file

@ -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.value:auto-value:1.6.2
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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-compiler:2.21
com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-producers:2.21
com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger-spi:2.21
com.google.dagger:dagger:2.21 com.google.dagger:dagger:2.21
com.google.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.errorprone:javac-shaded:9-dev-r4023-3
com.google.googlejavaformat:google-java-format:1.5 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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.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:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/core/gradle/dependency-locks/errorprone.lockfile
View file

@ -5,18 +5,20 @@ com.github.kevinstern:software-and-algorithms:1.0
com.github.stephenc.jcip:jcip-annotations:1.0-1 com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.guava:guava:23.5-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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.0 com.googlecode.java-diff-utils:diffutils:1.3.0
org.checkerframework:checker-qual:2.5.3 org.checkerframework:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile
View file

@ -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.value:auto-value:1.6.2
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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-compiler:2.21
com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-producers:2.21
com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger-spi:2.21
com.google.dagger:dagger:2.21 com.google.dagger:dagger:2.21
com.google.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.errorprone:javac-shaded:9-dev-r4023-3
com.google.googlejavaformat:google-java-format:1.5 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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.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:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile
View file

@ -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.value:auto-value:1.6.2
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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-compiler:2.21
com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-producers:2.21
com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger-spi:2.21
com.google.dagger:dagger:2.21 com.google.dagger:dagger:2.21
com.google.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.errorprone:javac-shaded:9-dev-r4023-3
com.google.googlejavaformat:google-java-format:1.5 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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.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:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/proxy/gradle/dependency-locks/errorprone.lockfile
View file

@ -5,18 +5,20 @@ com.github.kevinstern:software-and-algorithms:1.0
com.github.stephenc.jcip:jcip-annotations:1.0-1 com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.guava:guava:23.5-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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.0 com.googlecode.java-diff-utils:diffutils:1.3.0
org.checkerframework:checker-qual:2.5.3 org.checkerframework:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile
View file

@ -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.value:auto-value:1.6.2
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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-compiler:2.21
com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-producers:2.21
com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger-spi:2.21
com.google.dagger:dagger:2.21 com.google.dagger:dagger:2.21
com.google.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.errorprone:javac-shaded:9-dev-r4023-3
com.google.googlejavaformat:google-java-format:1.5 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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.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:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/util/gradle/dependency-locks/annotationProcessor.lockfile
View file

@ -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.value:auto-value:1.6.2
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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-compiler:2.21
com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-producers:2.21
com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger-spi:2.21
com.google.dagger:dagger:2.21 com.google.dagger:dagger:2.21
com.google.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.errorprone:javac-shaded:9-dev-r4023-3
com.google.googlejavaformat:google-java-format:1.5 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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.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:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/util/gradle/dependency-locks/errorprone.lockfile
View file

@ -5,18 +5,20 @@ com.github.kevinstern:software-and-algorithms:1.0
com.github.stephenc.jcip:jcip-annotations:1.0-1 com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.guava:guava:23.5-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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.0 com.googlecode.java-diff-utils:diffutils:1.3.0
org.checkerframework:checker-qual:2.5.3 org.checkerframework:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

18
gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile
View file

@ -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.value:auto-value:1.6.2
com.google.auto:auto-common:0.10 com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0 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-compiler:2.21
com.google.dagger:dagger-producers:2.21 com.google.dagger:dagger-producers:2.21
com.google.dagger:dagger-spi:2.21 com.google.dagger:dagger-spi:2.21
com.google.dagger:dagger:2.21 com.google.dagger:dagger:2.21
com.google.errorprone:error_prone_annotation:2.3.2 com.google.errorprone:error_prone_annotation:2.3.3
com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.3
com.google.errorprone:error_prone_check_api:2.3.2 com.google.errorprone:error_prone_check_api:2.3.3
com.google.errorprone:error_prone_core:2.3.2 com.google.errorprone:error_prone_core:2.3.3
com.google.errorprone:error_prone_type_annotations:2.3.2 com.google.errorprone:error_prone_type_annotations:2.3.3
com.google.errorprone:javac-shaded:9-dev-r4023-3 com.google.errorprone:javac-shaded:9-dev-r4023-3
com.google.googlejavaformat:google-java-format:1.5 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.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.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:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3 org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil: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 org.pcollections:pcollections:2.1.2

3
java/google/registry/beam/BeamUtils.java
View file

@ -16,7 +16,6 @@ package google.registry.beam;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import google.registry.util.ResourceUtils; import google.registry.util.ResourceUtils;
import org.apache.avro.generic.GenericRecord; 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. */ /** Static utilities for {@code Beam} pipelines. */
public class BeamUtils { public class BeamUtils {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
/** Extracts a string representation of a field in a {@link GenericRecord}. */ /** Extracts a string representation of a field in a {@link GenericRecord}. */
public static String extractField(GenericRecord record, String fieldName) { public static String extractField(GenericRecord record, String fieldName) {
return String.valueOf(record.get(fieldName)); return String.valueOf(record.get(fieldName));

3
java/google/registry/beam/invoicing/BillingEvent.java
View file

@ -21,7 +21,6 @@ import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;
import google.registry.model.billing.BillingEvent.Flag; import google.registry.model.billing.BillingEvent.Flag;
import google.registry.reporting.billing.BillingModule; import google.registry.reporting.billing.BillingModule;
import java.io.IOException; import java.io.IOException;
@ -51,8 +50,6 @@ import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord;
@AutoValue @AutoValue
public abstract class BillingEvent implements Serializable { public abstract class BillingEvent implements Serializable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static final DateTimeFormatter DATE_TIME_FORMATTER = private static final DateTimeFormatter DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss zzz"); DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss zzz");

3
java/google/registry/beam/spec11/Subdomain.java
View file

@ -20,7 +20,6 @@ import static google.registry.beam.BeamUtils.extractField;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;
import java.io.Serializable; import java.io.Serializable;
import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.GenericRecord;
import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord; import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord;
@ -36,8 +35,6 @@ import org.apache.beam.sdk.io.gcp.bigquery.SchemaAndRecord;
@AutoValue @AutoValue
public abstract class Subdomain implements Serializable { public abstract class Subdomain implements Serializable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static final ImmutableList<String> FIELD_NAMES = private static final ImmutableList<String> FIELD_NAMES =
ImmutableList.of("fullyQualifiedDomainName", "registrarName", "registrarEmailAddress"); ImmutableList.of("fullyQualifiedDomainName", "registrarName", "registrarEmailAddress");

4
java/google/registry/bigquery/BigqueryJobFailureException.java
View file

@ -94,9 +94,9 @@ public final class BigqueryJobFailureException extends RuntimeException {
} }
@Override @Override
public String toString() { public String getMessage() {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
result.append(String.format("%s: %s", getClass().getSimpleName(), getMessage())); result.append(String.format("%s: %s", getClass().getSimpleName(), super.getMessage()));
try { try {
if (jobStatus != null) { if (jobStatus != null) {
for (ErrorProto error : jobStatus.getErrors()) { for (ErrorProto error : jobStatus.getErrors()) {

3
java/google/registry/flows/EppTlsAction.java
View file

@ -14,7 +14,6 @@
package google.registry.flows; package google.registry.flows;
import com.google.common.flogger.FluentLogger;
import google.registry.request.Action; import google.registry.request.Action;
import google.registry.request.Action.Method; import google.registry.request.Action.Method;
import google.registry.request.Payload; import google.registry.request.Payload;
@ -33,8 +32,6 @@ import javax.servlet.http.HttpSession;
auth = Auth.AUTH_PUBLIC_OR_INTERNAL) auth = Auth.AUTH_PUBLIC_OR_INTERNAL)
public class EppTlsAction implements Runnable { public class EppTlsAction implements Runnable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@Inject @Payload byte[] inputXmlBytes; @Inject @Payload byte[] inputXmlBytes;
@Inject TlsCredentials tlsCredentials; @Inject TlsCredentials tlsCredentials;
@Inject HttpSession session; @Inject HttpSession session;

1
java/google/registry/model/common/EntityGroupRoot.java
View file

@ -36,6 +36,7 @@ import google.registry.model.BackupGroupRoot;
@Entity @Entity
public class EntityGroupRoot extends BackupGroupRoot { public class EntityGroupRoot extends BackupGroupRoot {
@SuppressWarnings("unused")
@Id @Id
private String id; private String id;

1
java/google/registry/model/index/EppResourceIndexBucket.java
View file

@ -30,6 +30,7 @@ import google.registry.model.annotations.VirtualEntity;
@VirtualEntity @VirtualEntity
public class EppResourceIndexBucket extends ImmutableObject { public class EppResourceIndexBucket extends ImmutableObject {
@SuppressWarnings("unused")
@Id @Id
private long bucketId; private long bucketId;

5
java/google/registry/rdap/RdapResultSet.java
View file

@ -15,6 +15,7 @@
package google.registry.rdap; package google.registry.rdap;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import google.registry.model.EppResource; import google.registry.model.EppResource;
import google.registry.rdap.RdapSearchResults.IncompletenessWarningType; import google.registry.rdap.RdapSearchResults.IncompletenessWarningType;
import java.util.List; import java.util.List;
@ -31,11 +32,11 @@ abstract class RdapResultSet<T extends EppResource> {
IncompletenessWarningType incompletenessWarningType, IncompletenessWarningType incompletenessWarningType,
int numResourcesRetrieved) { int numResourcesRetrieved) {
return new AutoValue_RdapResultSet<>( return new AutoValue_RdapResultSet<>(
resources, incompletenessWarningType, numResourcesRetrieved); ImmutableList.copyOf(resources), incompletenessWarningType, numResourcesRetrieved);
} }
/** List of EPP resources. */ /** List of EPP resources. */
abstract List<T> resources(); abstract ImmutableList<T> resources();
/** Type of warning to display regarding possible incomplete data. */ /** Type of warning to display regarding possible incomplete data. */
abstract IncompletenessWarningType incompletenessWarningType(); abstract IncompletenessWarningType incompletenessWarningType();

6
java/google/registry/reporting/spec11/RegistrarThreatMatches.java
View file

@ -15,6 +15,7 @@
package google.registry.reporting.spec11; package google.registry.reporting.spec11;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import google.registry.beam.spec11.ThreatMatch; import google.registry.beam.spec11.ThreatMatch;
import java.util.List; import java.util.List;
@ -24,10 +25,11 @@ public abstract class RegistrarThreatMatches {
public abstract String registrarEmailAddress(); public abstract String registrarEmailAddress();
public abstract List<ThreatMatch> threatMatches(); public abstract ImmutableList<ThreatMatch> threatMatches();
static RegistrarThreatMatches create( static RegistrarThreatMatches create(
String registrarEmailAddress, List<ThreatMatch> threatMatches) { String registrarEmailAddress, List<ThreatMatch> threatMatches) {
return new AutoValue_RegistrarThreatMatches(registrarEmailAddress, threatMatches); return new AutoValue_RegistrarThreatMatches(
registrarEmailAddress, ImmutableList.copyOf(threatMatches));
} }
} }

9
java/google/registry/util/UrlFetchException.java
View file

@ -38,11 +38,14 @@ public class UrlFetchException extends RuntimeException {
} }
@Override @Override
public String toString() { public String getMessage() {
StringBuilder res = new StringBuilder(2048 + rsp.getContent().length).append(String.format( 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", "%s: %s (HTTP Status %d)\nX-Fetch-URL: %s\nX-Final-URL: %s\n",
getClass().getSimpleName(), getClass().getSimpleName(),
getMessage(), super.getMessage(),
rsp.getResponseCode(), rsp.getResponseCode(),
req.getURL().toString(), req.getURL().toString(),
rsp.getFinalUrl())); rsp.getFinalUrl()));

9
javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java
View file

@ -149,14 +149,17 @@ public class IcannReportingStagingActionTest {
RuntimeException thrown = assertThrows(RuntimeException.class, action::run); RuntimeException thrown = assertThrows(RuntimeException.class, action::run);
assertThat(thrown).hasCauseThat().isInstanceOf(BigqueryJobFailureException.class); assertThat(thrown).hasCauseThat().isInstanceOf(BigqueryJobFailureException.class);
assertThat(thrown).hasMessageThat().isEqualTo("Staging action failed."); 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(stager, times(3)).stageReports(yearMonth, subdir, ReportType.ACTIVITY);
verify(action.emailService) verify(action.emailService)
.sendEmail( .sendEmail(
EmailMessage.create( EmailMessage.create(
"ICANN Monthly report staging summary [FAILURE]", "ICANN Monthly report staging summary [FAILURE]",
"Staging failed due to BigqueryJobFailureException: Expected failure," "Staging failed due to google.registry.bigquery.BigqueryJobFailureException: "
+ " check logs for more details.", + "BigqueryJobFailureException: Expected failure, check logs for more details.",
new InternetAddress("recipient@example.com"), new InternetAddress("recipient@example.com"),
new InternetAddress("sender@example.com"))); new InternetAddress("sender@example.com")));
// Assert no upload task enqueued // Assert no upload task enqueued

3
javatests/google/registry/testing/AppEngineRule.java
View file

@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.flogger.FluentLogger;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.googlecode.objectify.ObjectifyFilter; import com.googlecode.objectify.ObjectifyFilter;
import google.registry.model.ofy.ObjectifyService; import google.registry.model.ofy.ObjectifyService;
@ -71,8 +70,6 @@ import org.junit.runners.model.Statement;
*/ */
public final class AppEngineRule extends ExternalResource { 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 NEW_REGISTRAR_GAE_USER_ID = "666";
public static final String THE_REGISTRAR_GAE_USER_ID = "31337"; public static final String THE_REGISTRAR_GAE_USER_ID = "31337";