Use Dagger to @Inject WhoisReader instances

This is a precursor to adding metrics to WHOIS queries (as I'd like
to be able to @Inject the metrics builders).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=149418018
This commit is contained in:
mcilwain 2017-03-07 07:47:38 -08:00 committed by Ben McIlwain
parent 53785c2fc7
commit bd7db61606
8 changed files with 51 additions and 51 deletions

View file

@ -34,7 +34,6 @@ import google.registry.request.Response;
import google.registry.util.Clock;
import google.registry.util.FormattingLogger;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@ -132,7 +131,7 @@ public final class WhoisHttpServer implements Runnable {
@Inject Response response;
@Inject @Config("whoisDisclaimer") String disclaimer;
@Inject @Config("whoisHttpExpires") Duration expires;
@Inject @Config("whoisCommandFactory") WhoisCommandFactory commandFactory;
@Inject WhoisReaderFactory whoisReaderFactory;
@Inject @RequestPath String requestPath;
@Inject WhoisHttpServer() {}
@ -143,10 +142,10 @@ public final class WhoisHttpServer implements Runnable {
try {
// Extremely permissive parsing that turns stuff like "/hello/world/" into "hello world".
String command = decode(JOINER.join(SLASHER.split(path.substring(PATH.length())))) + "\r\n";
Reader reader = new StringReader(command);
DateTime now = clock.nowUtc();
sendResponse(
SC_OK, new WhoisReader(reader, commandFactory, now).readCommand().executeQuery(now));
SC_OK,
whoisReaderFactory.create(now).readCommand(new StringReader(command)).executeQuery(now));
} catch (WhoisException e) {
sendResponse(e.getStatus(), e);
} catch (IOException e) {