Specifying the right rel for landing page links

geoserver · Aug 6, 2018 · 38cb61f · 38cb61f
1 parent 100ed56
commit 38cb61f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/src/community/wfs3/src/main/java/org/geoserver/wfs3/response/LandingPageDocument.java b/src/community/wfs3/src/main/java/org/geoserver/wfs3/response/LandingPageDocument.java
@@ -49,31 +49,31 @@ public LandingPageDocument(LandingPageRequest request, WFSInfo wfs, Catalog cata
                         link.setRel(Link.REL_SELF);
                         link.setTitle("This document");
                     }
-                });
+                }, Link.REL_ALTERNATE);
         // api
         addLinksFor(
                 baseUrl,
                 "wfs3/api",
                 OpenAPI.class,
                 "API definition for this endpoint as ",
                 "api",
-                null);
+                null, Link.REL_SERVICE);
         // conformance
         addLinksFor(
                 baseUrl,
                 "wfs3/conformance",
                 ConformanceDocument.class,
                 "Conformance declaration as ",
                 "conformance",
-                null);
+                null, "conformance");
         // collections
         addLinksFor(
                 baseUrl,
                 "wfs3/collections",
                 CollectionsDocument.class,
                 "Collections Metadata as ",
                 "collections",
-                null);
+                null, "data");
     }
 
     /** Builds service links for the given response types */
@@ -83,13 +83,12 @@ private void addLinksFor(
             Class<?> responseType,
             String titlePrefix,
             String classification,
-            BiConsumer<String, Link> linkUpdater) {
+            BiConsumer<String, Link> linkUpdater, String rel) {
         for (String format : DefaultWebFeatureService30.getAvailableFormats(responseType)) {
             Map<String, String> params = Collections.singletonMap("f", format);
             String url = buildURL(baseUrl, path, params, URLMangler.URLType.SERVICE);
-            String linkType = Link.REL_SERVICE;
             String linkTitle = titlePrefix + format;
-            Link link = new Link(url, linkType, format, linkTitle);
+            Link link = new Link(url, rel, format, linkTitle);
             link.setClassification(classification);
             if (linkUpdater != null) {
                 linkUpdater.accept(format, link);

diff --git a/src/community/wfs3/src/main/resources/org/geoserver/wfs3/response/landingPage.ftl b/src/community/wfs3/src/main/resources/org/geoserver/wfs3/response/landingPage.ftl
@@ -9,7 +9,7 @@
        </p>
 
        <h2>API definition</h2>
-       <p>The <a id="jsonApiLink" href="${model.getLinkUrl('api', 'text/html')!}"> API document</a> provides a machine processable description of this service API conformant to OpenAPI 3. 
+       <p>The <a id="htmlApiLink" href="${model.getLinkUrl('api', 'text/html')!}"> API document</a> provides a machine processable description of this service API conformant to OpenAPI 3. 
        <br/> 
        This API document is also available as
        <#list model.getLinksExcept("api", "application/json") as link><a href="${link.href}">${link.type}</a><#if link_has_next>, </#if></#list>.

diff --git a/src/community/wfs3/src/test/java/org/geoserver/wfs3/LandingPageTest.java b/src/community/wfs3/src/test/java/org/geoserver/wfs3/LandingPageTest.java
@@ -8,11 +8,13 @@
 import static org.junit.Assert.assertThat;
 
 import com.jayway.jsonpath.DocumentContext;
-import java.util.List;
+
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
+import java.util.List;
+
 public class LandingPageTest extends WFS3TestSupport {
 
     @Test
@@ -43,9 +45,9 @@ private void checkJSONLandingPage(DocumentContext json) {
         assertJSONList(
                 json,
                 "links[?(@.type != 'application/json' && @.href =~ /.*wfs3\\/\\?.*/)].rel",
-                "service",
+                "alternate",
-                "service",
+                "alternate",
-                "service");
+                "alternate");
         // check API links
         assertJSONList(
                 json,
@@ -58,17 +60,17 @@ private void checkJSONLandingPage(DocumentContext json) {
         assertJSONList(
                 json,
                 "links[?(@.href =~ /.*wfs3\\/conformance.*/)].rel",
-                "service",
+                "conformance",
-                "service",
+                "conformance",
-                "service");
+                "conformance");
         // check collection links
         assertJSONList(
                 json,
                 "links[?(@.href =~ /.*wfs3\\/collections.*/)].rel",
-                "service",
+                "data",
-                "service",
+                "data",
-                "service",
+                "data",
-                "service");
+                "data");
     }
 
     private <T> void assertJSONList(DocumentContext json, String path, T... expected) {
@@ -104,7 +106,7 @@ public void testLandingPageHTML() throws Exception {
                 "http://localhost:8080/geoserver/wfs3/collections?f=text%2Fhtml",
                 document.select("#htmlCollectionsLink").attr("href"));
         assertEquals(
-                "http://localhost:8080/geoserver/wfs3/api?f=application%2Fjson",
+                "http://localhost:8080/geoserver/wfs3/api?f=text%2Fhtml",
-                document.select("#jsonApiLink").attr("href"));
+                document.select("#htmlApiLink").attr("href"));
     }
 }