diff --git a/spring-rest/src/main/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeController.java b/spring-rest/src/main/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeController.java index 72affe2e91..410c72d34f 100644 --- a/spring-rest/src/main/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeController.java +++ b/spring-rest/src/main/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeController.java @@ -1,23 +1,20 @@ package org.baeldung.web.controller.mediatypes; import org.baeldung.web.dto.BaeldungItem; -import org.baeldung.web.dto.BaeldungItemSecondVersion; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.baeldung.web.dto.BaeldungItemV2; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping(value = "/", produces = "application/vnd.baeldung.api.v1+json") public class CustomMediaTypeController { - @RequestMapping(method = RequestMethod.GET, value = "/public/api/endpoint", produces = "application/vnd.baeldung.api.v1+json") - public @ResponseBody BaeldungItem getItem() { + @RequestMapping(method = RequestMethod.GET, value = "/public/api/items/{id}", produces = "application/vnd.baeldung.api.v1+json") + public @ResponseBody BaeldungItem getItem(@PathVariable("id") String id) { return new BaeldungItem("itemId1"); } - @RequestMapping(method = RequestMethod.GET, value = "/public/api/endpoint", produces = "application/vnd.baeldung.api.v2+json") - public @ResponseBody BaeldungItemSecondVersion getItemSecondAPIVersion() { - return new BaeldungItemSecondVersion("itemName"); + @RequestMapping(method = RequestMethod.GET, value = "/public/api/items/{id}", produces = "application/vnd.baeldung.api.v2+json") + public @ResponseBody BaeldungItemV2 getItemSecondAPIVersion(@PathVariable("id") String id) { + return new BaeldungItemV2("itemName"); } } diff --git a/spring-rest/src/main/java/org/baeldung/web/dto/BaeldungItemSecondVersion.java b/spring-rest/src/main/java/org/baeldung/web/dto/BaeldungItemV2.java similarity index 64% rename from spring-rest/src/main/java/org/baeldung/web/dto/BaeldungItemSecondVersion.java rename to spring-rest/src/main/java/org/baeldung/web/dto/BaeldungItemV2.java index d4af3cf0e9..64df20a14e 100644 --- a/spring-rest/src/main/java/org/baeldung/web/dto/BaeldungItemSecondVersion.java +++ b/spring-rest/src/main/java/org/baeldung/web/dto/BaeldungItemV2.java @@ -1,10 +1,10 @@ package org.baeldung.web.dto; -public class BaeldungItemSecondVersion { +public class BaeldungItemV2 { private final String itemName; - public BaeldungItemSecondVersion(String itemName) { + public BaeldungItemV2(String itemName) { this.itemName = itemName; } diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java index 81348c07a3..e8d5ff9f17 100644 --- a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java @@ -19,7 +19,7 @@ public class CustomMediaTypeControllerLiveTest { given() .accept("application/vnd.baeldung.api.v1+json") .when() - .get(URL_PREFIX + "/public/api/endpoint") + .get(URL_PREFIX + "/public/api/items/1") .then() .contentType(ContentType.JSON).and().statusCode(200); } @@ -30,7 +30,7 @@ public class CustomMediaTypeControllerLiveTest { given() .accept("application/vnd.baeldung.api.v2+json") .when() - .get(URL_PREFIX + "/public/api/endpoint") + .get(URL_PREFIX + "/public/api/items/2") .then() .contentType(ContentType.JSON).and().statusCode(200); } diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerTest.java index e5f44e58a7..a38177f78b 100644 --- a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerTest.java @@ -32,11 +32,11 @@ public class CustomMediaTypeControllerTest { @Test public void givenServiceUrl_whenGetWithProperAcceptHeaderFirstAPIVersion_thenReturn200() throws Exception { - mockMvc.perform(get("/public/api/endpoint").accept("application/vnd.baeldung.api.v1+json")).andExpect(status().isOk()); + mockMvc.perform(get("/public/api/items/1").accept("application/vnd.baeldung.api.v1+json")).andExpect(status().isOk()); } @Test public void givenServiceUrl_whenGetWithProperAcceptHeaderSecondVersion_thenReturn200() throws Exception { - mockMvc.perform(get("/public/api/endpoint").accept("application/vnd.baeldung.api.v2+json")).andExpect(status().isOk()); + mockMvc.perform(get("/public/api/items/2").accept("application/vnd.baeldung.api.v2+json")).andExpect(status().isOk()); } } \ No newline at end of file