mirror of
https://github.com/google/nomulus.git
synced 2025-05-01 12:37:52 +02:00
f742ac8056
This refactors RequestHandler so that it handles the construction of the request component itself, rather than being handed a pre-built request component instance constructed by the invoking servlet. The motivation for this change is so that RequestHandler can be extended in future CLs to compute authentication results, and can provide those results as an available binding in the constructed request component. An alternative approach could have been to compute the authentication results within RequestModule itself, but I think it's clearer to keep business logic like that outside of Dagger providers. This CL makes the following individual changes: - Adds request component builders, which implement a RequestComponentBuilder interface so they can all be manipulated by RequestHandler - Instead of obtaining request components via factory methods on the global components, one now can have global-scoped bindings just inject the request component builders (which requires adding a module to each global component declaring the subcomponent). This follows the recommended approach here: http://google.github.io/dagger/subcomponents.html - Instead of exposing request components on the global component interface, we now expose module-specific subclasses of RequestHandler that @Inject the appropriate request component builder's provider and pass it to the superclass (note that inheritance isn't strictly necessary here but saves boilerplate) - RequestHandler now takes the Provider<RequestComponentBuilder> and builds the component itself using its own fresh RequestModule instance. This provides some nice encapsulation but is mainly needed for adding a RequestAuthModule in future work. - RequestHandler also takes UserService now, which can be provided via Dagger by the subclass. Longer-term that will go away in favor of instead providing AuthStrategy instances, some of which will use UserService internally. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=138815648
65 lines
2.6 KiB
Java
65 lines
2.6 KiB
Java
// Copyright 2016 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.
|
|
|
|
package google.registry.module.tools;
|
|
|
|
import dagger.Component;
|
|
import google.registry.config.ConfigModule;
|
|
import google.registry.export.DriveModule;
|
|
import google.registry.gcs.GcsServiceModule;
|
|
import google.registry.groups.DirectoryModule;
|
|
import google.registry.groups.GroupsModule;
|
|
import google.registry.groups.GroupssettingsModule;
|
|
import google.registry.keyring.api.DummyKeyringModule;
|
|
import google.registry.keyring.api.KeyModule;
|
|
import google.registry.module.tools.ToolsRequestComponent.ToolsRequestComponentModule;
|
|
import google.registry.request.Modules.AppIdentityCredentialModule;
|
|
import google.registry.request.Modules.DatastoreServiceModule;
|
|
import google.registry.request.Modules.GoogleCredentialModule;
|
|
import google.registry.request.Modules.Jackson2Module;
|
|
import google.registry.request.Modules.ModulesServiceModule;
|
|
import google.registry.request.Modules.UrlFetchTransportModule;
|
|
import google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule;
|
|
import google.registry.request.Modules.UserServiceModule;
|
|
import google.registry.util.SystemClock.SystemClockModule;
|
|
import google.registry.util.SystemSleeper.SystemSleeperModule;
|
|
import javax.inject.Singleton;
|
|
|
|
/** Dagger component with instance lifetime for "tools" App Engine module. */
|
|
@Singleton
|
|
@Component(
|
|
modules = {
|
|
AppIdentityCredentialModule.class,
|
|
ConfigModule.class,
|
|
DatastoreServiceModule.class,
|
|
DirectoryModule.class,
|
|
DriveModule.class,
|
|
DummyKeyringModule.class,
|
|
GcsServiceModule.class,
|
|
GoogleCredentialModule.class,
|
|
GroupsModule.class,
|
|
GroupssettingsModule.class,
|
|
Jackson2Module.class,
|
|
KeyModule.class,
|
|
ModulesServiceModule.class,
|
|
ToolsRequestComponentModule.class,
|
|
UrlFetchTransportModule.class,
|
|
UseAppIdentityCredentialForGoogleApisModule.class,
|
|
UserServiceModule.class,
|
|
SystemClockModule.class,
|
|
SystemSleeperModule.class,
|
|
})
|
|
interface ToolsComponent {
|
|
ToolsRequestHandler requestHandler();
|
|
}
|