Remove datastore related code (#1906)

buildSrc/gradle.lockfile

@@ -9,33 +9,32 @@ com.fasterxml.jackson:jackson-bom:2.14.1=compileClasspath,testCompileClasspath,t
 com.github.ben-manes.caffeine:caffeine:2.7.0=annotationProcessor,testAnnotationProcessor
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=testRuntimeClasspath
-com.google.api-client:google-api-client:2.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client:2.1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:api-common:2.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:api-common:2.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.21.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.20.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:0.106.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:0.105.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax:2.21.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax:2.20.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.auto.value:auto-value:1.10.1=annotationProcessor
+com.google.auto.value:auto-value:1.10.1=annotationProcessor,compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,testAnnotationProcessor
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.code.gson:gson:2.10.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.common.html.types:types:1.0.6=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.16=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.3.4=annotationProcessor,checkstyle,testAnnotationProcessor
 com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_core:2.3.4=annotationProcessor,testAnnotationProcessor
@@ -57,8 +56,8 @@ com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProce
 com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.jsinterop:jsinterop-annotations:1.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.21.10=compileClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.21.12=compileClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,testAnnotationProcessor
 com.google.re2j:re2j:1.6=testRuntimeClasspath
 com.google.template:soy:2021-02-01=compileClasspath,testCompileClasspath,testRuntimeClasspath
@@ -72,19 +71,19 @@ commons-codec:commons-codec:1.15=compileClasspath,testCompileClasspath,testRunti
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-logging:commons-logging:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath
 info.picocli:picocli:4.5.2=checkstyle
-io.grpc:grpc-alts:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-alts:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-api:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-api:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-auth:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-auth:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-context:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-context:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-core:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-core:1.51.1=testRuntimeClasspath
-io.grpc:grpc-googleapis:1.51.0=testRuntimeClasspath
+io.grpc:grpc-googleapis:1.51.1=testRuntimeClasspath
-io.grpc:grpc-grpclb:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-grpclb:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-netty-shaded:1.51.0=testRuntimeClasspath
+io.grpc:grpc-netty-shaded:1.51.1=testRuntimeClasspath
-io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-protobuf:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-protobuf:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-services:1.51.0=testRuntimeClasspath
+io.grpc:grpc-services:1.51.1=testRuntimeClasspath
-io.grpc:grpc-stub:1.51.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-stub:1.51.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-xds:1.51.0=testRuntimeClasspath
+io.grpc:grpc-xds:1.51.1=testRuntimeClasspath
 io.opencensus:opencensus-api:0.31.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
 io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,testCompileClasspath,testRuntimeClasspath
 io.opencensus:opencensus-proto:0.2.0=testRuntimeClasspath
@@ -93,8 +92,8 @@ javax.annotation:javax.annotation-api:1.3.2=compileClasspath,testCompileClasspat
 javax.annotation:jsr250-api:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
 javax.inject:javax.inject:1=compileClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.16=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:10.3=checkstyle
 org.antlr:antlr4-runtime:4.8-1=checkstyle
 org.apache.commons:commons-lang3:3.12.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
@@ -104,7 +103,7 @@ org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,testCompileClasspath,
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:2.11.1=checkstyle
 org.checkerframework:checker-qual:3.0.0=annotationProcessor,testAnnotationProcessor
-org.checkerframework:checker-qual:3.28.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.29.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:dataflow:3.0.0=annotationProcessor,testAnnotationProcessor
 org.checkerframework:javacutil:3.0.0=annotationProcessor,testAnnotationProcessor
 org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
@@ -117,12 +116,12 @@ org.jacoco:org.jacoco.core:0.8.6=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.6=jacocoAnt
 org.javassist:javassist:3.26.0-GA=checkstyle
 org.json:json:20160212=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
@@ -140,5 +139,5 @@ org.plumelib:plume-util:1.0.6=annotationProcessor,testAnnotationProcessor
 org.plumelib:reflection-util:0.0.2=annotationProcessor,testAnnotationProcessor
 org.plumelib:require-javadoc:0.1.0=annotationProcessor,testAnnotationProcessor
 org.reflections:reflections:0.9.12=checkstyle
-org.threeten:threetenbp:1.6.4=compileClasspath,testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.5=compileClasspath,testCompileClasspath,testRuntimeClasspath
 empty=

common/gradle.lockfile

@@ -50,11 +50,11 @@ org.jacoco:org.jacoco.ant:0.8.6=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.6=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.6=jacocoAnt
 org.javassist:javassist:3.26.0-GA=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:8.0.1=jacocoAnt
 org.ow2.asm:asm-commons:8.0.1=jacocoAnt

common/src/main/java/google/registry/util/DateTimeUtils.java

@@ -35,7 +35,7 @@ public abstract class DateTimeUtils {
    *
    * <p>This value is (2^63-1)/1000 rounded down. AppEngine stores dates as 64 bit microseconds, but
    * Java uses milliseconds, so this is the largest representable date that will survive a
-   * round-trip through Datastore.
+   * round-trip through the database.
    */
   public static final DateTime END_OF_TIME = new DateTime(Long.MAX_VALUE / 1000, DateTimeZone.UTC);
 

core/build.gradle

@@ -68,8 +68,6 @@ def dockerIncompatibleTestPatterns = [
 // Nomulus classes, e.g., threads and objects retained by frameworks.
 // TODO(weiminyu): identify cause and fix offending tests.
 def fragileTestPatterns = [
-    // Test Datastore inexplicably aborts transaction.
-    "google/registry/model/tmch/ClaimsListShardTest.*",
     // Changes cache timeouts and for some reason appears to have contention
     // with other tests.
     "google/registry/whois/WhoisCommandFactoryTest.*",
@@ -168,7 +166,6 @@ dependencies {
   implementation deps['com.beust:jcommander']
   implementation deps['com.github.ben-manes.caffeine:caffeine']
   implementation deps['com.google.api:gax']
-  implementation deps['com.google.api.grpc:proto-google-cloud-datastore-v1']
   implementation deps['com.google.api.grpc:proto-google-common-protos']
   implementation deps['com.google.api.grpc:proto-google-cloud-secretmanager-v1']
   implementation deps['com.google.api-client:google-api-client']
@@ -192,7 +189,6 @@ dependencies {
   implementation deps['com.google.auth:google-auth-library-credentials']
   implementation deps['com.google.auth:google-auth-library-oauth2-http']
   implementation deps['com.google.cloud.bigdataoss:util']
-  implementation deps['com.google.cloud.datastore:datastore-v1-proto-client']
   implementation deps['com.google.cloud.sql:jdbc-socket-factory-core']
   runtimeOnly deps['com.google.cloud.sql:postgres-socket-factory']
   implementation deps['com.google.cloud:google-cloud-secretmanager']

core/gradle.lockfile

@@ -22,13 +22,13 @@ com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,default,deploy_jar
 com.github.docker-java:docker-java-api:3.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.9=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.jnr:jffi:1.3.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.jnr:jnr-constants:0.10.4=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.jnr:jnr-enxio:0.32.14=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.11=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.jnr:jnr-ffi:2.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.jnr:jnr-posix:3.1.16=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.jnr:jnr-unixsocket:0.38.19=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
@@ -37,7 +37,8 @@ com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default
 com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.16.0-alpha=testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -48,9 +49,10 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.7.1=compileClasspath,defau
 com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-spanner-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.16.0-alpha=testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
 com.google.api.grpc:grpc-google-common-protos:2.9.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-iam-v1:1.6.22=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-iam-v1:1.6.22=testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.23.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.147.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -62,23 +64,24 @@ com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,non
 com.google.api.grpc:proto-google-cloud-monitoring-v3:3.4.6=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-pubsub-v1:1.102.20=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.7.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-v1:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-storage-v2:2.16.0-alpha=testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-storage-v2:2.17.0-alpha=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.96.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.96.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.98.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.11.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.98.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.6.22=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.12.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:api-common:2.2.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.7.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.20.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:api-common:2.4.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:0.105.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.21.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax:2.20.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:0.106.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax:2.21.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-appengine:v1-rev20221205-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-appengine:v1-rev20230109-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-bigquery:v2-rev20220924-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-clouddebugger:v2-rev20220318-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -90,20 +93,19 @@ com.google.apis:google-api-services-healthcare:v1-rev20220818-2.0.0=compileClass
 com.google.apis:google-api-services-iamcredentials:v1-rev20210326-1.32.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-monitoring:v3-rev20221205-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-sheets:v4-rev20220927-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-sheets:v4-rev20221216-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-sqladmin:v1beta4-rev20221017-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-sqladmin:v1beta4-rev20221209-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:2.0.10=testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-stubs:2.0.10=testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-credentials:1.13.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-credentials:1.14.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-oauth2-http:1.13.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-oauth2-http:1.14.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service:1.0.1=annotationProcessor
 com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.auto.value:auto-value:1.10.1=annotationProcessor,testAnnotationProcessor
+com.google.auto.value:auto-value:1.10.1=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.auto.value:auto-value:1.9=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto:auto-common:0.10=errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.google.auto:auto-common:1.2=annotationProcessor
 com.google.closure-stylesheets:closure-stylesheets:1.5.0=css
@@ -112,30 +114,34 @@ com.google.cloud.bigdataoss:util:2.2.6=compileClasspath,default,deploy_jar,nonpr
 com.google.cloud.bigtable:bigtable-client-core:1.26.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.bigtable:bigtable-metrics-api:1.26.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.datastore:datastore-v1-proto-client:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud.sql:jdbc-socket-factory-core:1.7.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud.sql:jdbc-socket-factory-core:1.8.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud.sql:postgres-socket-factory:1.7.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud.sql:postgres-socket-factory:1.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-bigquerystorage:2.23.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-bigtable-stats:2.14.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-bigtable:2.14.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-grpc:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.9.0=testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-http:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.9.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-com.google.cloud:google-cloud-core:2.9.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-http:2.9.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-http:2.9.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.cloud:google-cloud-core:2.9.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.9.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
 com.google.cloud:google-cloud-firestore:3.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath
 com.google.cloud:google-cloud-monitoring:3.4.6=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-nio:0.125.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-nio:0.126.0=testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-pubsub:1.120.20=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-pubsublite:1.7.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-secretmanager:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-secretmanager:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-spanner:6.31.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-storage:2.16.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-storage:2.16.0=testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-tasks:2.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-storage:2.17.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.cloud:google-cloud-tasks:2.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:grpc-gcp:1.2.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.6.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.google.code.findbugs:jsr305:3.0.1=css
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,default,deploy_jar,errorprone,nonprodAnnotationProcessor,nonprodCompileClasspath,nonprodRuntime,nonprodRuntimeClasspath,runtime,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.code.gson:gson:2.10.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.7=css,soy
 com.google.common.html.types:types:1.0.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath
 com.google.dagger:dagger-compiler:2.44.2=annotationProcessor,testAnnotationProcessor
@@ -144,7 +150,7 @@ com.google.dagger:dagger-spi:2.44.2=annotationProcessor,testAnnotationProcessor
 com.google.dagger:dagger:2.44.2=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.16=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.3.4=checkstyle,errorprone,nonprodAnnotationProcessor,soy
 com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,testAnnotationProcessor
 com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
@@ -191,9 +197,9 @@ com.google.oauth-client:google-oauth-client-java6:1.34.1=compileClasspath,defaul
 com.google.oauth-client:google-oauth-client-jetty:1.34.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client-servlet:1.34.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.21.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.21.12=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:2.5.0=css
-com.google.protobuf:protobuf-java:3.21.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.21.12=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.google.protobuf:protobuf-java:4.0.0-rc-2=soy
 com.google.re2j:re2j:1.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -242,24 +248,24 @@ io.confluent:kafka-schema-registry-client:5.3.2=compileClasspath,default,deploy_
 io.dropwizard.metrics:metrics-core:3.1.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.104=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-alts:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-alts:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-api:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-api:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-auth:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-auth:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-census:1.49.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-context:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-context:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-core:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-core:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-googleapis:1.51.0=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-googleapis:1.51.1=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-grpclb:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-grpclb:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-netty-shaded:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-netty-shaded:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-netty:1.49.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-protobuf-lite:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-protobuf-lite:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-protobuf:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-protobuf:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-rls:1.49.2=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-services:1.49.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-io.grpc:grpc-services:1.51.0=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-services:1.51.1=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-stub:1.51.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-stub:1.51.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-xds:1.49.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-io.grpc:grpc-xds:1.51.0=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-xds:1.51.1=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.netty:netty-buffer:4.1.77.Final=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-http2:4.1.77.Final=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-http:4.1.77.Final=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -304,8 +310,9 @@ jline:jline:1.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonp
 joda-time:joda-time:2.10.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=default,nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.arnx:nashorn-promise:0.1.1=nonprodRuntime,runtime,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.12.16=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.12.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath
 net.java.dev.javacc:javacc:4.1=css
 net.java.dev.jna:jna:5.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor
@@ -340,8 +347,8 @@ org.apache.commons:commons-lang3:3.12.0=compileClasspath,default,deploy_jar,nonp
 org.apache.commons:commons-text:1.10.0=testCompileClasspath,testRuntimeClasspath
 org.apache.ftpserver:ftplet-api:1.2.0=testCompileClasspath,testRuntimeClasspath
 org.apache.ftpserver:ftpserver-core:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.httpcomponents:httpcore:4.4.15=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.mina:mina-core:2.1.6=testCompileClasspath,testRuntimeClasspath
 org.apache.sshd:sshd-core:2.0.0=testCompileClasspath,testRuntimeClasspath
 org.apache.sshd:sshd-scp:2.0.0=testCompileClasspath,testRuntimeClasspath
@@ -356,7 +363,7 @@ org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,compileClassp
 org.checkerframework:checker-qual:2.11.1=checkstyle
 org.checkerframework:checker-qual:3.0.0=errorprone,nonprodAnnotationProcessor
 org.checkerframework:checker-qual:3.12.0=annotationProcessor,testAnnotationProcessor
-org.checkerframework:checker-qual:3.28.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.29.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.5.0=nonprodRuntime,runtime,soy
 org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
@@ -374,7 +381,7 @@ org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,default,deploy_
 org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:9.10.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:9.11.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-core:4.0.1=nonprodRuntime,runtime
 org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-runtime:4.0.1=nonprodRuntime,runtime
@@ -410,22 +417,22 @@ org.joda:joda-money:1.0.3=compileClasspath,default,deploy_jar,nonprodCompileClas
 org.json:json:20160212=soy
 org.json:json:20200518=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jsoup:jsoup:1.15.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit-pioneer:junit-pioneer:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit-pioneer:junit-pioneer:2.0.0-RC1=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-migrationsupport:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-migrationsupport:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.1=testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
 org.jvnet.staxex:stax-ex:1.8=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-core:1.10.19=css
-org.mockito:mockito-core:4.9.0=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-junit-jupiter:4.9.0=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-junit-jupiter:4.11.0=testCompileClasspath,testRuntimeClasspath
 org.mortbay.jetty:jetty-util:6.1.26=testCompileClasspath,testRuntimeClasspath
 org.mortbay.jetty:jetty:6.1.26=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:2.1=css
@@ -466,8 +473,8 @@ org.slf4j:jcl-over-slf4j:1.7.30=nonprodRuntime,runtime,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.30=nonprodRuntime,runtime,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.30=nonprodRuntime,runtime
 org.slf4j:slf4j-api:1.7.36=compileClasspath,nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.slf4j:slf4j-jdk14:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-jdk14:2.0.6=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.springframework:spring-core:5.3.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.springframework:spring-expression:5.3.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.springframework:spring-jcl:5.3.18=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -477,7 +484,7 @@ org.testcontainers:junit-jupiter:1.17.6=testCompileClasspath,testRuntimeClasspat
 org.testcontainers:postgresql:1.17.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.testcontainers:selenium:1.17.6=testCompileClasspath,testRuntimeClasspath
 org.testcontainers:testcontainers:1.17.6=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.4=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.5=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tukaani:xz:1.5=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.w3c.css:sac:1.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.webjars.npm:viz.js-graphviz-java:2.1.3=nonprodRuntime,runtime,testRuntimeClasspath

core/src/main/java/google/registry/bigquery/BigqueryConnection.java

@@ -36,7 +36,6 @@ import com.google.api.services.bigquery.model.GetQueryResultsResponse;
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobConfiguration;
 import com.google.api.services.bigquery.model.JobConfigurationExtract;
-import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.api.services.bigquery.model.JobConfigurationQuery;
 import com.google.api.services.bigquery.model.JobReference;
 import com.google.api.services.bigquery.model.JobStatistics;
@@ -57,7 +56,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 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.NonFinalForTesting;
@@ -375,23 +373,6 @@ public class BigqueryConnection implements AutoCloseable {
     }
   }
 
-  /**
-   * Starts an asynchronous load job to populate the specified destination table with the given
-   * source URIs and source format. Returns a ListenableFuture that holds the same destination table
-   * object on success.
-   */
-  public ListenableFuture<DestinationTable> startLoad(
-      DestinationTable dest, SourceFormat sourceFormat, Iterable<String> sourceUris) {
-    Job job = new Job()
-        .setConfiguration(new JobConfiguration()
-            .setLoad(new JobConfigurationLoad()
-                .setWriteDisposition(dest.getWriteDisposition().toString())
-                .setSourceFormat(sourceFormat.toString())
-                .setSourceUris(ImmutableList.copyOf(sourceUris))
-                .setDestinationTable(dest.getTableReference())));
-    return transform(runJobToCompletion(job, dest), this::updateTable, directExecutor());
-  }
-
   /**
    * Starts an asynchronous query job to populate the specified destination table with the results
    * of the specified query, or if the table is a view, to update the view to reflect that query.

core/src/main/java/google/registry/bigquery/BigqueryUtils.java

@@ -25,18 +25,6 @@ import org.joda.time.format.ISODateTimeFormat;
 /** Utilities related to Bigquery. */
 public class BigqueryUtils {
 
-  /** Bigquery modes for schema fields. */
-  public enum FieldMode {
-    NULLABLE,
-    REQUIRED,
-    REPEATED;
-
-    /** Return the name of the field mode as it should appear in the Bigquery schema. */
-    public String schemaName() {
-      return name();
-    }
-  }
-
   /** Bigquery schema field types. */
   public enum FieldType {
     STRING,
@@ -44,19 +32,7 @@ public class BigqueryUtils {
     FLOAT,
     TIMESTAMP,
     RECORD,
-    BOOLEAN;
+    BOOLEAN
-
-    /** Return the name of the field type as it should appear in the Bigquery schema. */
-    public String schemaName() {
-      return name();
-    }
-  }
-
-  /** Source formats for Bigquery load jobs. */
-  public enum SourceFormat {
-    CSV,
-    NEWLINE_DELIMITED_JSON,
-    DATASTORE_BACKUP
   }
 
   /** Destination formats for Bigquery extract jobs. */

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -60,7 +60,7 @@ import org.joda.time.Duration;
  *
  * <p>This class does not represent the total configuration of the Nomulus service. It's <b>only
  * meant for settings that need to be configured <i>once</i></b>. Settings which may be subject to
- * change in the future, should instead be retrieved from Datastore. The {@link
+ * change in the future, should instead be retrieved from the database. The {@link
  * google.registry.model.tld.Registry Registry} class is one such example of this.
  *
  * <p>Note: Only settings that are actually configurable belong in this file. It's not a catch-all

core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml

@@ -147,13 +147,4 @@
     <schedule>every 1 minutes synchronized</schedule>
     <target>backend</target>
   </cron>
-
-  <cron>
-    <url><![CDATA[/_ah/sessioncleanup?clear]]></url>
-    <description>
-      Delete up to 100 expired _ah_SESSION entities from Datastore.
-    </description>
-    <schedule>every 15 minutes</schedule>
-    <target>backend</target>
-  </cron>
 </cronentries>

core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml

@@ -26,9 +26,9 @@
 
       We want it to be close to midnight because that reduces the chance that the
       point-in-time code won't have to go to the extra trouble of fetching old
-      versions of objects from Datastore. However, we don't want it to run too
+      versions of objects from the database. However, we don't want it to run too
       close to midnight, because there's always a chance that a change which was
-      timestamped before midnight hasn't fully been committed to Datastore. So
+      timestamped before midnight hasn't fully been committed to the database. So
       we add a 4+ minute grace period to ensure the transactions cool down, since
       our queries are not transactional.
     -->

core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml

@@ -26,9 +26,9 @@
 
       We want it to be close to midnight because that reduces the chance that the
       point-in-time code won't have to go to the extra trouble of fetching old
-      versions of objects from Datastore. However, we don't want it to run too
+      versions of objects from the database. However, we don't want it to run too
       close to midnight, because there's always a chance that a change which was
-      timestamped before midnight hasn't fully been committed to Datastore. So
+      timestamped before midnight hasn't fully been committed to the database. So
       we add a 4+ minute grace period to ensure the transactions cool down, since
       our queries are not transactional.
     -->
@@ -223,15 +223,6 @@
     <target>backend</target>
   </cron>
 
-  <cron>
-    <url><![CDATA[/_ah/sessioncleanup?clear]]></url>
-    <description>
-      Delete up to 100 expired _ah_SESSION entities from Datastore.
-    </description>
-    <schedule>every 15 minutes</schedule>
-    <target>backend</target>
-  </cron>
-
   <cron>
     <url><![CDATA[/_dr/cron/fanout?queue=retryable-cron-tasks&endpoint=/_dr/task/icannReportingStaging&runInEmpty]]></url>
     <description>

core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml

@@ -165,15 +165,6 @@
     <target>backend</target>
   </cron>
 
-  <cron>
-    <url><![CDATA[/_ah/sessioncleanup?clear]]></url>
-    <description>
-      Delete up to 100 expired _ah_SESSION entities from Datastore.
-    </description>
-    <schedule>every 15 minutes</schedule>
-    <target>backend</target>
-  </cron>
-
   <cron>
     <url><![CDATA[/_dr/task/wipeOutContactHistoryPii]]></url>
     <description>

core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java

@@ -79,9 +79,10 @@ import org.joda.time.DateTime;
  * transfer is automatically approved. Within that window, this flow allows the losing client to
  * explicitly approve the transfer request, which then becomes effective immediately.
  *
- * <p>When the transfer was requested, poll messages and billing events were saved to Datastore with
+ * <p>When the transfer was requested, poll messages and billing events were saved to the database
- * timestamps such that they only would become active when the transfer period passed. In this flow,
+ * with timestamps such that they only would become active when the transfer period passed. In this
- * those speculative objects are deleted and replaced with new ones with the correct approval time.
+ * flow, those speculative objects are deleted and replaced with new ones with the correct approval
+ * time.
  *
  * @error {@link google.registry.flows.FlowUtils.NotLoggedInException}
  * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException}

core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java

@@ -62,9 +62,9 @@ import org.joda.time.DateTime;
  * transfer is automatically approved. Within that window, this flow allows the gaining client to
  * withdraw the transfer request.
  *
- * <p>When the transfer was requested, poll messages and billing events were saved to Datastore with
+ * <p>When the transfer was requested, poll messages and billing events were saved to the database
- * timestamps such that they only would become active when the transfer period passed. In this flow,
+ * with timestamps such that they only would become active when the transfer period passed. In this
- * those speculative objects are deleted.
+ * flow, those speculative objects are deleted.
  *
  * @error {@link google.registry.flows.FlowUtils.NotLoggedInException}
  * @error {@link google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException}

core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java

@@ -91,7 +91,7 @@ import org.joda.time.DateTime;
  * by the losing registrar or rejected, and the gaining registrar can also cancel the transfer
  * request.
  *
- * <p>When a transfer is requested, poll messages and billing events are saved to Datastore with
+ * <p>When a transfer is requested, poll messages and billing events are saved to the database with
  * timestamps such that they only become active when the server-approval period passes. Keys to
  * these speculative objects are saved in the domain's transfer data, and on explicit approval,
  * rejection or cancellation of the request, they will be deleted (and in the approval case,

core/src/main/java/google/registry/flows/poll/PollAckFlow.java

@@ -46,9 +46,9 @@ import org.joda.time.DateTime;
  * An EPP flow for acknowledging {@link PollMessage}s.
  *
  * <p>Registrars refer to poll messages using an externally visible id generated by {@link
- * PollMessageExternalKeyConverter}. One-time poll messages are deleted from Datastore once they are
+ * PollMessageExternalKeyConverter}. One-time poll messages are deleted from the database once they
- * ACKed, whereas autorenew poll messages are simply marked as read, and won't be delivered again
+ * are ACKed, whereas autorenew poll messages are simply marked as read, and won't be delivered
- * until the next year of their recurrence.
+ * again until the next year of their recurrence.
  *
  * @error {@link PollAckFlow.InvalidMessageIdException}
  * @error {@link PollAckFlow.MessageDoesNotExistException}

core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java

@@ -51,7 +51,7 @@ import org.bouncycastle.openpgp.PGPPublicKey;
 
 /**
  * The {@link SecretManagerKeyringUpdater} accumulates updates to a {@link SecretManagerKeyring} and
- * persists them to KMS and Datastore when closed.
+ * persists them to Cloud Secret Manager when closed.
  */
 public final class SecretManagerKeyringUpdater {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@@ -125,7 +125,7 @@ public final class SecretManagerKeyringUpdater {
   }
 
   /**
-   * Persists the secrets in the Secret Manager (primary) and the Datastore (secondary).
+   * Persists the secrets in the Secret Manager.
    *
    * <p>Updates to the Secret Manager are not transactional. If an error happens, the successful
    * updates are not reverted; unwritten updates are aborted. This is not a problem right now, since

core/src/main/java/google/registry/model/CacheUtils.java

@@ -22,14 +22,14 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Supplier;
 import java.time.Duration;
 
-/** Utility methods related to caching Datastore entities. */
+/** Utility methods related to caching database entities. */
 public class CacheUtils {
 
   /**
    * Memoize a supplier, with a short expiration specified in the environment config.
    *
    * <p>Use this for things that might change while code is running. (For example, the various lists
-   * downloaded from the TMCH get updated in Datastore and the caches need to be refreshed.)
+   * downloaded from the TMCH get updated in the database and the caches need to be refreshed.)
    */
   public static <T> Supplier<T> memoizeWithShortExpiration(Supplier<T> original) {
     return tryMemoizeWithExpiration(getSingletonCacheRefreshDuration(), original);

core/src/main/java/google/registry/model/CreateAutoTimestamp.java

@@ -23,7 +23,7 @@ import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
 import org.joda.time.DateTime;
 
-/** A timestamp that auto-updates when first saved to Datastore. */
+/** A timestamp that auto-updates when first saved to the database. */
 @Embeddable
 public class CreateAutoTimestamp extends ImmutableObject implements UnsafeSerializable {
 

core/src/main/java/google/registry/model/EppResourceUtils.java

@@ -89,14 +89,14 @@ public final class EppResourceUtils {
   }
 
   /**
-   * Loads the last created version of an {@link EppResource} from Datastore by foreign key.
+   * Loads the last created version of an {@link EppResource} from the database by foreign key.
    *
    * <p>Returns empty if no resource with this foreign key was ever created, or if the most recently
    * created resource was deleted before time "now".
    *
    * <p>Loading an {@link EppResource} by itself is not sufficient to know its current state since
    * it may have various expirable conditions and status values that might implicitly change its
-   * state as time progresses even if it has not been updated in Datastore. Rather, the resource
+   * state as time progresses even if it has not been updated in the database. Rather, the resource
    * must be combined with a timestamp to view its current state. We use a global last updated
    * timestamp on the resource's entity group (which is essentially free since all writes to the
    * entity group must be serialized anyways) to guarantee monotonically increasing write times, and
@@ -330,7 +330,7 @@ public final class EppResourceUtils {
   /**
    * Returns a set of {@link VKey} for domains that reference a specified contact or host.
    *
-   * <p>This is an eventually consistent query if used for Datastore.
+   * <p>This is an eventually consistent query if used for the database.
    *
    * @param key the referent key
    * @param now the logical time of the check

core/src/main/java/google/registry/model/OteAccountBuilder.java

@@ -50,7 +50,7 @@ import org.joda.time.DateTime;
 import org.joda.time.Duration;
 
 /**
- * Class to help build and persist all the OT&E entities in Datastore.
+ * Class to help build and persist all the OT&E entities in the database.
  *
  * <p>This includes the TLDs (Registries), Registrars, and the RegistrarContacts that can access the
  * web console.

core/src/main/java/google/registry/model/UnsafeSerializable.java

@@ -18,9 +18,7 @@ import java.io.Serializable;
 
 /**
  * Marker interface for Nomulus entities whose serialization are implemented in a fragile way. These
- * entities are made {@link Serializable} so that they can be passed between JVMs. The intended use
+ * entities are made {@link Serializable} so that they can be passed between JVMs.
- * case is BEAM pipeline-based cross-database data validation between Datastore and Cloud SQL during
- * the migration. Note that only objects loaded from the SQL database need serialization support.
  *
  * <p>All entities implementing this interface take advantage of the fact that all Java collection
  * classes we use, either directly or indirectly, including those in Java libraries, Guava, and
@@ -29,5 +27,4 @@ import java.io.Serializable;
  * <p>The {@code serialVersionUID} field has also been omitted in the implementing classes, since
  * they are not used for persistence.
  */
-// TODO(b/203609782): either remove this interface or fix implementors post migration.
 public interface UnsafeSerializable extends Serializable {}

core/src/main/java/google/registry/model/UpdateAutoTimestamp.java

@@ -25,7 +25,7 @@ import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
 import org.joda.time.DateTime;
 
-/** A timestamp that auto-updates on each save to Datastore/Cloud SQL. */
+/** A timestamp that auto-updates on each save to Cloud SQL. */
 @Embeddable
 public class UpdateAutoTimestamp extends ImmutableObject implements UnsafeSerializable {
 

core/src/main/java/google/registry/model/billing/BillingEvent.java

@@ -312,7 +312,7 @@ public abstract class BillingEvent extends ImmutableObject
     Integer periodYears;
 
     /**
-     * For {@link Flag#SYNTHETIC} events, when this event was persisted to Datastore (i.e. the
+     * For {@link Flag#SYNTHETIC} events, when this event was persisted to the database (i.e. the
      * cursor position at the time the recurrence expansion job was last run). In the event a job
      * needs to be undone, a query on this field will return the complete set of potentially bad
      * events.

core/src/main/java/google/registry/model/common/Cursor.java

@@ -52,8 +52,7 @@ public class Cursor extends UpdateAutoTimestampEntity {
   /** The scope of a global cursor. A global cursor is a cursor that is not specific to one tld. */
   public static final String GLOBAL = "GLOBAL";
 
-
+  /** The types of cursors, used as the string id field for each cursor in the database. */
-  /** The types of cursors, used as the string id field for each cursor in Datastore. */
   public enum CursorType {
     /** Cursor for ensuring rolling transactional isolation of BRDA staging operation. */
     BRDA(true),

core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java

@@ -218,7 +218,7 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton {
   /** Loads the currently-set migration schedule from SQL, or the default if none exists. */
   @VisibleForTesting
   static TimedTransitionProperty<MigrationState> getUncached() {
-    return tm().transactWithoutBackup(
+    return tm().transact(
             () -> {
               try {
                 return tm().loadSingleton(DatabaseMigrationStateSchedule.class)

core/src/main/java/google/registry/model/contact/ContactBase.java

@@ -56,7 +56,7 @@ public class ContactBase extends EppResource
    * Unique identifier for this contact.
    *
    * <p>This is only unique in the sense that for any given lifetime specified as the time range
-   * from (creationTime, deletionTime) there can only be one contact in Datastore with this id.
+   * from (creationTime, deletionTime) there can only be one contact in the database with this id.
    * However, there can be many contacts with the same id and non-overlapping lifetimes.
    */
   String contactId;

core/src/main/java/google/registry/model/contact/ContactCommand.java

@@ -122,8 +122,8 @@ public class ContactCommand {
      * Unique identifier for this contact.
      *
      * <p>This is only unique in the sense that for any given lifetime specified as the time range
-     * from (creationTime, deletionTime) there can only be one contact in Datastore with this
+     * from (creationTime, deletionTime) there can only be one contact in the database with this id.
-     * id.  However, there can be many contacts with the same id and non-overlapping lifetimes.
+     * However, there can be many contacts with the same id and non-overlapping lifetimes.
      */
     @XmlElement(name = "id")
     String contactId;

core/src/main/java/google/registry/model/domain/DesignatedContact.java

@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
  *
  * <p>A contact association on a domain consists of the contact key and the contact "type", which is
  * the designated role of this contact with respect to this domain. When converting to and from EPP
- * XML, we use {@link ForeignKeyedDesignatedContact} to replace the contact's Datastore key with its
+ * XML, we use {@link ForeignKeyedDesignatedContact} to replace the contact's primary key with its
  * foreign key, since that is what EPP exposes.
  *
  * <p>Note one could in principle store contact foreign keys here in addition to keys, unlike the

core/src/main/java/google/registry/model/domain/DomainBase.java

@@ -257,8 +257,7 @@ public class DomainBase extends EppResource
    *
    * <p>Note that this is a Cloud SQL-based replacement for the {@code dns-pull} task queue. The
    * domains that have a non-null value for this field should be exactly the same as the tasks that
-   * would be in the {@code dns-pull} queue. Because this is Cloud SQL-specific, it is omitted from
+   * would be in the {@code dns-pull} queue.
-   * Datastore.
    *
    * <p>Note that in the {@link DomainHistory} table this value means something slightly different:
    * It means that the given domain action requested a DNS update. Unlike on the {@code Domain}
@@ -485,7 +484,7 @@ public class DomainBase extends EppResource
               .setCurrentPackageToken(null);
       if (transferData.getTransferPeriod().getValue() == 1) {
         // Set the grace period using a key to the pre-scheduled transfer billing event.  Not using
-        // GracePeriod.forBillingEvent() here in order to avoid the actual Datastore fetch.
+        // GracePeriod.forBillingEvent() here in order to avoid the actual fetch.
         builder.setGracePeriods(
             ImmutableSet.of(
                 GracePeriod.create(

core/src/main/java/google/registry/model/domain/DomainHistory.java

@@ -154,7 +154,7 @@ public class DomainHistory extends HistoryEntry {
    *
    * <p>This will be empty for any DomainHistory/HistoryEntry generated before this field was added
    * (mid-2017), as well as any action that does not generate billable events (e.g. contact/host
-   * updates). *
+   * updates).
    */
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
   @JoinColumn(name = "historyRevisionId", referencedColumnName = "historyRevisionId")

core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java

@@ -23,10 +23,10 @@ import javax.xml.bind.annotation.XmlValue;
  *
  * <p>This type is used on the wire for EPP XML, where only the contact ID (foreign key) is exposed.
  * This is converted to and from the persisted type, {@link DesignatedContact}, which stores the
- * Datastore key instead of the foreign key.
+ * primary key instead of the foreign key.
  *
- * @see <a href="http://tools.ietf.org/html/rfc5731#section-2.2">
+ * @see <a href="http://tools.ietf.org/html/rfc5731#section-2.2">RFC 5731 - EPP Domain Name Mapping
- *     RFC 5731 - EPP Domain Name Mapping - Contact and Client Identifiers</a>
+ *     - Contact and Client Identifiers</a>
  */
 public class ForeignKeyedDesignatedContact extends ImmutableObject {
   @XmlAttribute(required = true)

core/src/main/java/google/registry/model/domain/GracePeriod.java

@@ -37,7 +37,7 @@ import org.joda.time.DateTime;
  * A domain grace period with an expiration time.
  *
  * <p>When a grace period expires, it is lazily removed from the {@link Domain} the next time the
- * resource is loaded from Datastore.
+ * resource is loaded from the database.
  */
 @Entity
 @Table(
@@ -84,8 +84,8 @@ public class GracePeriod extends GracePeriodBase {
    * Creates a GracePeriod for an (optional) OneTime billing event.
    *
    * <p>Normal callers should always use {@link #forBillingEvent} instead, assuming they do not need
-   * to avoid loading the BillingEvent from Datastore. This method should typically be called only
+   * to avoid loading the BillingEvent from the database. This method should typically be called
-   * from test code to explicitly construct GracePeriods.
+   * only from test code to explicitly construct GracePeriods.
    */
   public static GracePeriod create(
       GracePeriodStatus type,
@@ -102,8 +102,8 @@ public class GracePeriod extends GracePeriodBase {
    * #gracePeriodId}.
    *
    * <p>Normal callers should always use {@link #forBillingEvent} instead, assuming they do not need
-   * to avoid loading the BillingEvent from Datastore. This method should typically be called only
+   * to avoid loading the BillingEvent from the database. This method should typically be called
-   * from test code to explicitly construct GracePeriods.
+   * only from test code to explicitly construct GracePeriods.
    */
   @VisibleForTesting
   public static GracePeriod create(

core/src/main/java/google/registry/model/eppcommon/StatusValue.java

@@ -60,7 +60,7 @@ public enum StatusValue implements EppEnum {
   /**
    * A status for a resource has an incoming reference from an active domain.
    *
-   * <p>LINKED is a "virtual" status value that should never be persisted to Datastore on any
+   * <p>LINKED is a "virtual" status value that should never be persisted to the database on any
    * resource. It must be computed on the fly when we need it, as the set of domains using a
    * resource can change at any time.
    */

core/src/main/java/google/registry/model/eppcommon/package-info.java

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * Nomulus Datastore model common/shared classes.
+ * Nomulus data model common/shared classes.
  *
  * <p>This package is intended to hold classes which are shared across multiple XML namespaces. As
  * such, no default namespace is declared in this package, and all objects in this package should be

core/src/main/java/google/registry/model/host/HostBase.java

@@ -57,7 +57,7 @@ public class HostBase extends EppResource {
    * Fully qualified hostname, which is a unique identifier for this host.
    *
    * <p>This is only unique in the sense that for any given lifetime specified as the time range
-   * from (creationTime, deletionTime) there can only be one host in Datastore with this name.
+   * from (creationTime, deletionTime) there can only be one host in the database with this name.
    * However, there can be many hosts with the same name and non-overlapping lifetimes.
    */
   String hostName;

core/src/main/java/google/registry/model/poll/PollMessage.java

@@ -67,7 +67,7 @@ import org.joda.time.DateTime;
  *
  * <p>Poll messages are not delivered until their {@link #eventTime} has passed. Poll messages can
  * be speculatively enqueued for future delivery, and then modified or deleted before that date has
- * passed. Unlike most other entities in Datastore, which are marked as deleted but otherwise
+ * passed. Unlike most other entities in the database, which are marked as deleted but otherwise
  * retained for historical purposes, poll messages are truly deleted once they have been delivered
  * and ACKed.
  *
@@ -337,7 +337,8 @@ public abstract class PollMessage extends ImmutableObject
   /**
    * A one-time poll message.
    *
-   * <p>One-time poll messages are deleted from Datastore once they have been delivered and ACKed.
+   * <p>One-time poll messages are deleted from the database once they have been delivered and
+   * ACKed.
    */
   @Entity
   @DiscriminatorValue("ONE_TIME")

core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java

@@ -25,7 +25,7 @@ import javax.inject.Inject;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 
-/** A premium list pricing engine that stores static pricing information in Datastore entities. */
+/** A premium list pricing engine that stores static pricing information in database entities. */
 public final class StaticPremiumListPricingEngine implements PremiumPricingEngine {
 
   /** The name of the pricing engine, as used in {@code Registry.pricingEngineClassName}. */

core/src/main/java/google/registry/model/rde/RdeRevision.java

@@ -37,7 +37,7 @@ import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
 /**
- * Datastore entity for tracking RDE revisions.
+ * Entity for tracking RDE revisions.
  *
  * <p>This class is used by the RDE staging, upload, and reporting systems to determine the revision
  * that should be used in the generated filename. It also determines whether or not a {@code resend}
@@ -102,10 +102,10 @@ public final class RdeRevision extends UpdateAutoTimestampEntity {
    * Sets the revision ID for a given triplet.
    *
    * <p>This method verifies that the current revision is {@code revision - 1}, or that the object
-   * does not exist in Datastore if {@code revision == 0}.
+   * does not exist in the database if {@code revision == 0}.
    *
    * @throws IllegalStateException if not in a transaction
-   * @throws VerifyException if Datastore state doesn't meet the above criteria
+   * @throws VerifyException if the state doesn't meet the above criteria
    */
   public static void saveRevision(String tld, DateTime date, RdeMode mode, int revision) {
     checkArgument(revision >= 0, "Negative revision: %s", revision);

core/src/main/java/google/registry/model/registrar/Registrar.java

@@ -217,8 +217,8 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
    * on its length.
    *
    * <p>NB: We are assuming that this field is unique across all registrar entities. This is not
-   * formally enforced in Datastore, but should be enforced by ICANN in that no two registrars will
+   * formally enforced in the database, but should be enforced by ICANN in that no two registrars
-   * be accredited with the same name.
+   * will be accredited with the same name.
    *
    * @see <a href="http://www.icann.org/registrar-reports/accredited-list.html">ICANN-Accredited
    *     Registrars</a>
@@ -930,7 +930,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
     return email;
   }
 
-  /** Loads all registrar entities directly from Datastore. */
+  /** Loads all registrar entities directly from the database. */
   public static Iterable<Registrar> loadAll() {
     return tm().transact(() -> tm().loadAllOf(Registrar.class));
   }
@@ -947,7 +947,7 @@ public class Registrar extends UpdateAutoTimestampEntity implements Buildable, J
         .collect(toImmutableSet());
   }
 
-  /** Loads and returns a registrar entity by its id directly from Datastore. */
+  /** Loads and returns a registrar entity by its id directly from the database. */
   public static Optional<Registrar> loadByRegistrarId(String registrarId) {
     checkArgument(!Strings.isNullOrEmpty(registrarId), "registrarId must be specified");
     return tm().transact(() -> tm().loadByKeyIfPresent(createVKey(registrarId)));

core/src/main/java/google/registry/model/registrar/RegistrarPoc.java

@@ -121,21 +121,7 @@ public class RegistrarPoc extends ImmutableObject implements Jsonifiable, Unsafe
    */
   Set<Type> types;
 
-  /**
+  /** A GAIA email address that was assigned to the registrar for console login purpose. */
-   * A GAIA email address that was assigned to the registrar for console login purpose.
-   *
-   * <p>We used to store the GAE user ID directly to identify the logged-in user in the registrar
-   * console, and relied on a hacky trick with datastore to get the ID from the email address when
-   * creating a {@link RegistrarPoc}. We switched to using the login email directly as each
-   * registrar is assigned a unique email address that is immutable (to them at least), so it is as
-   * good as an identifier as the ID itself, and it allows us to get rid of the datastore
-   * dependency.
-   *
-   * <p>We backfilled all login email addresses for existing {@link RegistrarPoc}s that have a
-   * non-null GAE user ID. The backfill is done by first trying the {@link #emailAddress} field,
-   * then trying {@link #registrarId}+"@known-dasher_domain" and picking the ones that converted to
-   * the existing ID stored in the database.
-   */
   String loginEmailAddress;
 
   /**

core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java

@@ -55,10 +55,13 @@ public class DomainTransactionRecord extends ImmutableObject
   @Column(nullable = false)
   String tld;
 
-  // The following two fields are exposed in this entity to support bulk-loading in Cloud SQL by the
+  // The following two fields are marked as insignificant because they are only used to map the set
-  // Datastore-SQL validation. They are excluded from equality check since they are not set in
+  // of DomainTransactionRecords of a DomainHistory to the rows in the DomainTransactionRecord
-  // Datastore.
+  // table. They are auto-populated when the DomainHistory is persisted into the database (due to
-  // TODO(b/203609782): post migration, decide whether to keep these two fields.
+  // the one-to-many mapping) and are foreign key constrained. More importantly, they cannot be set
+  // directly in the code. We therefore do not need to compare them for equality checks, and we
+  // would have to introduce setters only to set them in tests (and change a lot of test code) if
+  // we remove the annotation.
   @Insignificant String domainRepoId;
 
   @Insignificant Long historyRevisionId;

core/src/main/java/google/registry/model/server/Lock.java

@@ -240,7 +240,7 @@ public class Lock extends ImmutableObject implements Serializable {
 
           return AcquireResult.create(now, lock, newLock, lockState);
         };
-    AcquireResult acquireResult = tm().transactWithoutBackup(lockAcquirer);
+    AcquireResult acquireResult = tm().transact(lockAcquirer);
 
     logAcquireResult(acquireResult);
     lockMetrics.recordAcquire(resourceName, scope, acquireResult.lockState());
@@ -277,7 +277,7 @@ public class Lock extends ImmutableObject implements Serializable {
           }
           return null;
         };
-    tm().transactWithoutBackup(lockReleaser);
+    tm().transact(lockReleaser);
   }
 
   static class LockId extends ImmutableObject implements Serializable {

core/src/main/java/google/registry/model/server/ServerSecret.java

@@ -54,7 +54,7 @@ public class ServerSecret extends CrossTldSingleton {
             });
   }
 
-  /** Returns the global ServerSecret instance, creating it if one isn't already in Datastore. */
+  /** Returns the global ServerSecret instance, creating it if one isn't already in the database. */
   public static ServerSecret get() {
     return CACHE.get(ServerSecret.class);
   }

core/src/main/java/google/registry/model/tld/Registries.java

@@ -84,7 +84,7 @@ public final class Registries {
     return ImmutableSet.copyOf(filterValues(cache.get(), equalTo(type)).keySet());
   }
 
-  /** Returns the Registry entities themselves of the given type loaded fresh from Datastore. */
+  /** Returns the Registry entities themselves of the given type loaded fresh from the database. */
   public static ImmutableSet<Registry> getTldEntitiesOfType(TldType type) {
     return Registry.get(filterValues(cache.get(), equalTo(type)).keySet());
   }

core/src/main/java/google/registry/model/tld/Registry.java

@@ -955,8 +955,8 @@ public class Registry extends ImmutableObject implements Buildable, UnsafeSerial
           "Cannot create registry for TLD that is not a valid, canonical domain name");
       // Check the validity of all TimedTransitionProperties to ensure that they have values for
       // START_OF_TIME.  The setters above have already checked this for new values, but also check
-      // here to catch cases where we loaded an invalid TimedTransitionProperty from Datastore and
+      // here to catch cases where we loaded an invalid TimedTransitionProperty from the database
-      // cloned it into a new builder, to block re-building a Registry in an invalid state.
+      // and cloned it into a new builder, to block re-building a Registry in an invalid state.
       instance.tldStateTransitions.checkValidity();
       instance.renewBillingCostTransitions.checkValidity();
       instance.eapFeeSchedule.checkValidity();

core/src/main/java/google/registry/model/tld/label/ReservedList.java

@@ -106,7 +106,7 @@ public final class ReservedList
   }
 
   /**
-   * A reserved list entry entity, persisted to Datastore, that represents a single label and its
+   * A reserved list entry entity, persisted to the database, that represents a single label and its
    * reservation type.
    */
   @javax.persistence.Entity(name = "ReservedEntry")

core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java

@@ -52,9 +52,9 @@ public class CriteriaQueryBuilder<T> {
   }
 
   /** Adds a WHERE clause to the query, given the specified operation, field, and value. */
-  public <V> CriteriaQueryBuilder<T> where(
+  public <U> CriteriaQueryBuilder<T> where(
-      String fieldName, WhereOperator<V> whereClause, V value) {
+      String fieldName, WhereOperator<U> whereClause, U value) {
-    Expression<V> expression = root.get(fieldName);
+    Expression<U> expression = root.get(fieldName);
     return where(whereClause.predicate(expression, value));
   }
 
@@ -74,7 +74,7 @@ public class CriteriaQueryBuilder<T> {
    * Adds a WHERE clause to the query specifying that a collection field must contain a particular
    * value.
    */
-  public <V> CriteriaQueryBuilder<T> whereFieldContains(String fieldName, Object value) {
+  public CriteriaQueryBuilder<T> whereFieldContains(String fieldName, Object value) {
     return where(
         jpaTm.getEntityManager().getCriteriaBuilder().isMember(value, root.get(fieldName)));
   }

core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java

@@ -76,11 +76,6 @@ public interface JpaTransactionManager extends TransactionManager {
    */
   Query query(String sqlString);
 
-  /**
-   * Execute the work in a transaction without recording the transaction for replay to datastore.
-   */
-  <T> T transactWithoutBackup(Supplier<T> work);
-
   /** Executes the work in a transaction with no retries and returns the result. */
   <T> T transactNoRetry(Supplier<T> work);
 

core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java

@@ -157,11 +157,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
     return retrier.callWithRetry(() -> transactNoRetry(work), JpaRetries::isFailedTxnRetriable);
   }
 
-  @Override
-  public <T> T transactWithoutBackup(Supplier<T> work) {
-    return transact(work);
-  }
-
   @Override
   public <T> T transactNoRetry(Supplier<T> work) {
     if (inTransaction()) {

core/src/main/java/google/registry/persistence/transaction/QueryComposer.java

@@ -16,12 +16,12 @@ package google.registry.persistence.transaction;
 
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import google.registry.persistence.transaction.CriteriaQueryBuilder.WhereOperator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -40,14 +40,13 @@ import javax.persistence.criteria.CriteriaBuilder;
  */
 public abstract class QueryComposer<T> {
 
-  // The class whose entities we're querying.  Note that this limits us to single table queries in
+  // The class whose entities we're querying.
-  // SQL.  In datastore, there's really no other kind of query.
   protected Class<T> entityClass;
 
   // Field to order by, if any.  Null if we don't care about order.
   @Nullable protected String orderBy;
 
-  protected List<WhereClause<?>> predicates = new ArrayList<WhereClause<?>>();
+  protected List<WhereClause<?>> predicates = new ArrayList<>();
 
   protected QueryComposer(Class<T> entityClass) {
     this.entityClass = entityClass;
@@ -61,14 +60,14 @@ public abstract class QueryComposer<T> {
    */
   public <U extends Comparable<? super U>> QueryComposer<T> where(
       String fieldName, Comparator comparator, U value) {
-    predicates.add(new WhereClause(fieldName, comparator, value));
+    predicates.add(new WhereClause<>(fieldName, comparator, value));
     return this;
   }
 
   /**
    * Order the query results by the value of the specified field.
    *
-   * <p>TODO(mmuller): add the ability to do descending sort order.
+   * <p>TODO: add the ability to do descending sort order.
    */
   public QueryComposer<T> orderBy(String fieldName) {
     orderBy = fieldName;
@@ -151,52 +150,35 @@ public abstract class QueryComposer<T> {
    * "someval")'}.
    */
   public enum Comparator {
-    /**
+    /** Return only records whose field is equal to the value. */
-     * Return only records whose field is equal to the value.
+    EQ(QueryComposer::equal),
-     *
-     * <p>Note that the datastore string for this is empty, which is consistent with the way {@code
-     * filter()} works (it uses an unadorned field name to check for equality).
-     */
-    EQ("", QueryComposer::equal),
 
     /** Return only records whose field is less than the value. */
-    LT(" <", QueryComposer::lessThan),
+    LT(QueryComposer::lessThan),
 
     /** Return only records whose field is less than or equal to the value. */
-    LTE(" <=", QueryComposer::lessThanOrEqualTo),
+    LTE(QueryComposer::lessThanOrEqualTo),
 
     /** Return only records whose field is greater than or equal to the value. */
-    GTE(" >=", QueryComposer::greaterThanOrEqualTo),
+    GTE(QueryComposer::greaterThanOrEqualTo),
 
     /** Return only records whose field is greater than the value. */
-    GT(" >", QueryComposer::greaterThan),
+    GT(QueryComposer::greaterThan),
 
-    /**
+    /** Return only records whose field matches the pattern. */
-     * Return only records whose field matches the pattern.
+    LIKE(QueryComposer::like);
-     *
-     * <p>SQL ONLY.
-     */
-    LIKE(null, QueryComposer::like);
-
-    private final String datastoreString;
 
     @SuppressWarnings("ImmutableEnumChecker") // Functions are immutable.
     private final Function<CriteriaBuilder, WhereOperator<?>> operatorFactory;
 
-    Comparator(
+    Comparator(Function<CriteriaBuilder, WhereOperator<?>> operatorFactory) {
-        String datastoreString, Function<CriteriaBuilder, WhereOperator<?>> operatorFactory) {
-      this.datastoreString = datastoreString;
       this.operatorFactory = operatorFactory;
     }
 
-    public String getDatastoreString() {
-      return datastoreString;
-    }
-
     public Function<CriteriaBuilder, WhereOperator<?>> getComparisonFactory() {
       return operatorFactory;
     }
-  };
+  }
 
   protected static class WhereClause<U extends Comparable<? super U>> {
     public String fieldName;

core/src/main/java/google/registry/rdap/RdapJsonFormatter.java

@@ -143,8 +143,8 @@ public class RdapJsonFormatter {
      *
      * <p>Reserved to cases when this object is one of many results of a search query.
      *
-     * <p>We want to minimize the size of the reply, and also minimize the Datastore queries needed
+     * <p>We want to minimize the size of the reply, and also minimize the queries needed to
-     * to generate these replies since we might have a lot of these objects to return.
+     * generate these replies since we might have a lot of these objects to return.
      *
      * <p>Each object with a SUMMARY type will have a remark with a direct link to itself, which
      * will return the FULL result.
@@ -743,16 +743,9 @@ public class RdapJsonFormatter {
     // Rdap Response Profile 2.4.5 says the Registrar inside a Domain response MUST include the
     // ABUSE contact, but doesn't require any other contact.
     //
-    // In our current Datastore schema, to get the ABUSE contact we must go over all contacts.
+    // Write the minimum, meaning only ABUSE for INTERNAL registrars, nothing for SUMMARY and
-    // However, there's something to be said about returning smaller JSON
+    // everything for FULL.
     //
-    // TODO(b/117242274): Need to decide between 2 options:
-    // - Write the minimum, meaning only ABUSE for INTERNAL registrars, nothing for SUMMARY (also
-    //   saves resources for the RegistrarContact Datastore query!) and everything for FULL.
-    // - Write everything for everything.
-    //
-    // For now we'll do the first.
-
     if (outputDataType != OutputDataType.SUMMARY) {
       ImmutableList<RdapContactEntity> registrarContacts =
           registrar.getContacts().stream()

core/src/main/java/google/registry/rdap/RdapSearchActionBase.java

@@ -145,9 +145,8 @@ public abstract class RdapSearchActionBase extends RdapActionBase {
    *     clauses that make up this SQL query
    * @param checkForVisibility true if the results should be checked to make sure they are visible;
    *     normally this should be equal to the shouldIncludeDeleted setting, but in cases where the
-   *     query could not check deletion status (due to Datastore limitations such as the limit of
+   *     query could not check deletion status, it may need to be set to true even when not
-   *     one field queried for inequality, for instance), it may need to be set to true even when
+   *     including deleted records
-   *     not including deleted records
    * @param querySizeLimit the maximum number of items the query is expected to return, usually
    *     because the limit has been set
    * @return an {@link RdapResultSet} object containing the list of resources and an incompleteness

core/src/main/java/google/registry/rde/EscrowTaskRunner.java

@@ -35,12 +35,12 @@ import org.joda.time.Duration;
  * <p>This class implements the <i>Locking Rolling Cursor</i> pattern, which solves the problem of
  * how to reliably execute App Engine tasks which can't be made idempotent.
  *
- * <p>{@link LockHandler} is used to ensure only one task executes at a time for a given
+ * <p>{@link LockHandler} is used to ensure only one task executes at a time for a given {@code
- * {@code LockedCursorTask} subclass + TLD combination. This is necessary because App Engine tasks
+ * LockedCursorTask} subclass + TLD combination. This is necessary because App Engine tasks might
- * might double-execute. Normally tasks solve this by being idempotent, but that's not possible for
+ * double-execute. Normally tasks solve this by being idempotent, but that's not possible for RDE,
- * RDE, which writes to a GCS filename with a deterministic name. So Datastore is used to to
+ * which writes to a GCS filename with a deterministic name. So locks are used to guarantee
- * guarantee isolation. If we can't acquire the lock, it means the task is already running, so
+ * isolation. If we can't acquire the lock, it means the task is already running, so {@link
- * {@link NoContentException} is thrown to cancel the task.
+ * NoContentException} is thrown to cancel the task.
  *
  * <p>The specific date for which the deposit is generated depends on the current position of the
  * {@link Cursor}. If the cursor is set to tomorrow, we do nothing and return 204 No Content. If the
@@ -59,7 +59,7 @@ class EscrowTaskRunner {
     /**
      * Performs task logic while the lock is held.
      *
-     * @param watermark the logical time for a point-in-time view of Datastore
+     * @param watermark the logical time for a point-in-time view of the database.
      */
     void runWithLock(DateTime watermark) throws Exception;
   }

core/src/main/java/google/registry/rde/PendingDepositChecker.java

@@ -48,7 +48,7 @@ import org.joda.time.Duration;
  *
  * <p>If no deposits have been made so far, then {@code startingPoint} is used as the watermark of
  * the next deposit. If that's a day in the future, then escrow won't start until that date. This
- * first deposit time will be set to Datastore in a transaction.
+ * first deposit time will be set to the database in a transaction.
  */
 public final class PendingDepositChecker {
 

core/src/main/java/google/registry/request/lock/LockHandlerImpl.java

@@ -39,7 +39,7 @@ import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 
-/** Implementation of {@link LockHandler} that uses the datastore lock. */
+/** Implementation of {@link LockHandler} that uses the database lock. */
 public class LockHandlerImpl implements LockHandler {
 
   private static final long serialVersionUID = 5746905970040002524L;

core/src/main/java/google/registry/tools/AckPollMessagesCommand.java

@@ -91,13 +91,7 @@ final class AckPollMessagesCommand implements Command {
             });
   }
 
-  /**
+  /** Acks the poll message if not running in dry-run mode, prints regardless. */
-   * Acks the poll message if not running in dry-run mode, prints regardless.
-   *
-   * <p>This is a separate function because the processing of poll messages is transactionally
-   * different between the Datastore and SQL implementations. Datastore must process the messages in
-   * batches, whereas we can load all messages from SQL in one transaction.
-   */
   private void actOnPollMessage(PollMessage pollMessage) {
     if (!dryRun) {
       PollFlowUtils.ackPollMessage(pollMessage);

core/src/main/java/google/registry/tools/DeleteTldCommand.java

@@ -26,11 +26,11 @@ import google.registry.model.tld.Registry.TldType;
 import google.registry.persistence.transaction.QueryComposer.Comparator;
 
 /**
- * Command to delete the {@link Registry} associated with the specified TLD in Datastore.
+ * Command to delete the {@link Registry} associated with the specified TLD in the database.
  *
  * <p>This command will fail if any domains are currently registered on the TLD.
  */
-@Parameters(separators = " =", commandDescription = "Delete a TLD from Datastore.")
+@Parameters(separators = " =", commandDescription = "Delete a TLD from the database.")
 final class DeleteTldCommand extends ConfirmingCommand {
 
   private Registry registry;

core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java

@@ -53,7 +53,7 @@ final class GenerateEscrowDepositCommand implements Command {
 
   @Parameter(
       names = {"-w", "--watermark"},
-      description = "Point-in-time timestamp(s) for snapshotting Datastore.",
+      description = "Point-in-time timestamp(s) for which time the deposit should be generated",
       required = true,
       converter = DateTimeParameter.class)
   private List<DateTime> watermarks;

core/src/main/java/google/registry/tools/MutatingCommand.java

@@ -40,7 +40,7 @@ import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
 
-/** A {@link ConfirmingCommand} that changes objects in Datastore. */
+/** A {@link ConfirmingCommand} that changes objects in the database. */
 public abstract class MutatingCommand extends ConfirmingCommand {
 
   /**

core/src/main/java/google/registry/tools/RegistryCli.java

@@ -36,7 +36,7 @@ import java.util.Optional;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.postgresql.util.PSQLException;
 
-/** Container class to create and run remote commands against a Datastore instance. */
+/** Container class to create and run remote commands against a server instance. */
 @Parameters(separators = " =", commandDescription = "Command-line interface to the registry")
 final class RegistryCli implements CommandRunner {
 

core/src/main/java/google/registry/tools/RegistryTool.java

@@ -17,7 +17,7 @@ package google.registry.tools;
 import com.google.common.collect.ImmutableMap;
 import google.registry.tools.javascrap.CreateCancellationsForOneTimesCommand;
 
-/** Container class to create and run remote commands against a Datastore instance. */
+/** Container class to create and run remote commands against a server instance. */
 public final class RegistryTool {
 
   /**

core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java

@@ -120,7 +120,7 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA
     final DateTime exportTime = DateTime.parse(json.get("exportTime").toString());
     // We disallow exporting within the past 2 minutes because there might be outstanding writes.
     // We can only reliably call loadAtPointInTime at times that are UTC midnight and >
-    // datastoreRetention ago in the past.
+    // databaseRetention ago in the past.
     DateTime now = clock.nowUtc();
     if (exportTime.isAfter(now.minusMinutes(2))) {
       throw new BadRequestException("Invalid export time: must be > 2 minutes ago");
@@ -284,12 +284,12 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA
   /**
    * Removes the TLD, if present, from a fully-qualified name.
    *
-   * <p>This would not work if a fully qualified host name in a different TLD were passed. But
+   * <p>This would not work if a fully qualified host name in a different TLD were passed. But we
-   * we only generate glue records for in-bailiwick name servers, meaning that the TLD will always
+   * only generate glue records for in-bailiwick name servers, meaning that the TLD will always
    * match.
    *
-   * If, for some unforeseen reason, the TLD is not present, indicate an error condition, so that
+   * <p>If, for some unforeseen reason, the TLD is not present, indicate an error condition, so that
-   * our process for comparing Datastore and DNS data will realize that something is amiss.
+   * our process for comparing SQL and DNS data will realize that something is amiss.
    */
   private static String stripTld(String fullyQualifiedName, String tld) {
     return fullyQualifiedName.endsWith(tld)

core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java

@@ -49,7 +49,7 @@ public abstract class DomainOrHostLookupCommand implements WhoisCommand {
     throw new WhoisException(now, SC_NOT_FOUND, errorPrefix + " not found.");
   }
 
-  /** Renders a response record, provided its successfully retrieved Datastore entity. */
+  /** Renders a response record, provided its successfully retrieved entity. */
   protected abstract Optional<WhoisResponse> getResponse(
       InternetDomainName domainName, DateTime now);
 }

core/src/main/java/google/registry/whois/WhoisResponseImpl.java

@@ -209,7 +209,7 @@ abstract class WhoisResponseImpl implements WhoisResponse {
     /** Returns raw text that should be appended to the end of ALL WHOIS responses. */
     E emitLastUpdated(DateTime timestamp) {
       // We are assuming that our WHOIS database is always completely up to date, since it's
-      // querying the live backend Datastore.
+      // querying the live backend database.
       stringBuilder
           .append(">>> Last update of WHOIS database: ")
           .append(UtcDateTimeAdapter.getFormattedString(timestamp))

core/src/main/resources/google/registry/beam/invoicing_pipeline_metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "Invoice and Detailed Reports Generation",
-  "description": "An Apache Beam batch pipeline that reads from a Datastore export and generate monthly invoice and detailed reports, saving them on GCS.",
+  "description": "An Apache Beam batch pipeline that generates monthly invoice and detailed reports, saving them on GCS.",
   "parameters": [
     {
       "name": "registryEnvironment",

core/src/main/resources/google/registry/beam/spec11/sql/domain_name_infos.sql

@@ -1,51 +0,0 @@
-#standardSQL
-  -- Copyright 2018 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.
-
-  -- This query gathers all Subdomains active within a given yearMonth
-  -- and emits a row containing its fully qualified domain name
-  -- [SLD].[TLD], the current registrar's name, and the current registrar's
-  -- email address.
-
-SELECT
-  domain.domainName AS domainName,
-  domain.__key__.name AS domainRepoId,
-  registrar.clientId AS registrarId,
-  COALESCE(registrar.emailAddress, '') AS registrarEmailAddress
-FROM ( (
-    SELECT
-      __key__,
-      domainName,
-      currentSponsorClientId,
-      creationTime
-    FROM
-      `%PROJECT_ID%.%DATASTORE_EXPORT_DATASET%.%DOMAIN_BASE_TABLE%`
-    WHERE
-      -- Only include active registrations
-      -- Registrations that are active (not deleted) will have null deletionTime
-      -- because END_OF_TIME is an invalid timestamp in standardSQL
-      (SAFE_CAST(deletionTime AS STRING) IS NULL
-        OR deletionTime > CURRENT_TIMESTAMP)) AS domain
-  JOIN (
-    SELECT
-      __key__.name AS clientId,
-      emailAddress
-    FROM
-      `%PROJECT_ID%.%DATASTORE_EXPORT_DATASET%.%REGISTRAR_TABLE%`
-    WHERE
-      type = 'REAL') AS registrar
-  ON
-    domain.currentSponsorClientId = registrar.clientId)
-ORDER BY
-  creationTime DESC

core/src/main/resources/google/registry/beam/spec11_pipeline_metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "Spec11 Report Generation",
-  "description": "An Apache Beam batch pipeline that reads from a Datastore export and generate Spec11 report for the month, saving it to both SQL and as a JSON file on GCS.",
+  "description": "An Apache Beam batch pipeline that generates Spec11 report for the month, saving it to both SQL and as a JSON file on GCS.",
   "parameters": [
     {
       "name": "registryEnvironment",

core/src/main/resources/google/registry/reporting/icann/sql/activity_report_aggregation.sql

@@ -1,97 +0,0 @@
-#standardSQL
-  -- 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.
-
-  -- This query pulls from all intermediary tables to create the activity
-  -- report csv, via a table transpose and sum over all activity report fields.
-
-SELECT
-  RealTlds.tld AS tld,
-  SUM(IF(metricName = 'operational-registrars', count, 0)) AS operational_registrars,
-  -- We use the Centralized Zone Data Service.
-  "CZDS" AS zfa_passwords,
-  SUM(IF(metricName = 'whois-43-queries', count, 0)) AS whois_43_queries,
-  SUM(IF(metricName = 'web-whois-queries', count, 0)) AS web_whois_queries,
-  -- We don't support searchable WHOIS.
-  0 AS searchable_whois_queries,
-  -- DNS queries for UDP/TCP are all assumed to be received/responded.
-  SUM(IF(metricName = 'dns-udp-queries', count, 0)) AS dns_udp_queries_received,
-  SUM(IF(metricName = 'dns-udp-queries', count, 0)) AS dns_udp_queries_responded,
-  SUM(IF(metricName = 'dns-tcp-queries', count, 0)) AS dns_tcp_queries_received,
-  SUM(IF(metricName = 'dns-tcp-queries', count, 0)) AS dns_tcp_queries_responded,
-  -- SRS metrics.
-  SUM(IF(metricName = 'srs-dom-check', count, 0)) AS srs_dom_check,
-  SUM(IF(metricName = 'srs-dom-create', count, 0)) AS srs_dom_create,
-  SUM(IF(metricName = 'srs-dom-delete', count, 0)) AS srs_dom_delete,
-  SUM(IF(metricName = 'srs-dom-info', count, 0)) AS srs_dom_info,
-  SUM(IF(metricName = 'srs-dom-renew', count, 0)) AS srs_dom_renew,
-  SUM(IF(metricName = 'srs-dom-rgp-restore-report', count, 0)) AS srs_dom_rgp_restore_report,
-  SUM(IF(metricName = 'srs-dom-rgp-restore-request', count, 0)) AS srs_dom_rgp_restore_request,
-  SUM(IF(metricName = 'srs-dom-transfer-approve', count, 0)) AS srs_dom_transfer_approve,
-  SUM(IF(metricName = 'srs-dom-transfer-cancel', count, 0)) AS srs_dom_transfer_cancel,
-  SUM(IF(metricName = 'srs-dom-transfer-query', count, 0)) AS srs_dom_transfer_query,
-  SUM(IF(metricName = 'srs-dom-transfer-reject', count, 0)) AS srs_dom_transfer_reject,
-  SUM(IF(metricName = 'srs-dom-transfer-request', count, 0)) AS srs_dom_transfer_request,
-  SUM(IF(metricName = 'srs-dom-update', count, 0)) AS srs_dom_update,
-  SUM(IF(metricName = 'srs-host-check', count, 0)) AS srs_host_check,
-  SUM(IF(metricName = 'srs-host-create', count, 0)) AS srs_host_create,
-  SUM(IF(metricName = 'srs-host-delete', count, 0)) AS srs_host_delete,
-  SUM(IF(metricName = 'srs-host-info', count, 0)) AS srs_host_info,
-  SUM(IF(metricName = 'srs-host-update', count, 0)) AS srs_host_update,
-  SUM(IF(metricName = 'srs-cont-check', count, 0)) AS srs_cont_check,
-  SUM(IF(metricName = 'srs-cont-create', count, 0)) AS srs_cont_create,
-  SUM(IF(metricName = 'srs-cont-delete', count, 0)) AS srs_cont_delete,
-  SUM(IF(metricName = 'srs-cont-info', count, 0)) AS srs_cont_info,
-  SUM(IF(metricName = 'srs-cont-transfer-approve', count, 0)) AS srs_cont_transfer_approve,
-  SUM(IF(metricName = 'srs-cont-transfer-cancel', count, 0)) AS srs_cont_transfer_cancel,
-  SUM(IF(metricName = 'srs-cont-transfer-query', count, 0)) AS srs_cont_transfer_query,
-  SUM(IF(metricName = 'srs-cont-transfer-reject', count, 0)) AS srs_cont_transfer_reject,
-  SUM(IF(metricName = 'srs-cont-transfer-request', count, 0)) AS srs_cont_transfer_request,
-  SUM(IF(metricName = 'srs-cont-update', count, 0)) AS srs_cont_update
-  -- Cross join a list of all TLDs against TLD-specific metrics and then
-  -- filter so that only metrics with that TLD or a NULL TLD are counted
-  -- towards a given TLD.
-FROM (
-SELECT tldStr AS tld
-FROM `%PROJECT_ID%.%DATASTORE_EXPORT_DATA_SET%.%REGISTRY_TABLE%`
-WHERE tldType = 'REAL'
-) as RealTlds
-CROSS JOIN(
-   SELECT
-    tld,
-    metricName,
-    count
-    FROM
-    (
-    -- BEGIN INTERMEDIARY DATA SOURCES --
-    -- Dummy data source to ensure all TLDs appear in report, even if
-    -- they have no recorded metrics for the month.
-    SELECT STRING(NULL) AS tld, STRING(NULL) AS metricName, 0 as count
-    UNION ALL
-    SELECT * FROM
-    `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%REGISTRAR_OPERATING_STATUS_TABLE%`
-    UNION ALL
-    SELECT * FROM
-    `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%DNS_COUNTS_TABLE%`
-    UNION ALL
-    SELECT * FROM
-    `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%EPP_METRICS_TABLE%`
-    UNION ALL
-    SELECT * FROM
-    `%PROJECT_ID%.%ICANN_REPORTING_DATA_SET%.%WHOIS_COUNTS_TABLE%`
-    -- END INTERMEDIARY DATA SOURCES --
-    )) AS TldMetrics
-WHERE RealTlds.tld = TldMetrics.tld OR TldMetrics.tld IS NULL
-GROUP BY tld
-ORDER BY tld

core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java

@@ -374,7 +374,6 @@ class InvoicingPipelineTest {
   }
 
   private static void setupCloudSql() {
-    // Populate billing events in Cloud SQL to match existing test data for Datastore
     persistNewRegistrar("NewRegistrar");
     persistNewRegistrar("TheRegistrar");
     Registrar registrar1 = persistNewRegistrar("theRegistrar");

core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java

@@ -75,9 +75,9 @@ import org.junit.jupiter.api.io.TempDir;
 /**
  * Unit tests for {@link Spec11Pipeline}.
  *
- * <p>Unfortunately there is no emulator for BigQuery like that for Datastore or App Engine.
+ * <p>Unfortunately there is no emulator for BigQuery, so we cannot fully test the pipeline but only
- * Therefore we cannot fully test the pipeline but only test the two separate sink IO functions,
+ * test the two separate sink IO functions, assuming that date is sourced correctly the {@code
- * assuming that date is sourcede correctly the {@code BigQueryIO}.
+ * BigQueryIO}.
  */
 class Spec11PipelineTest {
 
@@ -214,7 +214,7 @@ class Spec11PipelineTest {
   }
 
   @Test
-  void testSuccess_readFromCloudSql() throws Exception {
+  void testSuccess_readFromCloudSql() {
     setupCloudSql();
     PCollection<DomainNameInfo> domainNameInfos = Spec11Pipeline.readFromCloudSql(pipeline);
     PAssert.that(domainNameInfos).containsInAnyOrder(DOMAIN_NAME_INFOS);
@@ -310,7 +310,7 @@ class Spec11PipelineTest {
         new File(
             String.format(
                 "%s/icann/spec11/2020-01/SPEC11_MONTHLY_REPORT_2020-01-27",
-                reportingBucketUrl.getAbsolutePath().toString()));
+                reportingBucketUrl.getAbsolutePath()));
     return ImmutableList.copyOf(
         ResourceUtils.readResourceUtf8(resultFile.toURI().toURL()).split("\n"));
   }
@@ -335,7 +335,6 @@ class Spec11PipelineTest {
           return false;
         }
       }
-      ;
       return true;
     }
   }

core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java

@@ -67,7 +67,7 @@ class CheckedBigqueryTest {
   }
 
   @Test
-  void testSuccess_datastoreCreation() throws Exception {
+  void testSuccess_datasetCreation() throws Exception {
     checkedBigquery.ensureDataSetExists("Project-Id", "Dataset-Id");
 
     ArgumentCaptor<Dataset> datasetArg = ArgumentCaptor.forClass(Dataset.class);
@@ -80,7 +80,7 @@ class CheckedBigqueryTest {
   }
 
   @Test
-  void testSuccess_datastoreAndTableCreation() throws Exception {
+  void testSuccess_datasetAndTableCreation() throws Exception {
     checkedBigquery.ensureDataSetAndTableExist("Project-Id", "Dataset2", "Table2");
 
     ArgumentCaptor<Dataset> datasetArg = ArgumentCaptor.forClass(Dataset.class);

core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java

@@ -283,7 +283,7 @@ public class CloudDnsWriterTest {
     return recordSetBuilder.build();
   }
 
-  /** Returns a domain to be persisted in Datastore. */
+  /** Returns a domain to be persisted in the database. */
   private static Domain fakeDomain(
       String domainName, ImmutableSet<Host> nameservers, int numDsRecords) {
     ImmutableSet.Builder<DomainDsData> dsDataBuilder = new ImmutableSet.Builder<>();

core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java

@@ -790,7 +790,7 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
   @Test
   void testSuccess_thirtyDomains_restoreFees() throws Exception {
     // Note that 30 is more than 25, which is the maximum # of entity groups you can enlist in a
-    // single Datastore transaction (each Domain entity is in a separate entity group).
+    // single database transaction (each Domain entity is in a separate entity group).
     // It's also pretty common for registrars to send large domain checks.
     setEppInput("domain_check_fee_thirty_domains.xml");
     // example-00.tld won't exist and thus will not have a renew fee like the others.

core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java

@@ -148,7 +148,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Domain> {
                 .setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("2fooBAR")))
                 .build());
     // Set the superordinate domain of ns1.example.com to example.com. In reality, this would have
-    // happened in the flow that created it, but here we just overwrite it in Datastore.
+    // happened in the flow that created it, but here we just overwrite it in the database.
     host1 = persistResource(host1.asBuilder().setSuperordinateDomain(domain.createVKey()).build());
     // Create a subordinate host that is not delegated to by anyone.
     host3 =

core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java

@@ -306,7 +306,7 @@ class DomainTransferRequestFlowTest
         Stream.of(extraExpectedBillingEvents)
             .map(builder -> builder.setDomainHistory(historyEntryTransferRequest).build())
             .collect(toImmutableSet());
-    // Assert that the billing events we constructed above actually exist in Datastore.
+    // Assert that the billing events we constructed above actually exist in the database.
     ImmutableSet<BillingEvent> expectedBillingEvents =
         Streams.concat(
                 Stream.of(losingClientAutorenew, gainingClientAutorenew),

core/src/test/java/google/registry/model/domain/DomainTest.java

@@ -235,7 +235,7 @@ public class DomainTest {
   @Test
   void testPersistence() {
     // Note that this only verifies that the value stored under the foreign key is the same as that
-    // stored under the primary key ("domain" is the domain loaded from the datastore, not the
+    // stored under the primary key ("domain" is the domain loaded from the the database, not the
     // original domain object).
     assertThat(loadByForeignKey(Domain.class, domain.getForeignKey(), fakeClock.nowUtc()))
         .hasValue(domain);

core/src/test/java/google/registry/model/server/ServerSecretTest.java

@@ -36,7 +36,7 @@ public class ServerSecretTest extends EntityTestCase {
   }
 
   @Test
-  void testGet_bootstrapping_savesSecretToDatastore() {
+  void testGet_bootstrapping_savesSecret() {
     ServerSecret secret = ServerSecret.get();
     assertThat(secret).isNotNull();
     assertThat(loadByEntity(new ServerSecret())).isEqualTo(secret);

core/src/test/java/google/registry/persistence/transaction/ReplicaSimulatingJpaTransactionManager.java

@@ -104,11 +104,6 @@ public class ReplicaSimulatingJpaTransactionManager implements JpaTransactionMan
         });
   }
 
-  @Override
-  public <T> T transactWithoutBackup(Supplier<T> work) {
-    return transact(work);
-  }
-
   @Override
   public <T> T transactNoRetry(Supplier<T> work) {
     return transact(work);

core/src/test/java/google/registry/server/Fixture.java

@@ -36,7 +36,7 @@ import google.registry.testing.DatabaseHelper;
 import java.io.IOException;
 
 /**
- * Datastore fixtures for the development webserver.
+ * Database fixtures for the development webserver.
  *
  * <p><b>Warning:</b> These fixtures aren't really intended for unit tests, since they take upwards
  * of a second to load.
@@ -162,6 +162,6 @@ public enum Fixture {
     }
   };
 
-  /** Loads this fixture into Datastore. */
+  /** Loads this fixture into the database. */
   public abstract void load();
 }

core/src/test/java/google/registry/server/TestServer.java

@@ -45,8 +45,8 @@ import org.mortbay.jetty.servlet.ServletHolder;
 /**
  * HTTP server that serves static content and handles servlet requests in the calling thread.
  *
- * <p>Using this server is similar to to other server classes, in that it has {@link #start()} and
+ * <p>Using this server is similar to other server classes, in that it has {@link #start()} and
- * {@link #stop()} methods. However a {@link #process()} method was added, which is used to process
+ * {@link #stop()} methods. However, a {@link #process()} method was added, which is used to process
  * requests made to servlets (not static files) in the calling thread.
  *
  * <p><b>Note:</b> This server is intended for development purposes. For the love all that is good,
@@ -59,11 +59,6 @@ import org.mortbay.jetty.servlet.ServletHolder;
  * inside {@link ServletWrapperDelegatorServlet}. When requests come in, a {@link FutureTask} will
  * be sent back to this class using a {@link LinkedBlockingDeque} message queue. Those messages are
  * then consumed by the {@code process()} method.
- *
- * <p>The reason why this is necessary is because the App Engine local testing services (created by
- * {@code LocalServiceTestHelper}) only apply to a single thread (probably to allow multi-threaded
- * tests). So when Jetty creates random threads to handle requests, they won't have access to the
- * Datastore and other stuff.
  */
 public final class TestServer {
 

core/src/test/java/google/registry/testing/DatabaseHelper.java

@@ -396,10 +396,10 @@ public final class DatabaseHelper {
                     .collect(
                         toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().getValue())))
             .build();
-    // Since we used to persist a PremiumList to Datastore here, it is necessary to allocate an ID
+    // Since we used to persist a PremiumList here, it is necessary to allocate an ID here to
-    // here to prevent breaking some hard-coded flow tests. IDs in tests are allocated in a
+    // prevent breaking some hard-coded flow tests. IDs in tests are allocated in a strictly
-    // strictly increasing sequence, if we don't pad out the ID here, we would have to renumber
+    // increasing sequence, if we don't pad out the ID here, we would have to renumber hundreds of
-    // hundreds of unit tests.
+    // unit tests.
     allocateId();
     PremiumListDao.save(premiumList);
     maybeAdvanceClock();
@@ -837,12 +837,12 @@ public final class DatabaseHelper {
         .containsExactlyElementsIn(expected);
   }
 
-  /** Assert that the expected billing events are exactly the ones found in the fake Datastore. */
+  /** Assert that the expected billing events are exactly the ones found in test database. */
   public static void assertBillingEvents(BillingEvent... expected) {
     assertBillingEventsEqual(getBillingEvents(), asList(expected));
   }
 
-  /** Assert that the expected billing events set is exactly the one found in the fake Datastore. */
+  /** Assert that the expected billing events set is exactly the one found in test database. */
   public static void assertBillingEvents(Set<BillingEvent> expected) {
     assertBillingEventsEqual(getBillingEvents(), expected);
   }
@@ -1321,60 +1321,6 @@ public final class DatabaseHelper {
     return entity;
   }
 
-  /**
-   * Sets a DATASTORE_PRIMARY_NO_ASYNC state on the {@link DatabaseMigrationStateSchedule}.
-   *
-   * <p>In order to allow for tests to manipulate the clock how they need, we start the transitions
-   * one millisecond after the clock's current time (in case the clock's current value is
-   * START_OF_TIME). We then advance the clock one second so that we're in the
-   * DATASTORE_PRIMARY_READ_ONLY phase.
-   *
-   * <p>We must use the current time, otherwise the setting of the migration state will fail due to
-   * an invalid transition.
-   */
-  public static void setMigrationScheduleToDatastorePrimaryNoAsync(FakeClock fakeClock) {
-    DateTime now = fakeClock.nowUtc();
-    tm().transact(
-            () ->
-                DatabaseMigrationStateSchedule.set(
-                    ImmutableSortedMap.of(
-                        START_OF_TIME,
-                        MigrationState.DATASTORE_ONLY,
-                        now.plusMillis(1),
-                        MigrationState.DATASTORE_PRIMARY,
-                        now.plusMillis(2),
-                        MigrationState.DATASTORE_PRIMARY_NO_ASYNC)));
-    fakeClock.advanceBy(Duration.standardSeconds(1));
-  }
-
-  /**
-   * Sets a DATASTORE_PRIMARY_READ_ONLY state on the {@link DatabaseMigrationStateSchedule}.
-   *
-   * <p>In order to allow for tests to manipulate the clock how they need, we start the transitions
-   * one millisecond after the clock's current time (in case the clock's current value is
-   * START_OF_TIME). We then advance the clock one second so that we're in the
-   * DATASTORE_PRIMARY_READ_ONLY phase.
-   *
-   * <p>We must use the current time, otherwise the setting of the migration state will fail due to
-   * an invalid transition.
-   */
-  public static void setMigrationScheduleToDatastorePrimaryReadOnly(FakeClock fakeClock) {
-    DateTime now = fakeClock.nowUtc();
-    tm().transact(
-            () ->
-                DatabaseMigrationStateSchedule.set(
-                    ImmutableSortedMap.of(
-                        START_OF_TIME,
-                        MigrationState.DATASTORE_ONLY,
-                        now.plusMillis(1),
-                        MigrationState.DATASTORE_PRIMARY,
-                        now.plusMillis(2),
-                        MigrationState.DATASTORE_PRIMARY_NO_ASYNC,
-                        now.plusMillis(3),
-                        MigrationState.DATASTORE_PRIMARY_READ_ONLY)));
-    fakeClock.advanceBy(Duration.standardSeconds(1));
-  }
-
   /**
    * Sets a SQL_PRIMARY state on the {@link DatabaseMigrationStateSchedule}.
    *

core/src/test/java/google/registry/tools/AuthModuleTest.java

@@ -144,7 +144,7 @@ class AuthModuleTest {
   }
 
   private Credential getCredential() {
-    // Reconstruct the entire dependency graph, injecting FakeDatastoreFactory and credential
+    // Reconstruct the entire dependency graph, injecting FakeDataStoreFactory and credential
     // parameters.
     JacksonFactory jsonFactory = new JacksonFactory();
     GoogleClientSecrets clientSecrets = getSecrets();

core/src/test/java/google/registry/tools/CommandTestCase.java

@@ -167,12 +167,11 @@ public abstract class CommandTestCase<C extends Command> {
     return writeToNamedTmpFile("cert.pem", certificateFile);
   }
 
-  /** Reloads the given resource from Datastore. */
   <T> T reloadResource(T resource) {
     return tm().transact(() -> tm().loadByEntity(resource));
   }
 
-  /** Returns count of all poll messages in Datastore. */
+  /** Returns count of all poll messages. */
   int getPollMessageCount() {
     return tm().transact(() -> tm().loadAllOf(PollMessage.class).size());
   }

core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java

@@ -15,8 +15,6 @@
 package google.registry.tools;
 
 import static com.google.common.truth.Truth.assertThat;
-import static google.registry.model.tld.label.ReservationType.FULLY_BLOCKED;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.testing.TestDataHelper.loadFile;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -24,10 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import com.beust.jcommander.ParameterException;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
-import com.google.common.truth.Truth8;
 import google.registry.model.tld.label.ReservedList;
 import google.registry.model.tld.label.ReservedList.ReservedListEntry;
-import google.registry.model.tld.label.ReservedListDao;
 import java.io.File;
 import java.io.IOException;
 import org.joda.time.DateTime;
@@ -109,41 +105,4 @@ abstract class CreateOrUpdateReservedListCommandTestCase<
         .setReservedListMap(labelsToEntries)
         .build();
   }
-
-  ReservedList getCloudSqlReservedList(String name) {
-    return tm().transact(
-            () -> {
-              long revisionId =
-                  tm().query(
-                          "SELECT MAX(rl.revisionId) FROM ReservedList rl WHERE name = :name",
-                          Long.class)
-                      .setParameter("name", name)
-                      .getSingleResult();
-              return tm().query(
-                      "FROM ReservedList WHERE revisionId = :revisionId", ReservedList.class)
-                  .setParameter("revisionId", revisionId)
-                  .getSingleResult();
-            });
-  }
-
-  void verifyXnq9jyb4cInCloudSql() {
-    assertThat(ReservedListDao.checkExists("xn--q9jyb4c_common-reserved")).isTrue();
-    ReservedList persistedList = getCloudSqlReservedList("xn--q9jyb4c_common-reserved");
-    assertThat(persistedList.getName()).isEqualTo("xn--q9jyb4c_common-reserved");
-    assertThat(persistedList.getShouldPublish()).isTrue();
-    assertThat(persistedList.getReservedListEntries())
-        .containsExactly(
-            "baddies",
-            ReservedListEntry.create("baddies", FULLY_BLOCKED, ""),
-            "ford",
-            ReservedListEntry.create("ford", FULLY_BLOCKED, "random comment"));
-  }
-
-  void verifyXnq9jyb4cInDatastore() {
-    Truth8.assertThat(ReservedList.get("xn--q9jyb4c_common-reserved")).isPresent();
-    ReservedList reservedList = ReservedList.get("xn--q9jyb4c_common-reserved").get();
-    assertThat(reservedList.getReservedListEntries()).hasSize(2);
-    Truth8.assertThat(reservedList.getReservationInList("baddies")).hasValue(FULLY_BLOCKED);
-    Truth8.assertThat(reservedList.getReservationInList("ford")).hasValue(FULLY_BLOCKED);
-  }
 }

core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java

@@ -168,13 +168,6 @@ class CreateReservedListCommandTest
     runNameTestExpectedFailure("soy_$oy", INVALID_FORMAT_ERROR_MESSAGE);
   }
 
-  @Test
-  void testSaveToCloudSql_succeeds() throws Exception {
-    runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath);
-    verifyXnq9jyb4cInDatastore();
-    verifyXnq9jyb4cInCloudSql();
-  }
-
   private void runNameTestExpectedFailure(String name, String expectedErrorMsg) {
     IllegalArgumentException thrown =
         assertThrows(

core/src/test/java/google/registry/tools/DomainLockUtilsTest.java

@@ -454,7 +454,7 @@ public final class DomainLockUtilsTest {
             () -> domainLockUtils.verifyAndApplyLock(verificationCode, false));
     assertThat(thrown).hasMessageThat().isEqualTo("Domain example.tld is already locked");
 
-    // Failure during Datastore portion shouldn't affect the SQL object
+    // Failure during the lock acquisition portion shouldn't affect the SQL object
     RegistryLock afterAction = getRegistryLockByVerificationCode(lock.getVerificationCode()).get();
     assertThat(afterAction).isEqualTo(lock);
     assertNoDomainChanges();

core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java

@@ -24,11 +24,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import google.registry.model.tld.label.ReservedList;
-import google.registry.model.tld.label.ReservedList.ReservedListEntry;
-import google.registry.model.tld.label.ReservedListDao;
 import java.io.File;
 import java.nio.file.Paths;
 import org.junit.jupiter.api.BeforeEach;
@@ -53,16 +50,6 @@ class UpdateReservedListCommandTest
             .build());
   }
 
-  private void populateInitialReservedListInCloudSql(boolean shouldPublish) {
-    ReservedListDao.save(
-        createCloudSqlReservedList(
-            "xn--q9jyb4c_common-reserved",
-            fakeClock.nowUtc(),
-            shouldPublish,
-            ImmutableMap.of(
-                "helicopter", ReservedListEntry.create("helicopter", FULLY_BLOCKED, ""))));
-  }
-
   @Test
   void testSuccess() throws Exception {
     runSuccessfulUpdateTest("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath);
@@ -107,29 +94,10 @@ class UpdateReservedListCommandTest
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
-            () ->
+            () -> runCommandForced("--name=xn--q9jyb4c_poobah", "--input=" + reservedTermsPath));
-                runCommand("--force", "--name=xn--q9jyb4c_poobah", "--input=" + reservedTermsPath));
     assertThat(thrown).hasMessageThat().contains(errorMessage);
   }
 
-  @Test
-  void testSaveToCloudSql_succeeds() throws Exception {
-    populateInitialReservedListInCloudSql(true);
-    runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath);
-    verifyXnq9jyb4cInDatastore();
-    verifyXnq9jyb4cInCloudSql();
-  }
-
-  @Test
-  void testSaveToCloudSql_succeedsEvenPreviousListNotExist() throws Exception {
-    // Note that, during the dual-write phase, we always save the reserved list to Cloud SQL without
-    // checking if there is a list with same name. This is to backfill the existing list in Cloud
-    // Datastore when we update it.
-    runCommandForced("--name=xn--q9jyb4c_common-reserved", "--input=" + reservedTermsPath);
-    verifyXnq9jyb4cInDatastore();
-    assertThat(ReservedListDao.checkExists("xn--q9jyb4c_common-reserved")).isTrue();
-  }
-
   @Test
   void testSuccess_noChanges() throws Exception {
     File reservedTermsFile = tmpDir.resolve("xn--q9jyb4c_common-reserved.txt").toFile();

core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java

@@ -254,13 +254,13 @@ class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase {
     // Set the user to only have the current role for this registrar
     action.registrarAccessor =
         AuthenticatedRegistrarAccessor.createForTesting(ImmutableSetMultimap.of(CLIENT_ID, role));
-    // Load the registrar as it is currently in datastore, and make sure the requested update will
+    // Load the registrar as it is currently in the database, and make sure the requested update
-    // actually change it
+    // will actually change it
     Registrar registrar = loadRegistrar(CLIENT_ID);
     assertThat(getter.apply(registrar)).isNotEqualTo(newValue);
 
     // Call the action to perform the requested update, then load the "updated" registrar and
-    // return the "datastore" registrar to its original state (for the next iteration)
+    // return the "database" registrar to its original state (for the next iteration)
     Map<String, Object> response =
         action.handleJsonRequest(
             ImmutableMap.of(
@@ -309,8 +309,8 @@ class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase {
             .build();
     action.registrarAccessor =
         AuthenticatedRegistrarAccessor.createForTesting(accessMap);
-    // Load the registrar as it is currently in datastore, and make sure the requested update will
+    // Load the registrar as it is currently in the database, and make sure the requested update
-    // actually change it
+    // will actually change it
     Registrar registrar = loadRegistrar(CLIENT_ID);
     assertThat(getter.apply(registrar)).isNotEqualTo(newValue);
 

core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java

@@ -212,8 +212,8 @@ final class RegistryLockVerifyActionTest {
 
   @Test
   void testFailure_doesNotChangeLockObject() {
-    // A failure when performing Datastore actions means that no actions should be taken in the
+    // A failure when performing actions means that no actions should be taken in the Cloud SQL
-    // Cloud SQL RegistryLock object
+    // RegistryLock object
     RegistryLock lock = createLock();
     saveRegistryLock(lock);
     // reload the lock to pick up creation time
@@ -221,7 +221,7 @@ final class RegistryLockVerifyActionTest {
     fakeClock.advanceOneMilli();
     domain = persistResource(domain.asBuilder().setStatusValues(REGISTRY_LOCK_STATUSES).build());
     action.run();
-    // we would have failed during the Datastore segment of the action
+    // we would have failed during the lock acquisition segment of the action
     assertThat(response.getPayload()).contains("Failed: Domain example.tld is already locked");
 
     // verify that the changes to the SQL object were rolled back

core/src/test/java/google/registry/whois/WhoisActionTest.java

@@ -284,7 +284,7 @@ public class WhoisActionTest {
   }
 
   @Test
-  void testRun_domainFlaggedAsDeletedInDatastore_isConsideredNotFound() {
+  void testRun_domainFlaggedAsDeletedInDatabase_isConsideredNotFound() {
     Registrar registrar;
     persistResource(
         makeDomain(
@@ -432,7 +432,7 @@ public class WhoisActionTest {
   }
 
   @Test
-  void testRun_nameserverFlaggedAsDeletedInDatastore_doesntGetLeaked() {
+  void testRun_nameserverFlaggedAsDeletedInDatabase_doesntGetLeaked() {
     persistResource(
         FullFieldsTestEntityHelper.makeHost("ns1.cat.lol", "1.2.3.4")
             .asBuilder()

core/src/test/java/google/registry/whois/WhoisHttpActionTest.java

@@ -165,7 +165,7 @@ class WhoisHttpActionTest {
   }
 
   @Test
-  void testRun_wickedLineFeedForgeryInDatastore_crlfSubstitutedWithSpace() {
+  void testRun_wickedLineFeedForgeryInDatabase_crlfSubstitutedWithSpace() {
     Contact trl =
         FullFieldsTestEntityHelper.makeContact("5372808-TRL", "Eric Schmidt", "bog@cat.みんな");
     trl =

core/src/test/resources/google/registry/beam/billing/billing_events_test.sql

@@ -1,100 +0,0 @@
-#standardSQL
-  -- 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.
-
-  -- This query gathers all non-canceled billing events for a given
-  -- YEAR_MONTH in yyyy-MM format.
-
-SELECT
-  __key__.id AS id,
-  billingTime,
-  eventTime,
-  BillingEvent.clientId AS registrarId,
-  RegistrarData.accountId AS billingId,
-  RegistrarData.poNumber AS poNumber,
-  tld,
-  reason as action,
-  targetId as domain,
-  BillingEvent.domainRepoId as repositoryId,
-  IFNULL(periodYears, 0) as years,
-  BillingEvent.currency AS currency,
-  BillingEvent.amount as amount,
-  -- We'll strip out non-useful flags downstream
-  ARRAY_TO_STRING(flags, " ") AS flags
-FROM (
-  SELECT
-    *,
-    -- We store cost as "CURRENCY AMOUNT" such as "JPY 800" or "USD 20.00"
-    SPLIT(cost, ' ')[OFFSET(0)] AS currency,
-    SPLIT(cost, ' ')[OFFSET(1)] AS amount,
-    -- Extract everything after the first dot in the domain as the TLD
-    REGEXP_EXTRACT(targetId, r'[.](.+)') AS tld,
-    REGEXP_REPLACE(SPLIT(__key__.path, ', ')[OFFSET(1)], '"', '')
-        AS domainRepoId,
-    COALESCE(cancellationMatchingBillingEvent.path,
-        __key__.path) AS cancellationMatchingPath
-  FROM
-    `my-project-id.latest_datastore_export.OneTime`
-    -- Only include real TLDs (filter prober data)
-  WHERE
-    REGEXP_EXTRACT(targetId, r'[.](.+)') IN (
-    SELECT
-      tldStr
-    FROM
-      `my-project-id.latest_datastore_export.Registry`
-    WHERE
-      invoicingEnabled IS TRUE) ) AS BillingEvent
-  -- Gather billing ID from registrar table
-  -- This is a 'JOIN' as opposed to 'LEFT JOIN' to filter out
-  -- non-billable registrars
-JOIN (
-  SELECT
-    __key__.name AS clientId,
-    billingIdentifier,
-    IFNULL(poNumber, '') AS poNumber,
-    r.billingAccountMap.currency[SAFE_OFFSET(index)] AS currency,
-    r.billingAccountMap.accountId[SAFE_OFFSET(index)] AS accountId
-  FROM
-    `my-project-id.latest_datastore_export.Registrar` AS r,
-    UNNEST(GENERATE_ARRAY(0, ARRAY_LENGTH(r.billingAccountMap.currency) - 1))
-        AS index
-  WHERE billingAccountMap IS NOT NULL
-  AND type = 'REAL') AS RegistrarData
-ON
-  BillingEvent.clientId = RegistrarData.clientId
-  AND BillingEvent.currency = RegistrarData.currency
-  -- Gather cancellations
-LEFT JOIN (
-  SELECT __key__.id AS cancellationId,
-  COALESCE(refOneTime.path, refRecurring.path) AS cancelledEventPath,
-  eventTime as cancellationTime,
-  billingTime as cancellationBillingTime
-  FROM
-  (SELECT
-      *,
-      -- Count everything after first dot as TLD (to support multi-part TLDs).
-      REGEXP_EXTRACT(targetId, r'[.](.+)') AS tld
-    FROM
-      `my-project-id.latest_datastore_export.Cancellation`)
-) AS Cancellation
-ON BillingEvent.cancellationMatchingPath = Cancellation.cancelledEventPath
-AND BillingEvent.billingTime = Cancellation.cancellationBillingTime
-WHERE billingTime BETWEEN TIMESTAMP('2017-10-01 00:00:00.000000')
-  AND TIMESTAMP('2017-10-31 23:59:59.999999')
--- Filter out canceled events
-AND Cancellation.cancellationId IS NULL
-ORDER BY
-  billingTime DESC,
-  id,
-  tld

core/src/test/resources/google/registry/export/backup_kinds.txt

@@ -1,17 +0,0 @@
-AllocationToken
-Cancellation
-Contact
-Domain
-EntityGroupRoot
-EppResourceIndex
-ForeignKeyContactIndex
-ForeignKeyDomainIndex
-ForeignKeyHostIndex
-HistoryEntry
-Host
-Modification
-OneTime
-PollMessage
-RdeRevision
-Recurring
-Registrar

core/src/test/resources/google/registry/export/backup_operation_in_progress.json

@@ -1,18 +0,0 @@
-{
-  "name": "projects/registry-project-id/operations/ASAzNjMwOTEyNjUJ",
-  "metadata": {
-    "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata",
-    "common": {
-      "startTime": "2014-08-01T01:02:03Z",
-      "operationType": "EXPORT_ENTITIES",
-      "state": "PROCESSING"
-    },
-    "entityFilter": {
-      "kinds": [
-        "one",
-        "two"
-      ]
-    },
-    "outputUrlPrefix": "gs://registry-project-id-datastore-export-test/2014-08-01T01:02:03_99364"
-  }
-}

core/src/test/resources/google/registry/export/backup_operation_success.json

@@ -1,20 +0,0 @@
-{
-  "name": "projects/registry-project-id/operations/ASAzNjMwOTEyNjUJ",
-  "metadata": {
-    "@type": "type.googleapis.com/google.datastore.admin.v1.ExportEntitiesMetadata",
-    "common": {
-      "startTime": "2014-08-01T01:02:03Z",
-      "endTime": "2014-08-01T01:32:03Z",
-      "operationType": "EXPORT_ENTITIES",
-      "state": "SUCCESSFUL"
-    },
-    "entityFilter": {
-      "kinds": [
-        "one",
-        "two"
-      ]
-    },
-    "outputUrlPrefix": "gs://registry-project-id-datastore-export-test/2014-08-01T01:02:03_99364"
-  },
-  "done": true
-}

core/src/test/resources/google/registry/export/crosstld_kinds.txt

@@ -1,2 +0,0 @@
-Registrar
-ServerSecret