Add WHOIS disclaimer text to ConfigModule

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

View file

@ -14,6 +14,7 @@
package google.registry.whois;
import google.registry.config.ConfigModule.Config;
import google.registry.util.Clock;
import java.io.IOException;
import java.io.StringReader;
@ -24,23 +25,24 @@ import org.joda.time.DateTime;
public final class Whois {
private final Clock clock;
private final String disclaimer;
@Inject
public Whois(Clock clock) {
public Whois(Clock clock, @Config("whoisDisclaimer") String disclaimer) {
this.clock = clock;
this.disclaimer = disclaimer;
}
/**
* Performs a WHOIS lookup on a plaintext query string.
*
* @throws WhoisException if the record is not found or the query is invalid
*/
public WhoisResponse lookup(String query) throws WhoisException {
/** Performs a WHOIS lookup on a plaintext query string. */
public String lookup(String query, boolean preferUnicode) {
DateTime now = clock.nowUtc();
try {
return new WhoisReader(new StringReader(query), now)
.readCommand()
.executeQuery(now);
.executeQuery(now)
.getPlainTextOutput(preferUnicode, disclaimer);
} catch (WhoisException e) {
return e.getPlainTextOutput(preferUnicode, disclaimer);
} catch (IOException e) {
throw new RuntimeException(e);
}