Small fixes for orphan glue cleanup []

Moving to tools module for consistency.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130435371

java/google/registry/env/common/backend/WEB-INF/web.xml

@@ -141,12 +141,6 @@
     <url-pattern>/_dr/task/loadSnapshot</url-pattern>
   </servlet-mapping>
 
-  <!-- Refreshes all active domains in DNS -->
-  <servlet-mapping>
-    <servlet-name>backend-servlet</servlet-name>
-    <url-pattern>/_dr/task/refreshAllDomains</url-pattern>
-  </servlet-mapping>
-
   <!-- Updates a view to point at a certain snapshot in BigQuery. -->
   <servlet-mapping>
     <servlet-name>backend-servlet</servlet-name>

java/google/registry/env/common/tools/WEB-INF/web.xml

@@ -123,6 +123,12 @@
     <url-pattern>/_ah/pipeline/*</url-pattern>
   </servlet-mapping>
 
+  <!-- Refreshes all active domains in DNS -->
+  <servlet-mapping>
+    <servlet-name>tools-servlet</servlet-name>
+    <url-pattern>/_dr/task/refreshAllDomains</url-pattern>
+  </servlet-mapping>
+
   <!-- Registrar detail report publishing action. -->
   <servlet-mapping>
     <servlet-name>tools-servlet</servlet-name>

java/google/registry/module/backend/BUILD

@@ -41,7 +41,6 @@ java_library(
         "//java/google/registry/request:modules",
         "//java/google/registry/tmch",
         "//java/google/registry/util",
-        "//java/google/registry/tools/server/javascrap",
     ],
 )
 

java/google/registry/module/backend/BackendRequestComponent.java

@@ -62,7 +62,6 @@ import google.registry.tmch.TmchCrlAction;
 import google.registry.tmch.TmchDnlAction;
 import google.registry.tmch.TmchModule;
 import google.registry.tmch.TmchSmdrlAction;
-import google.registry.tools.server.javascrap.RefreshAllDomainsAction;
 
 /** Dagger component with per-request lifetime for "backend" App Engine module. */
 @RequestScope
@@ -107,7 +106,6 @@ interface BackendRequestComponent {
   RdeStagingAction rdeStagingAction();
   RdeUploadAction rdeUploadAction();
   RdeReporter rdeReporter();
-  RefreshAllDomainsAction refreshAllDomainsAction();
   RefreshDnsAction refreshDnsAction();
   RestoreCommitLogsAction restoreCommitLogsAction();
   SyncGroupMembersAction syncGroupMembersAction();

java/google/registry/module/tools/ToolsRequestComponent.java

@@ -43,6 +43,7 @@ import google.registry.tools.server.UpdatePremiumListAction;
 import google.registry.tools.server.VerifyOteAction;
 import google.registry.tools.server.javascrap.BackfillAutorenewBillingFlagAction;
 import google.registry.tools.server.javascrap.CountRecurringBillingEventsAction;
+import google.registry.tools.server.javascrap.RefreshAllDomainsAction;
 
 /** Dagger component with per-request lifetime for "tools" App Engine module. */
 @RequestScope
@@ -74,6 +75,7 @@ interface ToolsRequestComponent {
   ListTldsAction listTldsAction();
   LoadTestAction loadTestAction();
   PublishDetailReportAction publishDetailReportAction();
+  RefreshAllDomainsAction refreshAllDomainsAction();
   ResaveAllEppResourcesAction resaveAllEppResourcesAction();
   UpdatePremiumListAction updatePremiumListAction();
   VerifyOteAction verifyOteAction();

java/google/registry/tools/server/javascrap/RefreshAllDomainsAction.java

@@ -30,13 +30,13 @@ import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
-/** A mapreduce that runs publishHost() on all active domains. */
+/** A mapreduce that enqueues publish tasks on all active domains. */
 @Action(path = "/_dr/task/refreshAllDomains")
 public class RefreshAllDomainsAction implements Runnable {
 
   private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
 
-  static DnsQueue dnsQueue = DnsQueue.create();
+  private static DnsQueue dnsQueue = DnsQueue.create();
 
   @Inject MapreduceRunner mrRunner;
   @Inject Response response;
@@ -48,7 +48,7 @@ public class RefreshAllDomainsAction implements Runnable {
         createJobPath(
             mrRunner
                 .setJobName("Refresh all domains")
-                .setModuleName("backend")
+                .setModuleName("tools")
                 .setDefaultMapShards(10)
                 .runMapOnly(
                     new RefreshAllDomainsActionMapper(),
@@ -61,8 +61,8 @@ public class RefreshAllDomainsAction implements Runnable {
     private static final long serialVersionUID = 1356876487351666133L;
 
     @Override
-    public final void map(final DomainResource domain) {
-      final String domainName = domain.getFullyQualifiedDomainName();
+    public void map(final DomainResource domain) {
+      String domainName = domain.getFullyQualifiedDomainName();
       if (EppResourceUtils.isActive(domain, DateTime.now(DateTimeZone.UTC))) {
         try {
           dnsQueue.addDomainRefreshTask(domainName);