Remove 'value' from RDAP link responses (#236)

* Remove 'value' from RDAP link responses

* Change application type to rdap+json

* Merge remote-tracking branch 'origin/master' into removeValueRdap

* CR response

core/src/main/java/google/registry/rdap/RdapHelpAction.java

@@ -47,13 +47,6 @@ public class RdapHelpAction extends RdapActionBase {
   }
 
   private Notice createHelpNotice() {
-    String linkValue = rdapJsonFormatter.makeRdapServletRelativeUrl("help");
-    Link.Builder linkBuilder =
-        Link.builder()
-            .setValue(linkValue)
-            .setRel("alternate")
-            .setHref(RDAP_HELP_LINK)
-            .setType("text/html");
     return Notice.builder()
         .setTitle("RDAP Help")
         .setDescription(
@@ -68,13 +61,19 @@ public class RdapHelpAction extends RdapActionBase {
             "entities?fn=XXXX",
             "entities?handle=XXXX",
             "help/XXXX")
-        .addLink(linkBuilder.build())
+        .addLink(
+            Link.builder().setHref(RDAP_HELP_LINK).setRel("alternate").setType("text/html").build())
+        .addLink(
+            Link.builder()
+                .setHref(rdapJsonFormatter.makeRdapServletRelativeUrl("help"))
+                .setRel("self")
+                .setType("application/rdap+json")
+                .build())
         .build();
   }
 
   @Override
-  public HelpResponse getJsonObjectForResource(
+  public HelpResponse getJsonObjectForResource(String pathSearchString, boolean isHeadRequest) {
-      String pathSearchString, boolean isHeadRequest) {
     if (pathSearchString.isEmpty() || pathSearchString.equals("/")) {
       return HelpResponse.create(Optional.of(createHelpNotice()));
     }

core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java

@@ -44,7 +44,6 @@ public class RdapIcannStandardInformation {
                   + " https://icann.org/epp")
           .addLink(
               Link.builder()
-                  .setValue("https://icann.org/epp")
                   .setRel("alternate")
                   .setHref("https://icann.org/epp")
                   .setType("text/html")
@@ -59,7 +58,6 @@ public class RdapIcannStandardInformation {
               "URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf")
           .addLink(
               Link.builder()
-                  .setValue("https://www.icann.org/wicf")
                   .setRel("alternate")
                   .setHref("https://www.icann.org/wicf")
                   .setType("text/html")
@@ -145,8 +143,6 @@ public class RdapIcannStandardInformation {
           .setType(Remark.Type.OBJECT_REDACTED_AUTHORIZATION)
           .addLink(
               Link.builder()
-                  .setValue(
-                      "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication")
                   .setRel("alternate")
                   .setHref(
                       "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication")

core/src/main/java/google/registry/rdap/RdapJsonFormatter.java

@@ -228,20 +228,25 @@ public class RdapJsonFormatter {
   /** Creates the TOS notice that is added to every reply. */
   Notice createTosNotice() {
     String linkValue = makeRdapServletRelativeUrl("help", RdapHelpAction.TOS_PATH);
-    Link.Builder linkBuilder = Link.builder()
+    Link selfLink =
-        .setValue(linkValue);
+        Link.builder().setRel("self").setHref(linkValue).setType("application/rdap+json").build();
-    if (rdapTosStaticUrl == null) {
+
-      linkBuilder.setRel("self").setHref(linkValue).setType("application/rdap+json");
+    Notice.Builder noticeBuilder =
-    } else {
+        Notice.builder()
+            .setTitle("RDAP Terms of Service")
+            .setDescription(rdapTos)
+            .addLink(selfLink);
+    if (rdapTosStaticUrl != null) {
       URI htmlBaseURI = URI.create(fullServletPath);
       URI htmlUri = htmlBaseURI.resolve(rdapTosStaticUrl);
-      linkBuilder.setRel("alternate").setHref(htmlUri.toString()).setType("text/html");
+      noticeBuilder.addLink(
+          Link.builder()
+              .setRel("alternate")
+              .setHref(htmlUri.toString())
+              .setType("text/html")
+              .build());
     }
-    return Notice.builder()
+    return noticeBuilder.build();
-        .setTitle("RDAP Terms of Service")
-        .setDescription(rdapTos)
-        .addLink(linkBuilder.build())
-        .build();
   }
 
   /**
@@ -314,7 +319,6 @@ public class RdapJsonFormatter {
           .add(
               Link.builder()
                   .setHref(href)
-                  .setValue(href)
                   .setRel("related")
                   .setType("application/rdap+json")
                   .build());
@@ -1078,7 +1082,6 @@ public class RdapJsonFormatter {
   private Link makeSelfLink(String type, String name) {
     String url = makeRdapServletRelativeUrl(type, name);
     return Link.builder()
-        .setValue(url)
         .setRel("self")
         .setHref(url)
         .setType("application/rdap+json")

core/src/test/java/google/registry/rdap/RdapTestHelper.java

@@ -77,7 +77,10 @@ public class RdapTestHelper {
             "links",
                 ImmutableList.of(
                     ImmutableMap.of(
-                        "value", linkBase + "help/tos",
+                        "rel", "self",
+                        "href", linkBase + "help/tos",
+                        "type", "application/rdap+json"),
+                    ImmutableMap.of(
                         "rel", "alternate",
                         "href", "https://www.registry.tld/about/rdap/tos.html",
                         "type", "text/html")))).getAsJsonObject();
@@ -125,7 +128,6 @@ public class RdapTestHelper {
                 "links",
                 ImmutableList.of(
                     ImmutableMap.of(
-                        "value", "https://icann.org/epp",
                         "rel", "alternate",
                         "href", "https://icann.org/epp",
                         "type", "text/html")))));
@@ -141,7 +143,6 @@ public class RdapTestHelper {
                 "links",
                 ImmutableList.of(
                     ImmutableMap.of(
-                        "value", "https://www.icann.org/wicf",
                         "rel", "alternate",
                         "href", "https://www.icann.org/wicf",
                         "type", "text/html")))));

core/src/test/resources/google/registry/rdap/rdap_associated_contact.json

@@ -9,7 +9,6 @@
   "status": ["active", "associated"],
   "links": [
     {
-      "value": "https://example.tld/rdap/entity/%NAME%",
       "rel": "self",
       "href": "https://example.tld/rdap/entity/%NAME%",
       "type": "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_associated_contact_no_personal_data.json

@@ -43,7 +43,6 @@
       "links": [
         {
           "type":"text\/html",
-          "value": "https:\/\/github.com\/google\/nomulus\/blob\/master\/docs\/rdap.md#authentication",
           "href": "https:\/\/github.com\/google\/nomulus\/blob\/master\/docs\/rdap.md#authentication",
           "rel": "alternate"
         }

core/src/test/resources/google/registry/rdap/rdap_contact.json

@@ -10,7 +10,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/%NAME%",
       "rel" : "self",
       "href": "https://example.tld/rdap/entity/%NAME%",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_contact_deleted.json

@@ -10,7 +10,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/%NAME%",
       "rel" : "self",
       "href": "https://example.tld/rdap/entity/%NAME%",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_contact_no_personal_data_with_remark.json

@@ -47,7 +47,6 @@
       "links" :
       [
         {
-          "value" : "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
           "rel" : "alternate",
           "href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
           "type" : "text/html"

core/src/test/resources/google/registry/rdap/rdap_domain.json

@@ -17,20 +17,17 @@
     {
       "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     }
   ],
   "events": [
@@ -61,8 +58,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%"
         }
       ],
       "remarks": [
@@ -83,8 +79,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%"
         }
       ],
       "remarks": [
@@ -120,8 +115,7 @@
         {
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/1"
         }
       ],
       "vcardArray" : [
@@ -166,8 +160,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%"
         }
       ],
       "vcardArray": [
@@ -204,8 +197,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%"
         }
       ],
       "vcardArray": [
@@ -244,8 +236,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%"
         }
       ],
       "vcardArray": [

core/src/test/resources/google/registry/rdap/rdap_domain_cat2.json

@@ -17,20 +17,17 @@
     {
       "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     }
   ],
   "events": [
@@ -61,8 +58,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%"
         }
       ],
       "remarks": [
@@ -81,8 +77,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%"
         }
       ],
       "remarks": [
@@ -103,8 +98,7 @@
         {
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/1"
         }
       ],
       "vcardArray" : [
@@ -155,8 +149,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%"
         }
       ],
       "vcardArray": [
@@ -193,8 +186,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%"
         }
       ],
       "vcardArray": [
@@ -231,8 +223,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%"
         }
       ],
       "vcardArray": [

core/src/test/resources/google/registry/rdap/rdap_domain_deleted.json

@@ -18,20 +18,17 @@
     {
       "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     }
   ],
   "events": [
@@ -67,8 +64,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%"
         }
       ],
       "remarks": [
@@ -87,8 +83,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%"
         }
       ],
       "remarks": [
@@ -115,8 +110,7 @@
         {
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/1"
         }
       ],
       "vcardArray" : [
@@ -161,8 +155,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%"
         }
       ],
       "vcardArray": [
@@ -199,8 +192,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%"
         }
       ],
       "vcardArray": [
@@ -237,8 +229,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%"
         }
       ],
       "vcardArray": [

core/src/test/resources/google/registry/rdap/rdap_domain_no_contacts_with_remark.json

@@ -17,20 +17,17 @@
     {
       "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     }
   ],
   "events": [
@@ -61,8 +58,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%"
         }
       ],
       "remarks": [
@@ -81,8 +77,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%"
         }
       ],
       "remarks": [
@@ -108,7 +103,6 @@
       "roles" : ["registrar"],
       "links" : [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"
@@ -170,8 +164,7 @@
             {
               "href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
               "rel":"alternate",
-              "type":"text/html",
+              "type":"text/html"
-              "value":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },
@@ -211,8 +204,7 @@
             {
               "href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
               "rel":"alternate",
-              "type":"text/html",
+              "type":"text/html"
-              "value":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },
@@ -253,8 +245,7 @@
             {
               "href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
               "rel":"alternate",
-              "type":"text/html",
+              "type":"text/html"
-              "value":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },

core/src/test/resources/google/registry/rdap/rdap_domain_unicode.json

@@ -18,20 +18,17 @@
     {
       "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     }
   ],
   "events": [
@@ -63,9 +60,7 @@
           "href":
               "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value":
-              "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%"
         }
       ],
       "remarks": [
@@ -85,9 +80,7 @@
           "href":
               "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value":
-              "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%"
         }
       ],
       "remarks": [
@@ -115,8 +108,7 @@
         {
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/1"
         }
       ],
       "vcardArray" : [
@@ -167,8 +159,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%"
         }
       ],
       "vcardArray": [
@@ -205,8 +196,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%"
         }
       ],
       "vcardArray": [
@@ -243,8 +233,7 @@
         {
           "href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%"
         }
       ],
       "vcardArray": [

core/src/test/resources/google/registry/rdap/rdap_domain_unicode_no_contacts_with_remark.json

@@ -18,20 +18,17 @@
     {
       "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
     }
   ],
   "events": [
@@ -63,8 +60,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%"
         }
       ],
       "remarks": [
@@ -84,8 +80,7 @@
         {
           "href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%"
         }
       ],
       "remarks": [
@@ -111,7 +106,6 @@
       "roles" : ["registrar"],
       "links" : [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"
@@ -173,8 +167,7 @@
             {
               "href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
               "rel":"alternate",
-              "type":"text/html",
+              "type":"text/html"
-              "value":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },
@@ -214,8 +207,7 @@
             {
               "href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
               "rel":"alternate",
-              "type":"text/html",
+              "type":"text/html"
-              "value":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },
@@ -256,8 +248,7 @@
             {
               "href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
               "rel":"alternate",
-              "type":"text/html",
+              "type":"text/html"
-              "value":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },

core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json

@@ -8,8 +8,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
         }
       ],
       "remarks": [
@@ -28,8 +27,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
         }
       ],
       "remarks": [
@@ -48,8 +46,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%"
         }
       ],
       "remarks": [
@@ -68,8 +65,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%"
         }
       ],
       "remarks": [
@@ -126,10 +122,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },
@@ -148,7 +148,6 @@
       "links" :
       [
         {
-          "value" :  "https://icann.org/epp",
           "rel" : "alternate",
           "href" : "https://icann.org/epp",
           "type" : "text/html"
@@ -161,7 +160,6 @@
       "links" :
       [
         {
-          "value" : "https://www.icann.org/wicf",
           "rel" : "alternate",
           "href" : "https://www.icann.org/wicf",
           "type" : "text/html"

core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json

@@ -8,8 +8,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
         }
       ],
       "remarks": [
@@ -28,8 +27,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
         }
       ],
       "remarks": [
@@ -48,8 +46,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%"
         }
       ],
       "remarks": [
@@ -69,8 +66,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%"
         }
       ],
       "remarks": [
@@ -107,10 +103,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },
@@ -129,7 +129,6 @@
       "links" :
       [
         {
-          "value" :  "https://icann.org/epp",
           "rel" : "alternate",
           "href" : "https://icann.org/epp",
           "type" : "text/html"
@@ -142,7 +141,6 @@
       "links" :
       [
         {
-          "value" : "https://www.icann.org/wicf",
           "rel" : "alternate",
           "href" : "https://www.icann.org/wicf",
           "type" : "text/html"

core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json

@@ -8,8 +8,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
         }
       ],
       "remarks": [
@@ -28,8 +27,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
         }
       ],
       "remarks": [
@@ -48,8 +46,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%"
         }
       ],
       "remarks": [
@@ -69,8 +66,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%"
         }
       ],
       "remarks": [
@@ -127,10 +123,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },
@@ -149,7 +149,6 @@
       "links" :
       [
         {
-          "value" :  "https://icann.org/epp",
           "rel" : "alternate",
           "href" : "https://icann.org/epp",
           "type" : "text/html"
@@ -162,7 +161,6 @@
       "links" :
       [
         {
-          "value" : "https://www.icann.org/wicf",
           "rel" : "alternate",
           "href" : "https://www.icann.org/wicf",
           "type" : "text/html"

core/src/test/resources/google/registry/rdap/rdap_domains_two.json

@@ -13,8 +13,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
         }
       ],
       "remarks": [
@@ -35,8 +34,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
         }
       ],
       "remarks": [
@@ -69,9 +67,13 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel": "alternate",
+          "rel": "self",
+          "type": "application/rdap+json"
+        },
+        {
           "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
           "type": "text/html"
         }
       ]
@@ -85,7 +87,6 @@
       "links":
       [
         {
-          "value":  "https://icann.org/epp",
           "rel": "alternate",
           "href": "https://icann.org/epp",
           "type": "text/html"
@@ -98,7 +99,6 @@
       "links":
       [
         {
-          "value": "https://www.icann.org/wicf",
           "rel": "alternate",
           "href": "https://www.icann.org/wicf",
           "type": "text/html"

core/src/test/resources/google/registry/rdap/rdap_error.json

@@ -25,11 +25,15 @@
         "We reserve the right to modify this agreement at any time."
       ],
       "links": [
+        {
+          "href": "https://example.tld/rdap/help/tos",
+          "rel": "self",
+          "type": "application/rdap+json"
+        },
         {
           "href": "https://www.registry.tld/about/rdap/tos.html",
           "rel": "alternate",
-          "type": "text/html",
+          "type": "text/html"
-          "value": "https://example.tld/rdap/help/tos"
         }
       ],
       "title": "RDAP Terms of Service"

core/src/test/resources/google/registry/rdap/rdap_help_index.json

@@ -25,10 +25,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help",
           "rel" : "alternate",
           "type" : "text/html",
           "href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md"
+        },
+        {
+          "rel": "self",
+          "type": "application/rdap+json",
+          "href": "https://example.tld/rdap/help"
         }
       ]
     },
@@ -50,10 +54,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     }

core/src/test/resources/google/registry/rdap/rdap_help_tos.json

@@ -24,10 +24,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     }

core/src/test/resources/google/registry/rdap/rdap_host.json

@@ -12,8 +12,7 @@
     {
       "href": "https://example.tld/rdap/nameserver/%NAME%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/nameserver/%NAME%"
     }
   ],
   "ipAddresses": {
@@ -35,7 +34,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_host_external.json

@@ -12,8 +12,7 @@
     {
       "href": "https://example.tld/rdap/nameserver/%NAME%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/nameserver/%NAME%"
     }
   ],
   "ldhName": "%NAME%",
@@ -32,7 +31,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_host_linked.json

@@ -15,8 +15,7 @@
     {
       "href": "https://example.tld/rdap/nameserver/%NAME%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/nameserver/%NAME%"
     }
   ],
   "ipAddresses": {
@@ -38,7 +37,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_host_unicode.json

@@ -13,8 +13,7 @@
     {
       "href": "https://example.tld/rdap/nameserver/%PUNYCODENAME%",
       "type": "application/rdap+json",
-      "rel": "self",
+      "rel": "self"
-      "value": "https://example.tld/rdap/nameserver/%PUNYCODENAME%"
     }
   ],
   "ipAddresses": {
@@ -36,7 +35,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json

@@ -9,7 +9,6 @@
         {
           "rel":"self",
           "href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
-          "value":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type":"application/rdap+json"
         }
       ],
@@ -32,7 +31,6 @@
         {
           "rel":"self",
           "href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
-          "value":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type":"application/rdap+json"
         }
       ],
@@ -55,7 +53,6 @@
         {
           "rel":"self",
           "href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
-          "value":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
           "type":"application/rdap+json"
         }
       ],
@@ -98,10 +95,14 @@
       "links":
       [
         {
-          "rel":"alternate",
+          "href": "https://example.tld/rdap/help/tos",
-          "href":"https://www.registry.tld/about/rdap/tos.html",
+          "rel": "self",
-          "value":"https://example.tld/rdap/help/tos",
+          "type": "application/rdap+json"
-          "type":"text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ],
       "title":"RDAP Terms of Service"
@@ -122,7 +123,6 @@
         {
           "rel":"alternate",
           "href":"https://icann.org/epp",
-          "value":"https://icann.org/epp",
           "type":"text/html"
         }
       ],
@@ -136,7 +136,6 @@
         {
           "rel":"alternate",
           "href":"https://www.icann.org/wicf",
-          "value":"https://www.icann.org/wicf",
           "type":"text/html"
         }
       ]

core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json

@@ -15,7 +15,6 @@
       ],
       "links":[
         {
-          "value":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type":"application/rdap+json",
           "rel":"self",
           "href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
@@ -37,7 +36,6 @@
       ],
       "links":[
         {
-          "value":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type":"application/rdap+json",
           "rel":"self",
           "href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
@@ -69,10 +67,14 @@
       ],
       "links":[
         {
-          "value":"https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "type":"text/html",
+          "rel": "self",
-          "rel":"alternate",
+          "type": "application/rdap+json"
-          "href":"https://www.registry.tld/about/rdap/tos.html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },
@@ -88,7 +90,6 @@
          ],
          "links":[
            {
-             "value":"https://icann.org/epp",
              "type":"text/html",
              "rel":"alternate",
              "href":"https://icann.org/epp"
@@ -100,7 +101,6 @@
       "description":["URL of the ICANN RDDS Inaccuracy Complaint Form: https://www.icann.org/wicf"],
       "links":[
         {
-          "value":"https://www.icann.org/wicf",
           "type":"text/html",
           "rel":"alternate",
           "href":"https://www.icann.org/wicf"

core/src/test/resources/google/registry/rdap/rdap_multiple_contacts.json

@@ -8,7 +8,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/2-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/2-ROID",
           "type" : "application/rdap+json"
@@ -55,7 +54,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/2-Registrar",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/2-Registrar",
           "type" : "application/rdap+json"
@@ -126,10 +124,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_multiple_contacts2.json

@@ -7,7 +7,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/4-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/4-ROID",
           "type" : "application/rdap+json"
@@ -64,7 +63,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/2-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/2-ROID",
           "type" : "application/rdap+json"
@@ -141,10 +139,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_multiple_hosts.json

@@ -8,7 +8,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/ns2.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/ns2.cat.lol"
@@ -41,7 +40,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/ns1.cat2.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/ns1.cat2.lol"
@@ -94,10 +92,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_nontruncated_contacts.json

@@ -7,7 +7,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0001-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0001-ROID",
           "type" : "application/rdap+json"
@@ -64,7 +63,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0002-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0002-ROID",
           "type" : "application/rdap+json"
@@ -121,7 +119,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0003-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0003-ROID",
           "type" : "application/rdap+json"
@@ -178,7 +175,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0004-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0004-ROID",
           "type" : "application/rdap+json"
@@ -255,10 +251,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json

@@ -8,8 +8,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
         }
       ],
       "remarks": [
@@ -30,8 +29,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
         }
       ],
       "remarks": [
@@ -52,8 +50,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%"
         }
       ],
       "remarks": [
@@ -74,8 +71,7 @@
         {
           "href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
           "type": "application/rdap+json",
-          "rel": "self",
+          "rel": "self"
-          "value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%"
         }
       ],
       "remarks": [
@@ -114,10 +110,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },
@@ -136,7 +136,6 @@
       "links" :
       [
         {
-          "value" :  "https://icann.org/epp",
           "rel" : "alternate",
           "href" : "https://icann.org/epp",
           "type" : "text/html"
@@ -149,7 +148,6 @@
       "links" :
       [
         {
-          "value" : "https://www.icann.org/wicf",
           "rel" : "alternate",
           "href" : "https://www.icann.org/wicf",
           "type" : "text/html"

core/src/test/resources/google/registry/rdap/rdap_nontruncated_hosts.json

@@ -8,7 +8,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx1.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx1.cat.lol"
@@ -41,7 +40,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx2.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx2.cat.lol"
@@ -74,7 +72,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx3.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx3.cat.lol"
@@ -107,7 +104,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx4.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx4.cat.lol"
@@ -159,10 +155,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_nontruncated_registrars.json

@@ -7,7 +7,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/301",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/301",
           "type": "application/rdap+json"
@@ -65,7 +64,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/302",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/302",
           "type": "application/rdap+json"
@@ -123,7 +121,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/303",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/303",
           "type": "application/rdap+json"
@@ -181,7 +178,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/304",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/304",
           "type": "application/rdap+json"
@@ -259,9 +255,13 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel": "alternate",
+          "rel": "self",
+          "type": "application/rdap+json"
+        },
+        {
           "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
           "type": "text/html"
         }
       ]

core/src/test/resources/google/registry/rdap/rdap_registrar.json

@@ -11,7 +11,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/%NAME%",
       "rel" : "self",
       "href": "https://example.tld/rdap/entity/%NAME%",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdap_truncated_contacts.json

@@ -7,7 +7,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/0001-ROID",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/0001-ROID",
           "type": "application/rdap+json"
@@ -64,7 +63,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/0002-ROID",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/0002-ROID",
           "type": "application/rdap+json"
@@ -121,7 +119,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/0003-ROID",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/0003-ROID",
           "type": "application/rdap+json"
@@ -178,7 +175,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/0004-ROID",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/0004-ROID",
           "type": "application/rdap+json"
@@ -275,9 +271,13 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel": "alternate",
+          "rel": "self",
+          "type": "application/rdap+json"
+        },
+        {
           "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
           "type": "text/html"
         }
       ]

core/src/test/resources/google/registry/rdap/rdap_truncated_hosts.json

@@ -8,7 +8,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx1.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx1.cat.lol"
@@ -41,7 +40,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx2.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx2.cat.lol"
@@ -74,7 +72,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx3.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx3.cat.lol"
@@ -107,7 +104,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/nameserver/nsx4.cat.lol",
           "rel" : "self",
           "type" : "application/rdap+json",
           "href" : "https://example.tld/rdap/nameserver/nsx4.cat.lol"
@@ -179,10 +175,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_truncated_mixed_entities.json

@@ -7,7 +7,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0001-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0001-ROID",
           "type" : "application/rdap+json"
@@ -64,7 +63,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0002-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0002-ROID",
           "type" : "application/rdap+json"
@@ -121,7 +119,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/0003-ROID",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/0003-ROID",
           "type" : "application/rdap+json"
@@ -178,7 +175,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/301",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/301",
           "type" : "application/rdap+json"
@@ -276,10 +272,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdap_truncated_registrars.json

@@ -7,7 +7,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/301",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/301",
           "type" : "application/rdap+json"
@@ -65,7 +64,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/302",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/302",
           "type" : "application/rdap+json"
@@ -123,7 +121,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/303",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/303",
           "type" : "application/rdap+json"
@@ -181,7 +178,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/304",
           "rel" : "self",
           "href": "https://example.tld/rdap/entity/304",
           "type" : "application/rdap+json"
@@ -279,10 +275,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdapjson_admincontact.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/4-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/4-ROID",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_domain_full.json

@@ -13,19 +13,16 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
       "rel" : "self",
       "href" : "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
       "type" : "application/rdap+json"
     },
     {
-      "value" : "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c",
       "rel" : "related",
       "href" : "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c",
       "type" : "application/rdap+json"
     },
     {
-      "value" : "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c",
       "rel" : "related",
       "href" : "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c",
       "type" : "application/rdap+json"
@@ -64,7 +61,6 @@
       "unicodeName" : "ns1.cat.みんな",
       "links" : [
         {
-          "value" : "https://example.tld/rdap/nameserver/ns1.cat.xn--q9jyb4c",
           "rel" : "self",
           "href" : "https://example.tld/rdap/nameserver/ns1.cat.xn--q9jyb4c",
           "type" : "application/rdap+json"
@@ -85,7 +81,6 @@
       "unicodeName" : "ns2.cat.みんな",
       "links" : [
         {
-          "value" : "https://example.tld/rdap/nameserver/ns2.cat.xn--q9jyb4c",
           "rel" : "self",
           "href" : "https://example.tld/rdap/nameserver/ns2.cat.xn--q9jyb4c",
           "type" : "application/rdap+json"
@@ -114,7 +109,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"
@@ -152,7 +146,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/4-ROID",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/4-ROID",
           "type" : "application/rdap+json"
@@ -203,7 +196,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/6-ROID",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/6-ROID",
           "type" : "application/rdap+json"
@@ -253,7 +245,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/2-ROID",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/2-ROID",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_domain_logged_out.json

@@ -13,7 +13,6 @@
   "links":
   [
     {
-      "value": "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
       "rel": "self",
       "href": "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
       "type": "application/rdap+json"
@@ -21,14 +20,12 @@
     {
       "href": "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c"
     }
   ],
   "events": [
@@ -63,7 +60,6 @@
       "unicodeName": "ns1.cat.みんな",
       "links": [
         {
-          "value": "https://example.tld/rdap/nameserver/ns1.cat.xn--q9jyb4c",
           "rel": "self",
           "href": "https://example.tld/rdap/nameserver/ns1.cat.xn--q9jyb4c",
           "type": "application/rdap+json"
@@ -84,7 +80,6 @@
       "unicodeName": "ns2.cat.みんな",
       "links": [
         {
-          "value": "https://example.tld/rdap/nameserver/ns2.cat.xn--q9jyb4c",
           "rel": "self",
           "href": "https://example.tld/rdap/nameserver/ns2.cat.xn--q9jyb4c",
           "type": "application/rdap+json"
@@ -111,7 +106,6 @@
       "roles": ["registrar"],
       "links": [
         {
-          "value": "https://example.tld/rdap/entity/1",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json"
@@ -157,8 +151,7 @@
             {
               "type": "text/html",
               "href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
-              "rel": "alternate",
+              "rel": "alternate"
-              "value": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },
@@ -211,8 +204,7 @@
             {
               "type": "text/html",
               "href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
-              "rel": "alternate",
+              "rel": "alternate"
-              "value": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },
@@ -265,8 +257,7 @@
             {
               "type": "text/html",
               "href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
-              "rel": "alternate",
+              "rel": "alternate"
-              "value": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
             }
           ]
         },

core/src/test/resources/google/registry/rdap/rdapjson_domain_no_nameservers.json

@@ -14,7 +14,6 @@
   "links":
   [
     {
-      "value": "https://example.tld/rdap/domain/fish.xn--q9jyb4c",
       "rel": "self",
       "href": "https://example.tld/rdap/domain/fish.xn--q9jyb4c",
       "type": "application/rdap+json"
@@ -22,14 +21,12 @@
     {
       "href": "https://rdap.example.com/withSlash/domain/fish.xn--q9jyb4c",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withSlash/domain/fish.xn--q9jyb4c"
     },
     {
       "href": "https://rdap.example.com/withoutSlash/domain/fish.xn--q9jyb4c",
       "type": "application/rdap+json",
-      "rel": "related",
+      "rel": "related"
-      "value": "https://rdap.example.com/withoutSlash/domain/fish.xn--q9jyb4c"
     }
   ],
   "events": [
@@ -60,7 +57,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/1",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json"
@@ -97,7 +93,6 @@
       "roles": ["administrative", "technical", "registrant"],
       "links": [
         {
-          "value": "https://example.tld/rdap/entity/2-ROID",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/2-ROID",
           "type": "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_domain_summary.json

@@ -5,7 +5,6 @@
   "unicodeName": "cat.みんな",
   "links": [
     {
-      "value": "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
       "rel": "self",
       "href": "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
       "type": "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_both.json

@@ -7,7 +7,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/nameserver/ns3.cat.xn--q9jyb4c",
       "rel" : "self",
       "href" : "https://example.tld/rdap/nameserver/ns3.cat.xn--q9jyb4c",
       "type" : "application/rdap+json"
@@ -32,7 +31,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_both_summary.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/nameserver/ns3.cat.xn--q9jyb4c",
       "rel" : "self",
       "href" : "https://example.tld/rdap/nameserver/ns3.cat.xn--q9jyb4c",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_ipv4.json

@@ -7,7 +7,6 @@
   "links":
   [
     {
-      "value": "https://example.tld/rdap/nameserver/ns1.cat.xn--q9jyb4c",
       "rel": "self",
       "href": "https://example.tld/rdap/nameserver/ns1.cat.xn--q9jyb4c",
       "type": "application/rdap+json"
@@ -28,7 +27,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/1",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_ipv6.json

@@ -7,7 +7,6 @@
   "links":
   [
     {
-      "value": "https://example.tld/rdap/nameserver/ns2.cat.xn--q9jyb4c",
       "rel": "self",
       "href": "https://example.tld/rdap/nameserver/ns2.cat.xn--q9jyb4c",
       "type": "application/rdap+json"
@@ -28,7 +27,6 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/entity/1",
           "rel": "self",
           "href": "https://example.tld/rdap/entity/1",
           "type": "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_no_addresses.json

@@ -7,7 +7,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/nameserver/ns4.cat.xn--q9jyb4c",
       "rel" : "self",
       "href" : "https://example.tld/rdap/nameserver/ns4.cat.xn--q9jyb4c",
       "type" : "application/rdap+json"
@@ -27,7 +26,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_not_linked.json

@@ -7,7 +7,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/nameserver/ns5.cat.xn--q9jyb4c",
       "rel" : "self",
       "href" : "https://example.tld/rdap/nameserver/ns5.cat.xn--q9jyb4c",
       "type" : "application/rdap+json"
@@ -27,7 +26,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_host_pending_transfer.json

@@ -7,7 +7,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/nameserver/ns1.dog.xn--q9jyb4c",
       "rel" : "self",
       "href" : "https://example.tld/rdap/nameserver/ns1.dog.xn--q9jyb4c",
       "type" : "application/rdap+json"
@@ -27,7 +26,6 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/entity/1",
           "rel" : "self",
           "href" : "https://example.tld/rdap/entity/1",
           "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_notice_self_link.json

@@ -9,7 +9,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/help/index",
       "rel" : "self",
       "type" : "application/rdap+json",
       "href" : "https://example.tld/rdap/help/index"

core/src/test/resources/google/registry/rdap/rdapjson_registrant.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/2-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/2-ROID",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_registrant_logged_out.json

@@ -44,8 +44,7 @@
         {
           "type": "text/html",
           "href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
-          "rel": "alternate",
+          "rel": "alternate"
-          "value": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication"
         }
       ]
     },

core/src/test/resources/google/registry/rdap/rdapjson_registrant_nobase.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "entity/2-ROID",
       "rel" : "self",
       "href" : "entity/2-ROID",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_registrant_summary.json

@@ -5,7 +5,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/2-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/2-ROID",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_registrant_summary_logged_out.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/2-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/2-ROID",
       "type" : "application/rdap+json"
@@ -42,7 +41,6 @@
       "links" :
       [
         {
-          "value" : "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
           "rel" : "alternate",
           "href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
           "type" : "text/html"

core/src/test/resources/google/registry/rdap/rdapjson_registrar.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/1",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/1",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_registrar_summary.json

@@ -5,7 +5,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/1",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/1",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_rolelesscontact.json

@@ -5,7 +5,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/6-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/6-ROID",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_techcontact.json

@@ -6,7 +6,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/6-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/6-ROID",
       "type" : "application/rdap+json"

core/src/test/resources/google/registry/rdap/rdapjson_toplevel.json

@@ -25,10 +25,14 @@
       "links" :
       [
         {
-          "value" : "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel" : "alternate",
+          "rel": "self",
-          "href" : "https://www.registry.tld/about/rdap/tos.html",
+          "type": "application/rdap+json"
-          "type" : "text/html"
+        },
+        {
+          "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
+          "type": "text/html"
         }
       ]
     }

core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json

@@ -25,9 +25,13 @@
       "links":
       [
         {
-          "value": "https://example.tld/rdap/help/tos",
+          "href": "https://example.tld/rdap/help/tos",
-          "rel": "alternate",
+          "rel": "self",
+          "type": "application/rdap+json"
+        },
+        {
           "href": "https://www.registry.tld/about/rdap/tos.html",
+          "rel": "alternate",
           "type": "text/html"
         }
       ]
@@ -47,7 +51,6 @@
       "links":
       [
         {
-          "value":  "https://icann.org/epp",
           "rel": "alternate",
           "href": "https://icann.org/epp",
           "type": "text/html"
@@ -60,7 +63,6 @@
       "links":
       [
         {
-          "value": "https://www.icann.org/wicf",
           "rel": "alternate",
           "href": "https://www.icann.org/wicf",
           "type": "text/html"

core/src/test/resources/google/registry/rdap/rdapjson_unlinkedcontact.json

@@ -5,7 +5,6 @@
   "links" :
   [
     {
-      "value" : "https://example.tld/rdap/entity/8-ROID",
       "rel" : "self",
       "href" : "https://example.tld/rdap/entity/8-ROID",
       "type" : "application/rdap+json"