From 55673ceb2d1344a0806206a0deef0986f7f76a87 Mon Sep 17 00:00:00 2001 From: guyben Date: Tue, 2 Apr 2019 07:51:34 -0700 Subject: [PATCH] Update the rdapConformance and notices fields We're changing rdapConformance from rdap_level_0 to icann_rdap_response_profile_0, and changing the EPP status notices title from "EPP Status Codes" to "Status Codes" to conform with the changing spec. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=241527211 --- java/google/registry/rdap/RdapIcannStandardInformation.java | 2 +- java/google/registry/rdap/RdapJsonFormatter.java | 2 +- javatests/google/registry/rdap/RdapActionBaseTest.java | 4 ++-- javatests/google/registry/rdap/RdapDomainActionTest.java | 2 +- .../google/registry/rdap/RdapDomainSearchActionTest.java | 2 +- javatests/google/registry/rdap/RdapEntityActionTest.java | 2 +- .../google/registry/rdap/RdapEntitySearchActionTest.java | 2 +- javatests/google/registry/rdap/RdapNameserverActionTest.java | 2 +- .../google/registry/rdap/RdapNameserverSearchActionTest.java | 2 +- javatests/google/registry/rdap/RdapTestHelper.java | 2 +- .../registry/rdap/testdata/rdap_domains_four_truncated.json | 4 ++-- .../rdap/testdata/rdap_domains_four_with_one_unicode.json | 4 ++-- .../rdap_domains_four_with_one_unicode_truncated.json | 4 ++-- javatests/google/registry/rdap/testdata/rdap_domains_two.json | 4 ++-- javatests/google/registry/rdap/testdata/rdap_error_400.json | 2 +- javatests/google/registry/rdap/testdata/rdap_error_404.json | 2 +- javatests/google/registry/rdap/testdata/rdap_error_422.json | 2 +- javatests/google/registry/rdap/testdata/rdap_error_501.json | 2 +- .../google/registry/rdap/testdata/rdap_formatted_output.json | 2 +- javatests/google/registry/rdap/testdata/rdap_help_index.json | 2 +- javatests/google/registry/rdap/testdata/rdap_help_tos.json | 2 +- .../rdap/testdata/rdap_incomplete_domain_result_set.json | 4 ++-- .../registry/rdap/testdata/rdap_incomplete_domains.json | 4 ++-- .../google/registry/rdap/testdata/rdap_multiple_contacts.json | 2 +- .../registry/rdap/testdata/rdap_multiple_contacts2.json | 2 +- .../google/registry/rdap/testdata/rdap_multiple_hosts.json | 2 +- .../registry/rdap/testdata/rdap_nontruncated_contacts.json | 2 +- .../registry/rdap/testdata/rdap_nontruncated_domains.json | 4 ++-- .../registry/rdap/testdata/rdap_nontruncated_hosts.json | 2 +- .../registry/rdap/testdata/rdap_nontruncated_registrars.json | 2 +- .../registry/rdap/testdata/rdap_truncated_contacts.json | 2 +- .../google/registry/rdap/testdata/rdap_truncated_hosts.json | 2 +- .../registry/rdap/testdata/rdap_truncated_mixed_entities.json | 2 +- .../registry/rdap/testdata/rdap_truncated_registrars.json | 2 +- .../registry/rdap/testdata/rdap_unformatted_output.json | 2 +- javatests/google/registry/rdap/testdata/rdapjson_error.json | 2 +- .../google/registry/rdap/testdata/rdapjson_toplevel.json | 2 +- .../registry/rdap/testdata/rdapjson_toplevel_domain.json | 4 ++-- 38 files changed, 47 insertions(+), 47 deletions(-) diff --git a/java/google/registry/rdap/RdapIcannStandardInformation.java b/java/google/registry/rdap/RdapIcannStandardInformation.java index 7ed073779..d0fc7d873 100644 --- a/java/google/registry/rdap/RdapIcannStandardInformation.java +++ b/java/google/registry/rdap/RdapIcannStandardInformation.java @@ -37,7 +37,7 @@ public class RdapIcannStandardInformation { private static final ImmutableMap DOMAIN_STATUS_CODES_NOTICE = ImmutableMap.of( "title", - "EPP Status Codes", + "Status Codes", "description", ImmutableList.of( "For more information on domain status codes, please visit https://icann.org/epp"), diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java index b72f22245..cf730a49d 100644 --- a/java/google/registry/rdap/RdapJsonFormatter.java +++ b/java/google/registry/rdap/RdapJsonFormatter.java @@ -109,7 +109,7 @@ public class RdapJsonFormatter { OTHER } - private static final String RDAP_CONFORMANCE_LEVEL = "rdap_level_0"; + private static final String RDAP_CONFORMANCE_LEVEL = "icann_rdap_response_profile_0"; private static final String VCARD_VERSION_NUMBER = "4.0"; static final String NOTICES = "notices"; private static final String REMARKS = "remarks"; diff --git a/javatests/google/registry/rdap/RdapActionBaseTest.java b/javatests/google/registry/rdap/RdapActionBaseTest.java index 7a93e3cd7..04c4e7bdd 100644 --- a/javatests/google/registry/rdap/RdapActionBaseTest.java +++ b/javatests/google/registry/rdap/RdapActionBaseTest.java @@ -97,7 +97,7 @@ public class RdapActionBaseTest extends RdapActionBaseTestCase builder = RdapTestHelper.getBuilderExcluding( map, ImmutableSet.of("rdapConformance", "notices", "remarks")); - builder.put("rdapConformance", ImmutableList.of("rdap_level_0")); + builder.put("rdapConformance", ImmutableList.of("icann_rdap_response_profile_0")); RdapTestHelper.addDomainBoilerplateNotices( builder, false, diff --git a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java index 84b69aa85..7e86a18df 100644 --- a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java +++ b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java @@ -499,7 +499,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase builder = new ImmutableMap.Builder<>(); builder.put("domainSearchResults", ImmutableList.of(obj)); - builder.put("rdapConformance", ImmutableList.of("rdap_level_0")); + builder.put("rdapConformance", ImmutableList.of("icann_rdap_response_profile_0")); RdapTestHelper.addDomainBoilerplateNotices( builder, RdapTestHelper.createNotices("https://example.tld/rdap/")); return new JSONObject(builder.build()); diff --git a/javatests/google/registry/rdap/RdapEntityActionTest.java b/javatests/google/registry/rdap/RdapEntityActionTest.java index 3089c851e..27402c9f5 100644 --- a/javatests/google/registry/rdap/RdapEntityActionTest.java +++ b/javatests/google/registry/rdap/RdapEntityActionTest.java @@ -193,7 +193,7 @@ public class RdapEntityActionTest extends RdapActionBaseTestCase builder = RdapTestHelper.getBuilderExcluding( map, ImmutableSet.of("rdapConformance", "notices", "remarks")); - builder.put("rdapConformance", ImmutableList.of("rdap_level_0")); + builder.put("rdapConformance", ImmutableList.of("icann_rdap_response_profile_0")); RdapTestHelper.addNonDomainBoilerplateNotices( builder, RdapTestHelper.createNotices( diff --git a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java index da1f0889d..82e49afe7 100644 --- a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java +++ b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java @@ -205,7 +205,7 @@ public class RdapEntitySearchActionTest extends RdapSearchActionTestCase builder = new ImmutableMap.Builder<>(); builder.put("entitySearchResults", ImmutableList.of(obj)); - builder.put("rdapConformance", ImmutableList.of("rdap_level_0")); + builder.put("rdapConformance", ImmutableList.of("icann_rdap_response_profile_0")); RdapTestHelper.addNonDomainBoilerplateNotices( builder, RdapTestHelper.createNotices("https://example.tld/rdap/")); return new JSONObject(builder.build()); diff --git a/javatests/google/registry/rdap/RdapNameserverActionTest.java b/javatests/google/registry/rdap/RdapNameserverActionTest.java index 5f90fc1e0..6bd4555e7 100644 --- a/javatests/google/registry/rdap/RdapNameserverActionTest.java +++ b/javatests/google/registry/rdap/RdapNameserverActionTest.java @@ -109,7 +109,7 @@ public class RdapNameserverActionTest extends RdapActionBaseTestCase builder = RdapTestHelper.getBuilderExcluding( map, ImmutableSet.of("rdapConformance", "notices", "remarks")); - builder.put("rdapConformance", ImmutableList.of("rdap_level_0")); + builder.put("rdapConformance", ImmutableList.of("icann_rdap_response_profile_0")); RdapTestHelper.addNonDomainBoilerplateNotices( builder, RdapTestHelper.createNotices( diff --git a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java index f88eb8ea7..82adab075 100644 --- a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java +++ b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java @@ -205,7 +205,7 @@ public class RdapNameserverSearchActionTest name, punycodeName, handle, ipAddressType, ipAddress, expectedOutputFile); ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); builder.put("nameserverSearchResults", ImmutableList.of(obj)); - builder.put("rdapConformance", ImmutableList.of("rdap_level_0")); + builder.put("rdapConformance", ImmutableList.of("icann_rdap_response_profile_0")); RdapTestHelper.addNonDomainBoilerplateNotices( builder, RdapTestHelper.createNotices("https://example.tld/rdap/")); return builder.build(); diff --git a/javatests/google/registry/rdap/RdapTestHelper.java b/javatests/google/registry/rdap/RdapTestHelper.java index 473343044..38dd27be2 100644 --- a/javatests/google/registry/rdap/RdapTestHelper.java +++ b/javatests/google/registry/rdap/RdapTestHelper.java @@ -173,7 +173,7 @@ public class RdapTestHelper { noticesBuilder.add( ImmutableMap.of( "title", - "EPP Status Codes", + "Status Codes", "description", ImmutableList.of( "For more information on domain status codes, please visit" diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json b/javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json index ae33f9ec8..1b28419f8 100644 --- a/javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json +++ b/javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json @@ -114,7 +114,7 @@ } ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ @@ -170,7 +170,7 @@ ] }, { - "title" : "EPP Status Codes", + "title" : "Status Codes", "description" : [ "For more information on domain status codes, please visit https://icann.org/epp" diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json b/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json index 7284756c8..2cbac2fea 100644 --- a/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json +++ b/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json @@ -115,7 +115,7 @@ } ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ @@ -151,7 +151,7 @@ ] }, { - "title" : "EPP Status Codes", + "title" : "Status Codes", "description" : [ "For more information on domain status codes, please visit https://icann.org/epp" diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json b/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json index 65456c053..78d56452f 100644 --- a/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json +++ b/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json @@ -115,7 +115,7 @@ } ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ @@ -171,7 +171,7 @@ ] }, { - "title" : "EPP Status Codes", + "title" : "Status Codes", "description" : [ "For more information on domain status codes, please visit https://icann.org/epp" diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_two.json b/javatests/google/registry/rdap/testdata/rdap_domains_two.json index 17e4a8888..c41ce1d5c 100644 --- a/javatests/google/registry/rdap/testdata/rdap_domains_two.json +++ b/javatests/google/registry/rdap/testdata/rdap_domains_two.json @@ -58,7 +58,7 @@ } ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ @@ -94,7 +94,7 @@ ] }, { - "title" : "EPP Status Codes", + "title" : "Status Codes", "description" : [ "For more information on domain status codes, please visit https://icann.org/epp" diff --git a/javatests/google/registry/rdap/testdata/rdap_error_400.json b/javatests/google/registry/rdap/testdata/rdap_error_400.json index 8ce16386b..a249b4550 100644 --- a/javatests/google/registry/rdap/testdata/rdap_error_400.json +++ b/javatests/google/registry/rdap/testdata/rdap_error_400.json @@ -6,6 +6,6 @@ "%NAME%" ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ] } diff --git a/javatests/google/registry/rdap/testdata/rdap_error_404.json b/javatests/google/registry/rdap/testdata/rdap_error_404.json index fb9d7666c..85dee3f2a 100644 --- a/javatests/google/registry/rdap/testdata/rdap_error_404.json +++ b/javatests/google/registry/rdap/testdata/rdap_error_404.json @@ -6,6 +6,6 @@ "%NAME%" ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ] } diff --git a/javatests/google/registry/rdap/testdata/rdap_error_422.json b/javatests/google/registry/rdap/testdata/rdap_error_422.json index 160d0812a..91f112808 100644 --- a/javatests/google/registry/rdap/testdata/rdap_error_422.json +++ b/javatests/google/registry/rdap/testdata/rdap_error_422.json @@ -6,6 +6,6 @@ "%NAME%" ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ] } diff --git a/javatests/google/registry/rdap/testdata/rdap_error_501.json b/javatests/google/registry/rdap/testdata/rdap_error_501.json index d4f623320..84f9a40a5 100644 --- a/javatests/google/registry/rdap/testdata/rdap_error_501.json +++ b/javatests/google/registry/rdap/testdata/rdap_error_501.json @@ -6,6 +6,6 @@ "%NAME%" ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ] } diff --git a/javatests/google/registry/rdap/testdata/rdap_formatted_output.json b/javatests/google/registry/rdap/testdata/rdap_formatted_output.json index 0b9112702..2831cd885 100644 --- a/javatests/google/registry/rdap/testdata/rdap_formatted_output.json +++ b/javatests/google/registry/rdap/testdata/rdap_formatted_output.json @@ -1,6 +1,6 @@ { "key" : "value", - "rdapConformance" : [ "rdap_level_0" ], + "rdapConformance" : [ "icann_rdap_response_profile_0" ], "notices" : [ { "title" : "RDAP Terms of Service", "description" : [ "By querying our Domain Database, you are agreeing to comply with these terms so please read them carefully.", "Any information provided is 'as is' without any guarantee of accuracy.", "Please do not misuse the Domain Database. It is intended solely for query-based access.", "Don't use the Domain Database to allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations.", "Don't access our Domain Database through the use of high volume, automated electronic processes that send queries or data to the systems of any ICANN-accredited registrar.", "You may only use the information contained in the Domain Database for lawful purposes.", "Do not compile, repackage, disseminate, or otherwise use the information contained in the Domain Database in its entirety, or in any substantial portion, without our prior written permission.", "We may retain certain details about queries to our Domain Database for the purposes of detecting and preventing misuse.", "We reserve the right to restrict or deny your access to the database if we suspect that you have failed to comply with these terms.", "We reserve the right to modify this agreement at any time." ], diff --git a/javatests/google/registry/rdap/testdata/rdap_help_index.json b/javatests/google/registry/rdap/testdata/rdap_help_index.json index b05f126ea..6e42ddb4b 100644 --- a/javatests/google/registry/rdap/testdata/rdap_help_index.json +++ b/javatests/google/registry/rdap/testdata/rdap_help_index.json @@ -1,5 +1,5 @@ { - "rdapConformance" : ["rdap_level_0"], + "rdapConformance" : ["icann_rdap_response_profile_0"], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_help_tos.json b/javatests/google/registry/rdap/testdata/rdap_help_tos.json index 14f27853f..2af0f6003 100644 --- a/javatests/google/registry/rdap/testdata/rdap_help_tos.json +++ b/javatests/google/registry/rdap/testdata/rdap_help_tos.json @@ -1,5 +1,5 @@ { - "rdapConformance" : ["rdap_level_0"], + "rdapConformance" : ["icann_rdap_response_profile_0"], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json b/javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json index 6d54897ea..d672f97e9 100644 --- a/javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json +++ b/javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json @@ -153,7 +153,7 @@ "type":"text/html" } ], - "title":"EPP Status Codes" + "title":"Status Codes" }, { "description": @@ -173,6 +173,6 @@ ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ] } diff --git a/javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json b/javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json index 4bbe9af83..8f86af57a 100644 --- a/javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json +++ b/javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json @@ -94,7 +94,7 @@ ] }, { - "title":"EPP Status Codes", + "title":"Status Codes", "description":[ "For more information on domain status codes, please visit https://icann.org/epp" ], @@ -122,6 +122,6 @@ } ], "rdapConformance":[ - "rdap_level_0" + "icann_rdap_response_profile_0" ] } diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json b/javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json index d8272cfdb..38f1f0f58 100644 --- a/javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json +++ b/javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json @@ -101,7 +101,7 @@ ] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json b/javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json index 7ee99fdff..4804b386c 100644 --- a/javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json +++ b/javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json @@ -94,7 +94,7 @@ ] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json b/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json index 50da9751e..9d2f81d8d 100644 --- a/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json +++ b/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json @@ -161,7 +161,7 @@ ] } ], - "rdapConformance" : ["rdap_level_0"], + "rdapConformance" : ["icann_rdap_response_profile_0"], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json b/javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json index 3b7b1dd2b..e50624738 100644 --- a/javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json +++ b/javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json @@ -186,7 +186,7 @@ ] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json b/javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json index beba670dc..dce8327d1 100644 --- a/javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json +++ b/javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json @@ -114,7 +114,7 @@ } ], "rdapConformance": [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ @@ -150,7 +150,7 @@ ] }, { - "title" : "EPP Status Codes", + "title" : "Status Codes", "description" : [ "For more information on domain status codes, please visit https://icann.org/epp" diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json b/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json index b4f477de9..7cfab19f7 100644 --- a/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json +++ b/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json @@ -318,7 +318,7 @@ ] } ], - "rdapConformance" : ["rdap_level_0"], + "rdapConformance" : ["icann_rdap_response_profile_0"], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json b/javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json index 278e235f3..f32acadda 100644 --- a/javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json +++ b/javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json @@ -214,7 +214,7 @@ "roles" : ["registrar"] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json b/javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json index 0da5c435f..3c6a571ac 100644 --- a/javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json +++ b/javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json @@ -186,7 +186,7 @@ ] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json b/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json index 1f96af833..47a2d7af5 100644 --- a/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json +++ b/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json @@ -318,7 +318,7 @@ ] } ], - "rdapConformance" : ["rdap_level_0"], + "rdapConformance" : ["icann_rdap_response_profile_0"], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json b/javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json index e8cc66966..236e0447a 100644 --- a/javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json +++ b/javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json @@ -193,7 +193,7 @@ "roles" : ["registrar"] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json b/javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json index 9b10af5c5..2c76f7ad2 100644 --- a/javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json +++ b/javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json @@ -214,7 +214,7 @@ "roles" : ["registrar"] } ], - "rdapConformance": [ "rdap_level_0" ], + "rdapConformance": [ "icann_rdap_response_profile_0" ], "notices" : [ { diff --git a/javatests/google/registry/rdap/testdata/rdap_unformatted_output.json b/javatests/google/registry/rdap/testdata/rdap_unformatted_output.json index af3097c69..a9a28ad50 100644 --- a/javatests/google/registry/rdap/testdata/rdap_unformatted_output.json +++ b/javatests/google/registry/rdap/testdata/rdap_unformatted_output.json @@ -1 +1 @@ -{"key":"value","rdapConformance":["rdap_level_0"],"notices":[{"title":"RDAP Terms of Service","description":["By querying our Domain Database, you are agreeing to comply with these terms so please read them carefully.","Any information provided is 'as is' without any guarantee of accuracy.","Please do not misuse the Domain Database. It is intended solely for query-based access.","Don't use the Domain Database to allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations.","Don't access our Domain Database through the use of high volume, automated electronic processes that send queries or data to the systems of any ICANN-accredited registrar.","You may only use the information contained in the Domain Database for lawful purposes.","Do not compile, repackage, disseminate, or otherwise use the information contained in the Domain Database in its entirety, or in any substantial portion, without our prior written permission.","We may retain certain details about queries to our Domain Database for the purposes of detecting and preventing misuse.","We reserve the right to restrict or deny your access to the database if we suspect that you have failed to comply with these terms.","We reserve the right to modify this agreement at any time."],"links":[{"value":"http:\/\/myserver.example.com\/help\/tos","rel":"alternate","href":"https:\/\/www.registry.tld\/about\/rdap\/tos.html","type":"text\/html"}]}]} +{"key":"value","rdapConformance":["icann_rdap_response_profile_0"],"notices":[{"title":"RDAP Terms of Service","description":["By querying our Domain Database, you are agreeing to comply with these terms so please read them carefully.","Any information provided is 'as is' without any guarantee of accuracy.","Please do not misuse the Domain Database. It is intended solely for query-based access.","Don't use the Domain Database to allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations.","Don't access our Domain Database through the use of high volume, automated electronic processes that send queries or data to the systems of any ICANN-accredited registrar.","You may only use the information contained in the Domain Database for lawful purposes.","Do not compile, repackage, disseminate, or otherwise use the information contained in the Domain Database in its entirety, or in any substantial portion, without our prior written permission.","We may retain certain details about queries to our Domain Database for the purposes of detecting and preventing misuse.","We reserve the right to restrict or deny your access to the database if we suspect that you have failed to comply with these terms.","We reserve the right to modify this agreement at any time."],"links":[{"value":"http:\/\/myserver.example.com\/help\/tos","rel":"alternate","href":"https:\/\/www.registry.tld\/about\/rdap\/tos.html","type":"text\/html"}]}]} diff --git a/javatests/google/registry/rdap/testdata/rdapjson_error.json b/javatests/google/registry/rdap/testdata/rdapjson_error.json index f375b35fb..02c4c030a 100644 --- a/javatests/google/registry/rdap/testdata/rdapjson_error.json +++ b/javatests/google/registry/rdap/testdata/rdapjson_error.json @@ -1,7 +1,7 @@ { "rdapConformance" : [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "lang" : "en" "errorCode" : 400, diff --git a/javatests/google/registry/rdap/testdata/rdapjson_toplevel.json b/javatests/google/registry/rdap/testdata/rdapjson_toplevel.json index 176a1bdc1..2074a66c7 100644 --- a/javatests/google/registry/rdap/testdata/rdapjson_toplevel.json +++ b/javatests/google/registry/rdap/testdata/rdapjson_toplevel.json @@ -2,7 +2,7 @@ "key" : "value", "rdapConformance" : [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ diff --git a/javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json b/javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json index 3e48a65e3..a2c71a93c 100644 --- a/javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json +++ b/javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json @@ -2,7 +2,7 @@ "key" : "value", "rdapConformance" : [ - "rdap_level_0" + "icann_rdap_response_profile_0" ], "notices" : [ @@ -38,7 +38,7 @@ ] }, { - "title" : "EPP Status Codes", + "title" : "Status Codes", "description" : [ "For more information on domain status codes, please visit https://icann.org/epp"