Remove straggling JarKeyring link and sort MOE-added imports

Followups from []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132564245
This commit is contained in:
nickfelt 2016-09-08 09:31:06 -07:00 committed by Ben McIlwain
parent a63921350b
commit e478fd09fb
4 changed files with 8 additions and 8 deletions

View file

@ -24,8 +24,8 @@ import google.registry.gcs.GcsServiceModule;
import google.registry.groups.DirectoryModule; import google.registry.groups.DirectoryModule;
import google.registry.groups.GroupsModule; import google.registry.groups.GroupsModule;
import google.registry.groups.GroupssettingsModule; import google.registry.groups.GroupssettingsModule;
import google.registry.keyring.api.KeyModule;
import google.registry.keyring.api.DummyKeyringModule; import google.registry.keyring.api.DummyKeyringModule;
import google.registry.keyring.api.KeyModule;
import google.registry.monitoring.metrics.MetricReporter; import google.registry.monitoring.metrics.MetricReporter;
import google.registry.monitoring.whitebox.StackdriverModule; import google.registry.monitoring.whitebox.StackdriverModule;
import google.registry.rde.JSchModule; import google.registry.rde.JSchModule;
@ -52,6 +52,7 @@ import javax.inject.Singleton;
DatastoreServiceModule.class, DatastoreServiceModule.class,
DirectoryModule.class, DirectoryModule.class,
DriveModule.class, DriveModule.class,
DummyKeyringModule.class,
GcsServiceModule.class, GcsServiceModule.class,
GoogleCredentialModule.class, GoogleCredentialModule.class,
GroupsModule.class, GroupsModule.class,
@ -68,7 +69,6 @@ import javax.inject.Singleton;
UrlFetchTransportModule.class, UrlFetchTransportModule.class,
UseAppIdentityCredentialForGoogleApisModule.class, UseAppIdentityCredentialForGoogleApisModule.class,
VoidDnsWriterModule.class, VoidDnsWriterModule.class,
DummyKeyringModule.class,
}) })
interface BackendComponent { interface BackendComponent {
BackendRequestComponent startRequest(RequestModule requestModule); BackendRequestComponent startRequest(RequestModule requestModule);

View file

@ -17,8 +17,8 @@ package google.registry.module.frontend;
import dagger.Component; import dagger.Component;
import google.registry.braintree.BraintreeModule; import google.registry.braintree.BraintreeModule;
import google.registry.config.ConfigModule; import google.registry.config.ConfigModule;
import google.registry.keyring.api.KeyModule;
import google.registry.keyring.api.DummyKeyringModule; import google.registry.keyring.api.DummyKeyringModule;
import google.registry.keyring.api.KeyModule;
import google.registry.monitoring.metrics.MetricReporter; import google.registry.monitoring.metrics.MetricReporter;
import google.registry.monitoring.whitebox.StackdriverModule; import google.registry.monitoring.whitebox.StackdriverModule;
import google.registry.request.Modules.AppIdentityCredentialModule; import google.registry.request.Modules.AppIdentityCredentialModule;
@ -40,6 +40,7 @@ import javax.inject.Singleton;
BraintreeModule.class, BraintreeModule.class,
ConfigModule.class, ConfigModule.class,
ConsoleConfigModule.class, ConsoleConfigModule.class,
DummyKeyringModule.class,
FrontendMetricsModule.class, FrontendMetricsModule.class,
Jackson2Module.class, Jackson2Module.class,
KeyModule.class, KeyModule.class,
@ -49,7 +50,6 @@ import javax.inject.Singleton;
UrlFetchTransportModule.class, UrlFetchTransportModule.class,
UseAppIdentityCredentialForGoogleApisModule.class, UseAppIdentityCredentialForGoogleApisModule.class,
UserServiceModule.class, UserServiceModule.class,
DummyKeyringModule.class,
}) })
interface FrontendComponent { interface FrontendComponent {
FrontendRequestComponent startRequest(RequestModule requestModule); FrontendRequestComponent startRequest(RequestModule requestModule);

View file

@ -21,8 +21,8 @@ import google.registry.gcs.GcsServiceModule;
import google.registry.groups.DirectoryModule; import google.registry.groups.DirectoryModule;
import google.registry.groups.GroupsModule; import google.registry.groups.GroupsModule;
import google.registry.groups.GroupssettingsModule; import google.registry.groups.GroupssettingsModule;
import google.registry.keyring.api.KeyModule;
import google.registry.keyring.api.DummyKeyringModule; import google.registry.keyring.api.DummyKeyringModule;
import google.registry.keyring.api.KeyModule;
import google.registry.request.Modules.AppIdentityCredentialModule; import google.registry.request.Modules.AppIdentityCredentialModule;
import google.registry.request.Modules.DatastoreServiceModule; import google.registry.request.Modules.DatastoreServiceModule;
import google.registry.request.Modules.GoogleCredentialModule; import google.registry.request.Modules.GoogleCredentialModule;
@ -44,6 +44,7 @@ import javax.inject.Singleton;
DatastoreServiceModule.class, DatastoreServiceModule.class,
DirectoryModule.class, DirectoryModule.class,
DriveModule.class, DriveModule.class,
DummyKeyringModule.class,
GcsServiceModule.class, GcsServiceModule.class,
GoogleCredentialModule.class, GoogleCredentialModule.class,
GroupsModule.class, GroupsModule.class,
@ -55,7 +56,6 @@ import javax.inject.Singleton;
UseAppIdentityCredentialForGoogleApisModule.class, UseAppIdentityCredentialForGoogleApisModule.class,
SystemClockModule.class, SystemClockModule.class,
SystemSleeperModule.class, SystemSleeperModule.class,
DummyKeyringModule.class,
}) })
interface ToolsComponent { interface ToolsComponent {
ToolsRequestComponent startRequest(RequestModule requestModule); ToolsRequestComponent startRequest(RequestModule requestModule);

View file

@ -19,8 +19,8 @@ import google.registry.config.ConfigModule;
import google.registry.dns.writer.VoidDnsWriterModule; import google.registry.dns.writer.VoidDnsWriterModule;
import google.registry.dns.writer.clouddns.CloudDnsModule; import google.registry.dns.writer.clouddns.CloudDnsModule;
import google.registry.dns.writer.dnsupdate.DnsUpdateWriterModule; import google.registry.dns.writer.dnsupdate.DnsUpdateWriterModule;
import google.registry.keyring.api.KeyModule;
import google.registry.keyring.api.DummyKeyringModule; import google.registry.keyring.api.DummyKeyringModule;
import google.registry.keyring.api.KeyModule;
import google.registry.request.Modules.DatastoreServiceModule; import google.registry.request.Modules.DatastoreServiceModule;
import google.registry.request.Modules.Jackson2Module; import google.registry.request.Modules.Jackson2Module;
import google.registry.request.Modules.URLFetchServiceModule; import google.registry.request.Modules.URLFetchServiceModule;
@ -38,13 +38,13 @@ import google.registry.util.SystemClock.SystemClockModule;
DatastoreServiceModule.class, DatastoreServiceModule.class,
CloudDnsModule.class, CloudDnsModule.class,
DnsUpdateWriterModule.class, DnsUpdateWriterModule.class,
DummyKeyringModule.class,
Jackson2Module.class, Jackson2Module.class,
KeyModule.class, KeyModule.class,
RegistryToolModule.class, RegistryToolModule.class,
SystemClockModule.class, SystemClockModule.class,
URLFetchServiceModule.class, URLFetchServiceModule.class,
VoidDnsWriterModule.class, VoidDnsWriterModule.class,
DummyKeyringModule.class,
} }
) )
interface RegistryToolComponent { interface RegistryToolComponent {