zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 08:27:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update the rdapConformance and notices fields

Browse source 
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
This commit is contained in:
guyben 2019-04-02 07:51:34 -07:00 • committed by jianglai
parent 822c1d129f
commit 55673ceb2d
38 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/rdap/RdapIcannStandardInformation.java
View file

@ -37,7 +37,7 @@ public class RdapIcannStandardInformation {
private static final ImmutableMap<String, Object> 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"),

2
java/google/registry/rdap/RdapJsonFormatter.java
View file

@ -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";

4
javatests/google/registry/rdap/RdapActionBaseTest.java
View file

@ -97,7 +97,7 @@ public class RdapActionBaseTest extends RdapActionBaseTestCase<RdapActionBaseTes
public void testIllegalValue_showsReadableTypeName() {
assertThat(generateActualJson("IllegalArgumentException")).isEqualTo(JSONValue.parse(
"{\"lang\":\"en\", \"errorCode\":400, \"title\":\"Bad Request\","
+ "\"rdapConformance\":[\"rdap_level_0\"],"
+ "\"rdapConformance\":[\"icann_rdap_response_profile_0\"],"
+ "\"description\":[\"Not a valid human-readable string\"]}"));
assertThat(response.getStatus()).isEqualTo(400);
}
@ -106,7 +106,7 @@ public class RdapActionBaseTest extends RdapActionBaseTestCase<RdapActionBaseTes
public void testRuntimeException_returns500Error() {
assertThat(generateActualJson("RuntimeException")).isEqualTo(JSONValue.parse(
"{\"lang\":\"en\", \"errorCode\":500, \"title\":\"Internal Server Error\","
+ "\"rdapConformance\":[\"rdap_level_0\"],"
+ "\"rdapConformance\":[\"icann_rdap_response_profile_0\"],"
+ "\"description\":[\"An error was encountered\"]}"));
assertThat(response.getStatus()).isEqualTo(500);
}

2
javatests/google/registry/rdap/RdapDomainActionTest.java
View file

@ -329,7 +329,7 @@ public class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainActio
ImmutableMap.Builder<String, Object> 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,

2
javatests/google/registry/rdap/RdapDomainSearchActionTest.java
View file

@ -499,7 +499,7 @@ public class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDom
expectedOutputFile);
ImmutableMap.Builder<String, Object> 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());

2
javatests/google/registry/rdap/RdapEntityActionTest.java
View file

@ -193,7 +193,7 @@ public class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityActio
ImmutableMap.Builder<String, Object> 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(

2
javatests/google/registry/rdap/RdapEntitySearchActionTest.java
View file

@ -205,7 +205,7 @@ public class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEnt
Object obj = generateExpectedJson(handle, fullName, status, email, address, expectedOutputFile);
ImmutableMap.Builder<String, Object> 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());

2
javatests/google/registry/rdap/RdapNameserverActionTest.java
View file

@ -109,7 +109,7 @@ public class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameser
ImmutableMap.Builder<String, Object> 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(

2
javatests/google/registry/rdap/RdapNameserverSearchActionTest.java
View file

@ -205,7 +205,7 @@ public class RdapNameserverSearchActionTest
name, punycodeName, handle, ipAddressType, ipAddress, expectedOutputFile);
ImmutableMap.Builder<String, Object> 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();

2
javatests/google/registry/rdap/RdapTestHelper.java
View file

@ -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"

4
javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json vendored
View file

@ -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"

4
javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json vendored
View file

@ -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"

4
javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json vendored
View file

@ -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"

4
javatests/google/registry/rdap/testdata/rdap_domains_two.json vendored
View file

@ -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"

2
javatests/google/registry/rdap/testdata/rdap_error_400.json vendored
View file

@ -6,6 +6,6 @@
"%NAME%"
],
"rdapConformance": [
"rdap_level_0"
"icann_rdap_response_profile_0"
]
}

2
javatests/google/registry/rdap/testdata/rdap_error_404.json vendored
View file

@ -6,6 +6,6 @@
"%NAME%"
],
"rdapConformance": [
"rdap_level_0"
"icann_rdap_response_profile_0"
]
}

2
javatests/google/registry/rdap/testdata/rdap_error_422.json vendored
View file

@ -6,6 +6,6 @@
"%NAME%"
],
"rdapConformance": [
"rdap_level_0"
"icann_rdap_response_profile_0"
]
}

2
javatests/google/registry/rdap/testdata/rdap_error_501.json vendored
View file

@ -6,6 +6,6 @@
"%NAME%"
],
"rdapConformance": [
"rdap_level_0"
"icann_rdap_response_profile_0"
]
}

2
javatests/google/registry/rdap/testdata/rdap_formatted_output.json vendored
View file

@ -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." ],

2
javatests/google/registry/rdap/testdata/rdap_help_index.json vendored
View file

@ -1,5 +1,5 @@
{
"rdapConformance" : ["rdap_level_0"],
"rdapConformance" : ["icann_rdap_response_profile_0"],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_help_tos.json vendored
View file

@ -1,5 +1,5 @@
{
"rdapConformance" : ["rdap_level_0"],
"rdapConformance" : ["icann_rdap_response_profile_0"],
"notices" :
[
{

4
javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json vendored
View file

@ -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"
]
}

4
javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json vendored
View file

@ -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"
]
}

2
javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json vendored
View file

@ -101,7 +101,7 @@
]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json vendored
View file

@ -94,7 +94,7 @@
]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json vendored
View file

@ -161,7 +161,7 @@
]
}
],
"rdapConformance" : ["rdap_level_0"],
"rdapConformance" : ["icann_rdap_response_profile_0"],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json vendored
View file

@ -186,7 +186,7 @@
]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

4
javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json vendored
View file

@ -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"

2
javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json vendored
View file

@ -318,7 +318,7 @@
]
}
],
"rdapConformance" : ["rdap_level_0"],
"rdapConformance" : ["icann_rdap_response_profile_0"],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json vendored
View file

@ -214,7 +214,7 @@
"roles" : ["registrar"]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json vendored
View file

@ -186,7 +186,7 @@
]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json vendored
View file

@ -318,7 +318,7 @@
]
}
],
"rdapConformance" : ["rdap_level_0"],
"rdapConformance" : ["icann_rdap_response_profile_0"],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json vendored
View file

@ -193,7 +193,7 @@
"roles" : ["registrar"]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json vendored
View file

@ -214,7 +214,7 @@
"roles" : ["registrar"]
}
],
"rdapConformance": [ "rdap_level_0" ],
"rdapConformance": [ "icann_rdap_response_profile_0" ],
"notices" :
[
{

2
javatests/google/registry/rdap/testdata/rdap_unformatted_output.json vendored
View file

@ -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"}]}]}

2
javatests/google/registry/rdap/testdata/rdapjson_error.json vendored
View file

@ -1,7 +1,7 @@
{
"rdapConformance" :
[
"rdap_level_0"
"icann_rdap_response_profile_0"
],
"lang" : "en"
"errorCode" : 400,

2
javatests/google/registry/rdap/testdata/rdapjson_toplevel.json vendored
View file

@ -2,7 +2,7 @@
"key" : "value",
"rdapConformance" :
[
"rdap_level_0"
"icann_rdap_response_profile_0"
],
"notices" :
[

4
javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json vendored
View file

@ -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"