zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove Builder type param on RequestComponentBuilder/RequestHandler

Browse source 
It turns out this type parameter was never necessary.  A builder only needs the reflexive second type parameter when you want to have a builder inheritance hierarchy where the descendant builders have methods that the ancestor builder doesn't.  In that case, the type param enables the ancestor builder's setter methods to automatically return the correct derived type, so that if you start with a derived builder, you can call a setter method inherited from an ancestor and then continue the chain with setters from the derived builder (e.g. new ContactResource.Builder().setCreationTime(now).setContactId(), which otherwise would have returned an EppResource.Builder from setCreationTime(), at which point the call to setContactId() would not compile).

Even then, it's not strictly necessary to use the type parameter, since you could instead just have each derived type override every inherited method to specify itself as the return type.  But that would be a lot of extra boilerplate and brittleness.

Anyway, in this case, there is a builder hierarchy, but RequestComponentBuilder specifies all the methods that we're ever going to want on our builders, so there's never any need to be able to call specific derived builder methods.  We only even need the individual builder classes so that Dagger can generate them separately for each component.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=148269178
This commit is contained in:
nickfelt 2017-02-22 14:31:15 -08:00 • committed by Ben McIlwain
parent 16832323d0
commit 1e7fc4d64d
9 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
java/google/registry/request/RequestHandler.java
View file

@ -67,14 +67,13 @@ import javax.servlet.http.HttpServletResponse;
* <p>This class also enforces the {@link Action#requireLogin() requireLogin} setting.
*
* @param <C> request component type
* @param <B> builder for the request component
*/
public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
public class RequestHandler<C> {
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
private final Router router;
private final Provider<B> requestComponentBuilderProvider;
private final Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider;
private final UserService userService;
private final RequestAuthenticator requestAuthenticator;
private final XsrfTokenManager xsrfTokenManager;
@ -94,7 +93,7 @@ public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
* @param xsrfTokenManager an instance of the {@link XsrfTokenManager} class
*/
protected RequestHandler(
Provider<B> requestComponentBuilderProvider,
Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider,
UserService userService,
RequestAuthenticator requestAuthenticator,
XsrfTokenManager xsrfTokenManager) {
@ -103,9 +102,9 @@ public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
}
/** Creates a new RequestHandler with an explicit component class for test purposes. */
public static <C, B extends RequestComponentBuilder<C, B>> RequestHandler<C, B> createForTest(
public static <C> RequestHandler<C> createForTest(
Class<C> component,
Provider<B> requestComponentBuilderProvider,
Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider,
UserService userService,
RequestAuthenticator requestAuthenticator,
XsrfTokenManager xsrfTokenManager) {
@ -119,7 +118,7 @@ public class RequestHandler<C, B extends RequestComponentBuilder<C, B>> {
private RequestHandler(
@Nullable Class<C> component,
Provider<B> requestComponentBuilderProvider,
Provider<? extends RequestComponentBuilder<C>> requestComponentBuilderProvider,
UserService userService,
RequestAuthenticator requestAuthenticator,
XsrfTokenManager xsrfTokenManager) {