diff --git a/core/src/main/java/google/registry/rdap/RdapDataStructures.java b/core/src/main/java/google/registry/rdap/RdapDataStructures.java index 4a265a64c..5814da2df 100644 --- a/core/src/main/java/google/registry/rdap/RdapDataStructures.java +++ b/core/src/main/java/google/registry/rdap/RdapDataStructures.java @@ -367,7 +367,7 @@ final class RdapDataStructures { PENDING_RESTORE("pending restore"), REDEMPTION_PERIOD("redemption period"), RENEW_PERIOD("renew period"), - SERVER_DELETE_PROHIBITED("server deleted prohibited"), + SERVER_DELETE_PROHIBITED("server delete prohibited"), SERVER_RENEW_PROHIBITED("server renew prohibited"), SERVER_TRANSFER_PROHIBITED("server transfer prohibited"), SERVER_UPDATE_PROHIBITED("server update prohibited"), diff --git a/core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java b/core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java index 1e59f0549..364949188 100644 --- a/core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java +++ b/core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java @@ -54,12 +54,11 @@ public class RdapIcannStandardInformation { private static final Notice INACCURACY_COMPLAINT_FORM_NOTICE = Notice.builder() .setTitle("RDDS Inaccuracy Complaint Form") - .setDescription( - "URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf") + .setDescription("URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf") .addLink( Link.builder() .setRel("alternate") - .setHref("https://www.icann.org/wicf") + .setHref("https://icann.org/wicf") .setType("text/html") .build()) .build(); diff --git a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java index d781da7be..f61efb3ee 100644 --- a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java +++ b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java @@ -1000,7 +1000,7 @@ public class RdapJsonFormatter { // Gustavo Lozano of ICANN, the one we should use is an embedded array of street address lines // if there is more than one line: // - // RFC7095 provides two examples of structured addresses, and one of the examples shows a + // RFC 7095 provides two examples of structured addresses, and one of the examples shows a // street JSON element that contains several data elements. The example showing (see below) // several data elements is the expected output when two or more elements // exists in the contact object. diff --git a/core/src/test/java/google/registry/rdap/RdapTestHelper.java b/core/src/test/java/google/registry/rdap/RdapTestHelper.java index fc74feb8c..92ba4d663 100644 --- a/core/src/test/java/google/registry/rdap/RdapTestHelper.java +++ b/core/src/test/java/google/registry/rdap/RdapTestHelper.java @@ -139,13 +139,12 @@ class RdapTestHelper { "RDDS Inaccuracy Complaint Form", "description", ImmutableList.of( - "URL of the ICANN RDDS Inaccuracy Complaint Form:" - + " https://www.icann.org/wicf"), + "URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"), "links", ImmutableList.of( ImmutableMap.of( "rel", "alternate", - "href", "https://www.icann.org/wicf", + "href", "https://icann.org/wicf", "type", "text/html"))))); } diff --git a/core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json b/core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json index 220f62972..1d8ba5f8b 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json +++ b/core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json @@ -156,12 +156,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links" : [ { "rel" : "alternate", - "href" : "https://www.icann.org/wicf", + "href" : "https://icann.org/wicf", "type" : "text/html" } ] diff --git a/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json b/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json index 2d55bbb69..243a33fa7 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json +++ b/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json @@ -137,12 +137,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links" : [ { "rel" : "alternate", - "href" : "https://www.icann.org/wicf", + "href" : "https://icann.org/wicf", "type" : "text/html" } ] diff --git a/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json b/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json index 581197215..7561be9b9 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json +++ b/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json @@ -157,12 +157,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links" : [ { "rel" : "alternate", - "href" : "https://www.icann.org/wicf", + "href" : "https://icann.org/wicf", "type" : "text/html" } ] diff --git a/core/src/test/resources/google/registry/rdap/rdap_domains_two.json b/core/src/test/resources/google/registry/rdap/rdap_domains_two.json index 2b1af6c55..ce659b9a3 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_domains_two.json +++ b/core/src/test/resources/google/registry/rdap/rdap_domains_two.json @@ -95,12 +95,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description": ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description": ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links": [ { "rel": "alternate", - "href": "https://www.icann.org/wicf", + "href": "https://icann.org/wicf", "type": "text/html" } ] diff --git a/core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json b/core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json index 330e9d91b..9ec81e99b 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json +++ b/core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json @@ -130,12 +130,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description": ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description": ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links": [ { "rel":"alternate", - "href":"https://www.icann.org/wicf", + "href":"https://icann.org/wicf", "type":"text/html" } ] diff --git a/core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json b/core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json index 7ea468430..bbdc51e7f 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json +++ b/core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json @@ -98,12 +98,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description":["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description":["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links":[ { "type":"text/html", "rel":"alternate", - "href":"https://www.icann.org/wicf" + "href":"https://icann.org/wicf" } ] } diff --git a/core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json b/core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json index 681a7a5c8..8b6b87aca 100644 --- a/core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json +++ b/core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json @@ -144,12 +144,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description" : ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links" : [ { "rel" : "alternate", - "href" : "https://www.icann.org/wicf", + "href" : "https://icann.org/wicf", "type" : "text/html" } ] diff --git a/core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json b/core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json index f921f6208..e1296080c 100644 --- a/core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json +++ b/core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json @@ -59,12 +59,12 @@ }, { "title": "RDDS Inaccuracy Complaint Form", - "description": ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"], + "description": ["URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"], "links": [ { "rel": "alternate", - "href": "https://www.icann.org/wicf", + "href": "https://icann.org/wicf", "type": "text/html" } ]