Fix the build due to jackson-core incompatibility (#2085)

It was only called in one place (in actual production code), and it was just
slightly obscuring the fact that re-saves can be scheduled for multiple points
in the future in a way that wasn't amazingly helpful to understanding of the
system logic at the callsite.

core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java

@@ -50,12 +50,6 @@ public final class AsyncTaskEnqueuer {
     this.cloudTasksUtils = cloudTasksUtils;
   }
 
-  /** Enqueues a task to asynchronously re-save an entity at some point in the future. */
-  public void enqueueAsyncResave(
-      VKey<? extends EppResource> entityToResave, DateTime now, DateTime whenToResave) {
-    enqueueAsyncResave(entityToResave, now, ImmutableSortedSet.of(whenToResave));
-  }
-
   /**
    * Enqueues a task to asynchronously re-save an entity at some point(s) in the future.
    *

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

@@ -38,6 +38,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
 import google.registry.batch.AsyncTaskEnqueuer;
 import google.registry.flows.EppException;
 import google.registry.flows.ExtensionManager;
@@ -286,7 +287,8 @@ public final class DomainTransferRequestFlow implements TransactionalFlow {
             .build();
     DomainHistory domainHistory = buildDomainHistory(newDomain, tld, now, period);
 
-    asyncTaskEnqueuer.enqueueAsyncResave(newDomain.createVKey(), now, automaticTransferTime);
+    asyncTaskEnqueuer.enqueueAsyncResave(
+        newDomain.createVKey(), now, ImmutableSortedSet.of(automaticTransferTime));
     tm().putAll(
             new ImmutableSet.Builder<>()
                 .add(newDomain, domainHistory, requestPollMessage)

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

@@ -58,7 +58,8 @@ SELECT
   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
+  SUM(IF(metricName = 'srs-cont-update', count, 0)) AS srs_cont_update,
+  SUM(IF(metricName = 'rdap-queries', count, 0)) AS rdap_queries
   -- 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.

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

@@ -56,7 +56,7 @@ FROM (
             -- should have negligible impact as the edge cage happens very rarely, more specifically
             -- when a cancellation happens during grace period by a registrar other than the the
             -- owning one. All the numbers here should be positive to pass ICANN validation.
-            MAX(report_amount, 0) AS amount,
+            GREATEST(report_amount, 0) AS amount,
             reporting_time AS reportingTime
             FROM EXTERNAL_QUERY("projects/%PROJECT_ID%/locations/us/connections/%PROJECT_ID%-sql",
             ''' SELECT history_type, history_other_registrar_id, history_registrar_id, domain_repo_id, history_revision_id FROM "DomainHistory";''') AS dh

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

@@ -23,6 +23,7 @@ SELECT
   CASE
     WHEN requestPath = '/_dr/whois' THEN 'whois-43-queries'
     WHEN SUBSTR(requestPath, 0, 7) = '/whois/' THEN 'web-whois-queries'
+    WHEN SUBSTR(requestPath, 0, 6) = '/rdap/' THEN 'rdap-queries'
   END AS metricName,
   COUNT(requestPath) AS count
 FROM

core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java

@@ -69,7 +69,7 @@ public class AsyncTaskEnqueuerTest {
   void test_enqueueAsyncResave_success() {
     Contact contact = persistActiveContact("jd23456");
     asyncTaskEnqueuer.enqueueAsyncResave(
-        contact.createVKey(), clock.nowUtc(), clock.nowUtc().plusDays(5));
+        contact.createVKey(), clock.nowUtc(), ImmutableSortedSet.of(clock.nowUtc().plusDays(5)));
     cloudTasksHelper.assertTasksEnqueued(
         QUEUE_ASYNC_ACTIONS,
         new CloudTasksHelper.TaskMatcher()
@@ -108,7 +108,7 @@ public class AsyncTaskEnqueuerTest {
   void test_enqueueAsyncResave_ignoresTasksTooFarIntoFuture() {
     Contact contact = persistActiveContact("jd23456");
     asyncTaskEnqueuer.enqueueAsyncResave(
-        contact.createVKey(), clock.nowUtc(), clock.nowUtc().plusDays(31));
+        contact.createVKey(), clock.nowUtc(), ImmutableSortedSet.of(clock.nowUtc().plusDays(31)));
     cloudTasksHelper.assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
     assertLogMessage(logHandler, Level.INFO, "Ignoring async re-save");
   }

core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test_cloud_sql.sql

@@ -58,7 +58,8 @@ SELECT
   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
+  SUM(IF(metricName = 'srs-cont-update', count, 0)) AS srs_cont_update,
+  SUM(IF(metricName = 'rdap-queries', count, 0)) AS rdap_queries
   -- 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.

core/src/test/resources/google/registry/reporting/icann/transaction_counts_test_cloud_sql.sql

@@ -56,7 +56,7 @@ FROM (
             -- should have negligible impact as the edge cage happens very rarely, more specifically
             -- when a cancellation happens during grace period by a registrar other than the the
             -- owning one. All the numbers here should be positive to pass ICANN validation.
-            MAX(report_amount, 0) AS amount,
+            GREATEST(report_amount, 0) AS amount,
             reporting_time AS reportingTime
             FROM EXTERNAL_QUERY("projects/domain-registry-alpha/locations/us/connections/domain-registry-alpha-sql",
             ''' SELECT history_type, history_other_registrar_id, history_registrar_id, domain_repo_id, history_revision_id FROM "DomainHistory";''') AS dh

core/src/test/resources/google/registry/reporting/icann/whois_counts_test_cloud_sql.sql

@@ -23,6 +23,7 @@ SELECT
   CASE
     WHEN requestPath = '/_dr/whois' THEN 'whois-43-queries'
     WHEN SUBSTR(requestPath, 0, 7) = '/whois/' THEN 'web-whois-queries'
+    WHEN SUBSTR(requestPath, 0, 6) = '/rdap/' THEN 'rdap-queries'
   END AS metricName,
   COUNT(requestPath) AS count
 FROM

java_common.gradle

@@ -70,6 +70,27 @@ configurations {
   }
 }
 
+// Custom resolution strategy to get around tricky dependency issues.
+configurations.all {
+  // jackson-core is a transitive dependency that we cannot explicity specify
+  // versions for, without triggering linter alerts. Even though the lockfiles
+  // lock it to a lower version, Gradle will first try to resolve the
+  // dependency tree based on what is available in the Maven repo before
+  // applying any dependency locks. The newer version (v2.15) of jackson-core
+  // results in a build failure for pre-7.6 Gradle versions during that stage.
+  // This custom resolution strategy will modify the dependency tree as it was
+  // being built and prevent Gradle from even trying v2.15.
+  // See: https://github.com/FasterXML/jackson-core/issues/955
+  // TODO: Remove the custom stragegy after we upgrade to Gradle 7.6+.
+  resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+    if (details.requested.group == 'com.fasterxml.jackson.core'
+            && details.requested.name == 'jackson-core'
+            && details.requested.version.startsWith('2.15')) {
+      details.useVersion '2.14.2'
+    }
+  }
+}
+
 dependencies {
     // compatibility with Java 8
     errorprone("com.google.errorprone:error_prone_core:2.3.4")