Fix basepath links

statisticsnorway · Jan 15, 2024 · 59d67ec · 59d67ec
1 parent 196537c
commit 59d67ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/klass-api/src/main/java/no/ssb/klass/api/controllers/ClassificationController.java b/klass-api/src/main/java/no/ssb/klass/api/controllers/ClassificationController.java
@@ -546,8 +546,7 @@ public ResponseEntity<String> verifyTracking(@PathVariable String email, @PathVa
     private void addSearchLink(PagedModel<ClassificationSummaryResource> response) {
         WebMvcLinkBuilder linkBuilder = WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(ClassificationController.class).search("query", null, true,
                 null, null));
-        response.add(Link.of(ResourceUtil.createUriTemplateBuilder(linkBuilder)
-                .basePath(basePath).variables("query", "includeCodelists").build(), "search"));
+        response.add(Link.of(ResourceUtil.createUriTemplateBuilder(linkBuilder).variables("query", "includeCodelists").build(), "search"));
     }
 
 

diff --git a/klass-api/src/test/java/no/ssb/klass/api/dto/hal/ResourceUtilTest.java b/klass-api/src/test/java/no/ssb/klass/api/dto/hal/ResourceUtilTest.java
@@ -12,14 +12,16 @@ public void createSearchLinkUsingTemplate() {
         WebMvcLinkBuilder linkBuilder = WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(ClassificationController.class)
                 .search("query", null, true, null, null));
         String link = ResourceUtil.createUriTemplate(linkBuilder, "query", "includeCodelists").toString();
-        assertTrue(link.endsWith("/v1/classifications/search{?query,includeCodelists}"));
+        link = link.replace("http://localhost", "");
+        assertEquals("/api/klass/v1/classifications/search{?query,includeCodelists}", link);
     }
     @Test
     public void createSearchLinkWithPathSubstitution() {
         WebMvcLinkBuilder linkBuilder = WebMvcLinkBuilder.linkTo(WebMvcLinkBuilder.methodOn(ClassificationController.class)
                 .search("query", null, true, null, null));
-        String link = ResourceUtil.createUriTemplateBuilder(linkBuilder).basePath("/api/klass/")
+        String link = ResourceUtil.createUriTemplateBuilder(linkBuilder)
                 .variables("query", "includeCodelists").build().toString();
-        assertTrue(link.endsWith("/api/klass/v1/classifications/search{?query,includeCodelists}"));
+        link = link.replace("http://localhost", "");
+        assertEquals("/api/klass/v1/classifications/search{?query,includeCodelists}", link);
     }
 }