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

Add WHOIS disclaimer text to ConfigModule

Browse source 
This fixes #23 for @parsoj by allowing a custom disclaimer to be
specified via dependency injection modules.

By making the disclaimer part of the dependency injection graph, it can
come from anywhere.

For example, if I was Donuts, I would have my own repository. I'd use an
external http_archive() repository for Domain Registry. Then I would
write my own Dagger @Component for each App Engine module. My Component
would have a list of Dagger Modules, which I copied from the Domain
Registry version. Then I would swap out ConfigModule with my own
DonutsConfigModule, which provides the same values.

So long as a method exists that @Provides @Config("whoisRegistry"), and
the module containing it is listed in the @Component, the dependency
injection graph becomes valid and complete for the whois package
(provided other dependencies are met.)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=128082921
This commit is contained in:
Justine Tunney 2016-07-21 11:18:06 -07:00
parent 2c9567e183
commit e82a40a2fb
34 changed files with 149 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

15
java/google/registry/whois/WhoisServer.java
View file

@ -18,6 +18,7 @@ import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.net.MediaType;
import google.registry.config.ConfigModule.Config;
import google.registry.request.Action;
import google.registry.request.Response;
import google.registry.util.Clock;
@ -57,6 +58,9 @@ public class WhoisServer implements Runnable {
@Inject Clock clock;
@Inject Reader input;
@Inject Response response;
@Inject
@Config("whoisDisclaimer")
String disclaimer;
@Inject WhoisServer() {}
@Override
@ -64,12 +68,13 @@ public class WhoisServer implements Runnable {
String responseText;
DateTime now = clock.nowUtc();
try {
responseText = new WhoisReader(input, now)
.readCommand()
.executeQuery(now)
.getPlainTextOutput(PREFER_UNICODE);
responseText =
new WhoisReader(input, now)
.readCommand()
.executeQuery(now)
.getPlainTextOutput(PREFER_UNICODE, disclaimer);
} catch (WhoisException e) {
responseText = e.getPlainTextOutput(PREFER_UNICODE);
responseText = e.getPlainTextOutput(PREFER_UNICODE, disclaimer);
} catch (Throwable t) {
logger.severe(t, "WHOIS request crashed");
responseText = "Internal Server Error";