diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 165d2c38d..8f664ee11 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -1086,22 +1086,6 @@ public final class RegistryConfig { return new ImmutableMap.Builder() .put("/", RdapNoticeDescriptor.builder() .setTitle("RDAP Help") - .setDescription(ImmutableList.of( - "RDAP Help Topics (use /help/index for information)", - "syntax", - "tos (Terms of Service)")) - .setLinkValueSuffix("help/") - .build()) - .put("/index", RdapNoticeDescriptor.builder() - .setTitle("RDAP Help") - .setDescription(ImmutableList.of( - "RDAP Help Topics (use /help/index for information)", - "syntax", - "tos (Terms of Service)")) - .setLinkValueSuffix("help/index") - .build()) - .put("/syntax", RdapNoticeDescriptor.builder() - .setTitle("RDAP Command Syntax") .setDescription(ImmutableList.of( "domain/XXXX", "nameserver/XXXX", @@ -1114,7 +1098,7 @@ public final class RegistryConfig { "entities?fn=XXXX", "entities?handle=XXXX", "help/XXXX")) - .setLinkValueSuffix("help/syntax") + .setLinkValueSuffix("help/") .setLinkHrefUrlString("https://github.com/google/nomulus/blob/master/docs/rdap.md") .build()) .put("/tos", RdapNoticeDescriptor.builder() diff --git a/javatests/google/registry/rdap/RdapHelpActionTest.java b/javatests/google/registry/rdap/RdapHelpActionTest.java index abc8fd208..7aff97d1a 100644 --- a/javatests/google/registry/rdap/RdapHelpActionTest.java +++ b/javatests/google/registry/rdap/RdapHelpActionTest.java @@ -104,13 +104,6 @@ public class RdapHelpActionTest { assertThat(response.getStatus()).isEqualTo(404); } - @Test - public void testHelpActionIndex_works() throws Exception { - assertThat(generateActualJson("/index")) - .isEqualTo(generateExpectedJson("index", "rdap_help_index.json")); - assertThat(response.getStatus()).isEqualTo(200); - } - @Test public void testHelpActionDefault_getsIndex() throws Exception { assertThat(generateActualJson("")) @@ -125,12 +118,6 @@ public class RdapHelpActionTest { assertThat(response.getStatus()).isEqualTo(200); } - @Test - public void testHelpActionSyntax_works() throws Exception { - generateActualJson("/syntax"); - assertThat(response.getStatus()).isEqualTo(200); - } - @Test public void testHelpActionTos_works() throws Exception { assertThat(generateActualJson("/tos")) diff --git a/javatests/google/registry/rdap/RdapTestHelper.java b/javatests/google/registry/rdap/RdapTestHelper.java index a5800d6a7..572a17214 100644 --- a/javatests/google/registry/rdap/RdapTestHelper.java +++ b/javatests/google/registry/rdap/RdapTestHelper.java @@ -200,24 +200,6 @@ public class RdapTestHelper { "/", RdapNoticeDescriptor.builder() .setTitle("RDAP Help") - .setDescription(ImmutableList.of( - "RDAP Help Topics (use /help/topic for information)", - "syntax", - "tos (Terms of Service)")) - .setLinkValueSuffix("help/") - .build(), - "/index", - RdapNoticeDescriptor.builder() - .setTitle("RDAP Help") - .setDescription(ImmutableList.of( - "RDAP Help Topics (use /help/topic for information)", - "syntax", - "tos (Terms of Service)")) - .setLinkValueSuffix("help/index") - .build(), - "/syntax", - RdapNoticeDescriptor.builder() - .setTitle("RDAP Command Syntax") .setDescription(ImmutableList.of( "domain/XXXX", "nameserver/XXXX", @@ -230,8 +212,8 @@ public class RdapTestHelper { "entities?fn=XXXX", "entities?handle=XXXX", "help/XXXX")) - .setLinkValueSuffix("help/syntax") - .setLinkHrefUrlString("https://www.registry.tld/about/rdap/syntax.html") + .setLinkValueSuffix("help/") + .setLinkHrefUrlString("https://github.com/google/nomulus/blob/master/docs/rdap.md") .build(), "/tos", RdapNoticeDescriptor.builder() diff --git a/javatests/google/registry/rdap/testdata/rdap_help_index.json b/javatests/google/registry/rdap/testdata/rdap_help_index.json index b809acfa6..b05f126ea 100644 --- a/javatests/google/registry/rdap/testdata/rdap_help_index.json +++ b/javatests/google/registry/rdap/testdata/rdap_help_index.json @@ -6,17 +6,25 @@ "title" : "RDAP Help", "description" : [ - "RDAP Help Topics (use \/help\/topic for information)", - "syntax", - "tos (Terms of Service)" + "domain/XXXX", + "nameserver/XXXX", + "entity/XXXX", + "domains?name=XXXX", + "domains?nsLdhName=XXXX", + "domains?nsIp=XXXX", + "nameservers?name=XXXX", + "nameservers?ip=XXXX", + "entities?fn=XXXX", + "entities?handle=XXXX", + "help/XXXX" ], "links" : [ { "value" : "https://example.tld/rdap/help/%NAME%", - "rel" : "self", - "type" : "application/rdap+json", - "href" : "https://example.tld/rdap/help/%NAME%" + "rel" : "alternate", + "type" : "text/html", + "href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md" } ] },