document reference updates

tomhrr · tomhrr · commit 2bc36ab1b131 · 2015-03-30T13:22:45.000+10:00
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/AsEventActor.java b/src/main/java/net/apnic/rdap/conformance/attributetest/AsEventActor.java
@@ -26,7 +26,7 @@ public boolean run(final Context context, final Result proto,
                        final Map<String, Object> argData) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("5.1");
 
         AttributeTest arrayTest =
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Country.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Country.java
@@ -38,7 +38,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("country");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("3");
 
         String countryValue =
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java b/src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java
@@ -72,7 +72,7 @@ public boolean run(final Context context, final Result proto,
          * section 3 is likely to be the most helpful part of the
          * document in the event of failure anyway. */
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("3");
 
         boolean res = true;
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Entities.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Entities.java
@@ -32,7 +32,7 @@ public boolean run(final Context context, final Result proto,
         /* Only set the reference if it is not already set, since the
          * entities attribute is described separately for each object. */
         if (nr.getDocument() == null) {
-            nr.setDocument("draft-ietf-weirds-json-response-14");
+            nr.setDocument("rfc7483");
             nr.setReference("5.1");
         }
 
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Entity.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Entity.java
@@ -73,7 +73,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("5.1");
 
         String responseHandle =
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Event.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Event.java
@@ -47,7 +47,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.5");
 
         boolean eacres = true;
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Events.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Events.java
@@ -28,7 +28,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.5");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Lang.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Lang.java
@@ -32,7 +32,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("lang");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.4");
 
         String lang = Utils.getStringAttribute(context,
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Link.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Link.java
@@ -37,7 +37,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.2");
 
         boolean success = true;
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Links.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Links.java
@@ -28,7 +28,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.2");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Nameserver.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Nameserver.java
@@ -49,7 +49,7 @@ public boolean run(final Context context, final Result proto,
                        final Map<String, Object> data) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("5.2");
 
         SearchTest domainNames = new DomainNames();
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Notices.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Notices.java
@@ -44,7 +44,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.3");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Port43.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Port43.java
@@ -39,7 +39,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.7");
 
         String port43 = Utils.getStringAttribute(context, nr, "port43",
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/PublicIds.java b/src/main/java/net/apnic/rdap/conformance/attributetest/PublicIds.java
@@ -29,7 +29,7 @@ public boolean run(final Context context, final Result proto,
 
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.8");
 
         return arrayTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/RdapConformance.java b/src/main/java/net/apnic/rdap/conformance/attributetest/RdapConformance.java
@@ -34,7 +34,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("rdapConformance");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.1");
 
         Result nr1 = new Result(nr);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/ResultsTruncated.java b/src/main/java/net/apnic/rdap/conformance/attributetest/ResultsTruncated.java
@@ -33,7 +33,7 @@ public boolean run(final Context context, final Result proto,
                        final Map<String, Object> data) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-07");
+        nr.setDocument("rfc7483");
         nr.setReference("10");
 
         Object rt = Utils.getAttribute(context, nr,
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Status.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Status.java
@@ -50,7 +50,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("status");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("4.6");
 
         Result nr1 = new Result(nr);
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/UnknownAttributes.java b/src/main/java/net/apnic/rdap/conformance/attributetest/UnknownAttributes.java
@@ -46,7 +46,7 @@ public boolean run(final Context context, final Result proto,
                        final Map<String, Object> data) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("2.1");
 
         boolean success = true;
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/Variant.java b/src/main/java/net/apnic/rdap/conformance/attributetest/Variant.java
@@ -31,7 +31,7 @@ public boolean run(final Context context, final Result proto,
                        final Object argData) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("5.3");
 
         /* In 6.3, regarding idnTable, the document has 'the name of
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/VariantName.java b/src/main/java/net/apnic/rdap/conformance/attributetest/VariantName.java
@@ -30,7 +30,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("status");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("5.3");
 
         return Utils.runTestList(
diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/VariantRelation.java b/src/main/java/net/apnic/rdap/conformance/attributetest/VariantRelation.java
@@ -31,7 +31,7 @@ public boolean run(final Context context, final Result proto,
         Result nr = new Result(proto);
         nr.setCode("content");
         nr.addNode("status");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("5.3");
 
         return arrayAttributeTest.run(context, nr, data);
diff --git a/src/main/java/net/apnic/rdap/conformance/test/autnum/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/autnum/Standard.java
@@ -86,7 +86,7 @@ public boolean run() {
         Result proto = new Result(Result.Status.Notification, path,
                                   "autnum.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-14",
+                                  "rfc7483",
                                   "5.5");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
diff --git a/src/main/java/net/apnic/rdap/conformance/test/common/Search.java b/src/main/java/net/apnic/rdap/conformance/test/common/Search.java
@@ -106,7 +106,7 @@ public boolean run() {
         Result proto = new Result(Status.Notification, path,
                                   testName,
                                   "", "",
-                                  "draft-ietf-weirds-json-response-14",
+                                  "rfc7483",
                                   "8");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
diff --git a/src/main/java/net/apnic/rdap/conformance/test/domain/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/domain/Standard.java
@@ -86,7 +86,7 @@ public boolean run() {
         Result proto = new Result(Status.Notification, path,
                                   "domain.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-14",
+                                  "rfc7483",
                                   "5.3");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
diff --git a/src/main/java/net/apnic/rdap/conformance/test/entity/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/entity/Standard.java
@@ -70,7 +70,7 @@ public boolean run() {
         Result proto = new Result(Status.Notification, path,
                                   "entity.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-14",
+                                  "rfc7483",
                                   "5.1");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
diff --git a/src/main/java/net/apnic/rdap/conformance/test/help/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/help/Standard.java
@@ -59,8 +59,8 @@ public boolean run() {
         Result proto = new Result(Result.Status.Notification, path,
                                   "help",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-14",
-                                  "8");
+                                  "rfc7483",
+                                  "7");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
                                   HttpStatus.SC_OK, throwable);
diff --git a/src/main/java/net/apnic/rdap/conformance/test/ip/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/ip/Standard.java
@@ -84,7 +84,7 @@ public boolean run() {
         Result proto = new Result(Result.Status.Notification, path,
                                   "ip.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-14",
+                                  "rfc7483",
                                   "5.4");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
diff --git a/src/main/java/net/apnic/rdap/conformance/test/nameserver/Standard.java b/src/main/java/net/apnic/rdap/conformance/test/nameserver/Standard.java
@@ -88,7 +88,7 @@ public boolean run() {
         Result proto = new Result(Status.Notification, path,
                                   "nameserver.standard",
                                   "content", "",
-                                  "draft-ietf-weirds-json-response-14",
+                                  "rfc7483",
                                   "5.2");
         Map<String, Object> data =
             Utils.processResponse(context, httpResponse, proto,
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/Date.java b/src/main/java/net/apnic/rdap/conformance/valuetest/Date.java
@@ -29,7 +29,7 @@ public boolean run(final Context context, final Result proto,
                        final Object argData) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("3");
 
         String date = Utils.castToString(argData);
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/EventAction.java b/src/main/java/net/apnic/rdap/conformance/valuetest/EventAction.java
@@ -35,7 +35,7 @@ public EventAction() { }
     public boolean run(final Context context, final Result proto,
                        final Object data) {
         Result r = new Result(proto);
-        r.setDocument("draft-ietf-weirds-json-response-14");
+        r.setDocument("rfc7483");
         r.setReference("10.2.3");
         return stringSet.run(context, r, data);
     }
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/IPv4Address.java b/src/main/java/net/apnic/rdap/conformance/valuetest/IPv4Address.java
@@ -24,7 +24,7 @@ public boolean run(final Context context, final Result proto,
                        final Object argData) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("3");
 
         String ipv4Address = Utils.castToString(argData);
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/IPv6Address.java b/src/main/java/net/apnic/rdap/conformance/valuetest/IPv6Address.java
@@ -24,7 +24,7 @@ public boolean run(final Context context, final Result proto,
                        final Object argData) {
         Result nr = new Result(proto);
         nr.setCode("content");
-        nr.setDocument("draft-ietf-weirds-json-response-14");
+        nr.setDocument("rfc7483");
         nr.setReference("3");
 
         String ipv6Address = Utils.castToString(argData);
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/NoticeType.java b/src/main/java/net/apnic/rdap/conformance/valuetest/NoticeType.java
@@ -34,7 +34,7 @@ public NoticeType() { }
     public boolean run(final Context context, final Result proto,
                        final Object data) {
         Result r = new Result(proto);
-        r.setDocument("draft-ietf-weirds-json-response-14");
+        r.setDocument("rfc7483");
         r.setReference("10.2.1");
         return stringSet.run(context, proto, data);
     }
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/Role.java b/src/main/java/net/apnic/rdap/conformance/valuetest/Role.java
@@ -37,7 +37,7 @@ public Role() { }
     public boolean run(final Context context, final Result proto,
                        final Object data) {
         Result r = new Result(proto);
-        r.setDocument("draft-ietf-weirds-json-response-14");
+        r.setDocument("rfc7483");
         r.setReference("10.2.4");
         return stringSet.run(context, r, data);
     }
diff --git a/src/main/java/net/apnic/rdap/conformance/valuetest/VariantRelation.java b/src/main/java/net/apnic/rdap/conformance/valuetest/VariantRelation.java
@@ -31,7 +31,7 @@ public VariantRelation() { }
     public boolean run(final Context context, final Result proto,
                        final Object data) {
         Result r = new Result(proto);
-        r.setDocument("draft-ietf-weirds-json-response-14");
+        r.setDocument("rfc7483");
         r.setReference("10.2.5");
         return stringSet.run(context, proto, data);
     }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public boolean run(final Context context, final Result proto,`
`32`	`32`	`/* Only set the reference if it is not already set, since the`
`33`	`33`	`* entities attribute is described separately for each object. */`
`34`	`34`	`if (nr.getDocument() == null) {`
`35`		`- nr.setDocument("draft-ietf-weirds-json-response-14");`
	`35`	`+ nr.setDocument("rfc7483");`
`36`	`36`	`nr.setReference("5.1");`
`37`	`37`	`}`
`38`	`38`