Fix paths

statisticsnorway · Jan 15, 2024 · 129be76 · 129be76
1 parent d8ce91f
commit 129be76
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 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
@@ -84,7 +84,7 @@
 @RestController
 // NOTE: CrossOrigin config moved to KlassSecurityConfiguration
 // due to conditional behavior where some requests didn't get CORS headers and cause cache problems
-@RequestMapping(value = { RestConstants.API_VERSION_V1,"/api/klass"+RestConstants.API_VERSION_V1, "/rest/v1" })
+@RequestMapping(value = {"/api/klass"+RestConstants.API_VERSION_V1, RestConstants.API_VERSION_V1, "/rest/v1" })
 public class ClassificationController {
     private static final Logger log = LoggerFactory.getLogger(ClassificationController.class);
     private final ClassificationService classificationService;

diff --git a/klass-api/src/main/java/no/ssb/klass/api/controllers/MonitorController.java b/klass-api/src/main/java/no/ssb/klass/api/controllers/MonitorController.java
@@ -43,10 +43,10 @@ public class MonitorController {
     private SearchService searchService;
 
     @RequestMapping(value = {
+            "/api/klass" + MonitorController.PATH,
+            "/api/klass" + MonitorController.PATH + "/",
             MonitorController.PATH,
             MonitorController.PATH + "/",
-            "/api/klass" + MonitorController.PATH,
-            "/api/klass" + MonitorController.PATH + "/"
     }, method = RequestMethod.GET)
     public String render(HttpServletRequest request, ModelMap model) {
 

diff --git a/klass-api/src/main/java/no/ssb/klass/api/controllers/PingController.java b/klass-api/src/main/java/no/ssb/klass/api/controllers/PingController.java
@@ -18,10 +18,10 @@ public class PingController {
 
     @ResponseBody
     @RequestMapping(value = {
-            PingController.PATH,
-            PingController.PATH + "/",
             "/api/klass" + PingController.PATH,
-            "/api/klass" + PingController.PATH + "/"
+            "/api/klass" + PingController.PATH + "/",
+            PingController.PATH,
+            PingController.PATH + "/"
     }, method = RequestMethod.GET, produces = "application/xml")
     public String ping() {
         return "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"

diff --git a/klass-api/src/main/java/no/ssb/klass/api/dto/hal/KlassResource.java b/klass-api/src/main/java/no/ssb/klass/api/dto/hal/KlassResource.java
@@ -4,8 +4,6 @@
 import org.springframework.hateoas.Links;
 import org.springframework.hateoas.PagedModel;
 import org.springframework.hateoas.RepresentationModel;
-import org.springframework.hateoas.UriTemplate;
-import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;