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

javatests/google/registry/whois/DomainWhoisResponseTest.java

@@ -239,7 +239,7 @@ public class DomainWhoisResponseTest {
   public void getPlainTextOutputTest() {
     DomainWhoisResponse domainWhoisResponse =
         new DomainWhoisResponse(domainResource, clock.nowUtc());
-    assertThat(domainWhoisResponse.getPlainTextOutput(false))
+    assertThat(domainWhoisResponse.getPlainTextOutput(false, "Doodle Disclaimer"))
         .isEqualTo(loadWhoisTestFile("whois_domain.txt"));
   }
 
@@ -248,6 +248,7 @@ public class DomainWhoisResponseTest {
     DomainWhoisResponse domainWhoisResponse = new DomainWhoisResponse(
         domainResource.asBuilder().setStatusValues(null).build(),
         clock.nowUtc());
-    assertThat(domainWhoisResponse.getPlainTextOutput(false)).contains("Domain Status: ok");
+    assertThat(domainWhoisResponse.getPlainTextOutput(false, "Doodle Disclaimer"))
+        .contains("Domain Status: ok");
   }
 }

javatests/google/registry/whois/NameserverWhoisResponseTest.java

@@ -81,7 +81,7 @@ public class NameserverWhoisResponseTest {
   public void getTextOutputTest() {
     NameserverWhoisResponse nameserverWhoisResponse =
         new NameserverWhoisResponse(hostResource1, clock.nowUtc());
-    assertThat(nameserverWhoisResponse.getPlainTextOutput(false))
+    assertThat(nameserverWhoisResponse.getPlainTextOutput(false, "Doodle Disclaimer"))
         .isEqualTo(loadWhoisTestFile("whois_nameserver.txt"));
   }
 
@@ -89,7 +89,7 @@ public class NameserverWhoisResponseTest {
   public void getMultipleNameserversResponse() {
     NameserverWhoisResponse nameserverWhoisResponse =
         new NameserverWhoisResponse(ImmutableList.of(hostResource1, hostResource2), clock.nowUtc());
-    assertThat(nameserverWhoisResponse.getPlainTextOutput(false))
+    assertThat(nameserverWhoisResponse.getPlainTextOutput(false, "Doodle Disclaimer"))
         .isEqualTo(loadWhoisTestFile("whois_multiple_nameservers.txt"));
   }
 }

javatests/google/registry/whois/RegistrarWhoisResponseTest.java

@@ -113,7 +113,7 @@ public class RegistrarWhoisResponseTest {
 
     RegistrarWhoisResponse registrarWhoisResponse =
         new RegistrarWhoisResponse(registrar, clock.nowUtc());
-    assertThat(registrarWhoisResponse.getPlainTextOutput(false))
+    assertThat(registrarWhoisResponse.getPlainTextOutput(false, "Doodle Disclaimer"))
         .isEqualTo(loadWhoisTestFile("whois_registrar.txt"));
   }
 
@@ -129,6 +129,6 @@ public class RegistrarWhoisResponseTest {
     RegistrarWhoisResponse registrarWhoisResponse =
         new RegistrarWhoisResponse(registrar, clock.nowUtc());
     // Just make sure this doesn't NPE.
-    registrarWhoisResponse.getPlainTextOutput(false);
+    registrarWhoisResponse.getPlainTextOutput(false, "Doodle Disclaimer");
   }
 }

javatests/google/registry/whois/WhoisHttpServerTest.java

@@ -70,6 +70,7 @@ public class WhoisHttpServerTest {
     result.expires = Duration.standardHours(1);
     result.requestPath = WhoisHttpServer.PATH + pathInfo;
     result.response = response;
+    result.disclaimer = "Doodle Disclaimer";
     return result;
   }
 

javatests/google/registry/whois/WhoisServerTest.java

@@ -66,6 +66,7 @@ public class WhoisServerTest {
     result.clock = clock;
     result.input = new StringReader(input);
     result.response = response;
+    result.disclaimer = "Doodle Disclaimer";
     return result;
   }
 

javatests/google/registry/whois/testdata/whois_domain.txt

@@ -61,16 +61,4 @@ For more information on Whois status codes, please visit https://icann.org/epp
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_multiple_nameservers.txt

@@ -15,16 +15,4 @@ Referral URL: http://www.referral.example/path
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_nameserver.txt

@@ -8,16 +8,4 @@ Referral URL: http://www.referral.example/path
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_registrar.txt

@@ -25,16 +25,4 @@ Email: johngeek@example-registrar.tld
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_domain.txt

@@ -59,16 +59,4 @@ For more information on Whois status codes, please visit https://icann.org/epp
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_domain_not_found.txt

@@ -3,16 +3,4 @@ Domain not found.
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_idn_punycode.txt

@@ -59,16 +59,4 @@ For more information on Whois status codes, please visit https://icann.org/epp
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_idn_utf8.txt

@@ -59,16 +59,4 @@ For more information on Whois status codes, please visit https://icann.org/epp
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_ip_not_found.txt

@@ -3,16 +3,4 @@ No nameservers found.
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_malformed_path.txt

@@ -3,16 +3,4 @@ Malformed path query.
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_nameserver.txt

@@ -7,16 +7,4 @@ Referral URL: http://www.referral.example/path
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_nameserver_not_found.txt

@@ -3,16 +3,4 @@ Nameserver not found.
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_no_command.txt

@@ -3,16 +3,4 @@ No WHOIS command specified.
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_registrar.txt

@@ -21,16 +21,4 @@ Email: johndoe@example.com
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer

javatests/google/registry/whois/testdata/whois_server_registrar_not_found.txt

@@ -3,16 +3,4 @@ No registrar found.
 
 URL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/
 
-WHOIS information is provided by Charleston Road Registry Inc. (CRR) solely for
-query-based, informational purposes. By querying our WHOIS database, you are
-agreeing to comply with these terms
-(http://www.registry.google/about/whois-disclaimer.html) so please read them
-carefully.  Any information provided is "as is" without any guarantee of
-accuracy. You may not use such information to (a) allow, enable, or otherwise
-support the transmission of mass unsolicited, commercial advertising or
-solicitations; (b) enable high volume, automated, electronic processes that
-access the systems of CRR or any ICANN-Accredited Registrar, except as
-reasonably necessary to register domain names or modify existing registrations;
-or (c) engage in or support unlawful behavior. CRR reserves the right to
-restrict or deny your access to the Whois database, and may modify these terms
-at any time.
+Doodle Disclaimer