diff --git a/spring-web-modules/spring-rest-http/pom.xml b/spring-web-modules/spring-rest-http/pom.xml index 5a92b585e3..8d3ea82c44 100644 --- a/spring-web-modules/spring-rest-http/pom.xml +++ b/spring-web-modules/spring-rest-http/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-boot-2 + parent-boot-3 0.0.1-SNAPSHOT - ../../parent-boot-2 + ../../parent-boot-3 @@ -54,11 +54,30 @@ json-patch ${jsonpatch.version} + + org.apache.httpcomponents.client5 + httpclient5 + ${httpclient5.version} + test + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + 1.4.9 1.12 + 5.2.1 \ No newline at end of file diff --git a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/FilterResponseHeaderController.java b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/FilterResponseHeaderController.java index c92d4afafd..7a650a3e05 100644 --- a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/FilterResponseHeaderController.java +++ b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/FilterResponseHeaderController.java @@ -1,22 +1,22 @@ package com.baeldung.responseheaders.controllers; -import javax.servlet.http.HttpServletResponse; - import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletResponse; + @RestController @RequestMapping("/filter-response-header") public class FilterResponseHeaderController { @GetMapping("/no-extra-header") - public String FilterHeaderResponseWithNoExtraHeader() { + public String filterHeaderResponseWithNoExtraHeader() { return "Response body with Filter header and no extra header"; } @GetMapping("/extra-header") - public String FilterHeaderResponseWithExtraHeader(HttpServletResponse response) { + public String filterHeaderResponseWithExtraHeader(HttpServletResponse response) { response.addHeader("Baeldung-Example-Header", "Value-ExtraHeader"); return "Response body with Filter header and one extra header"; } diff --git a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/ResponseHeaderController.java b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/ResponseHeaderController.java index d93964b815..dab6467ec7 100644 --- a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/ResponseHeaderController.java +++ b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/controllers/ResponseHeaderController.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/filter/AddResponseHeaderFilter.java b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/filter/AddResponseHeaderFilter.java index 7d4ffb1391..7820f6c650 100644 --- a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/filter/AddResponseHeaderFilter.java +++ b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/responseheaders/filter/AddResponseHeaderFilter.java @@ -2,18 +2,18 @@ package com.baeldung.responseheaders.filter; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; + @WebFilter("/filter-response-header/*") public class AddResponseHeaderFilter implements Filter { diff --git a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/web/controller/customer/CustomerRestController.java b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/web/controller/customer/CustomerRestController.java index edae10de27..061c5eb3e4 100644 --- a/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/web/controller/customer/CustomerRestController.java +++ b/spring-web-modules/spring-rest-http/src/main/java/com/baeldung/web/controller/customer/CustomerRestController.java @@ -23,8 +23,6 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import java.net.URI; -import javax.validation.Valid; - @RestController @RequestMapping(value = "/customers") public class CustomerRestController { @@ -40,25 +38,28 @@ public class CustomerRestController { public ResponseEntity createCustomer(@RequestBody Customer customer) { Customer customerCreated = customerService.createCustomer(customer); URI location = ServletUriComponentsBuilder.fromCurrentRequest() - .path("/{id}") - .buildAndExpand(customerCreated.getId()) - .toUri(); - return ResponseEntity.created(location).build(); + .path("/{id}") + .buildAndExpand(customerCreated.getId()) + .toUri(); + return ResponseEntity.created(location) + .build(); } @PatchMapping(path = "/{id}", consumes = "application/json-patch+json") - public ResponseEntity updateCustomer(@PathVariable String id, - @RequestBody JsonPatch patch) { + public ResponseEntity updateCustomer(@PathVariable String id, @RequestBody JsonPatch patch) { try { - Customer customer = customerService.findCustomer(id).orElseThrow(CustomerNotFoundException::new); + Customer customer = customerService.findCustomer(id) + .orElseThrow(CustomerNotFoundException::new); Customer customerPatched = applyPatchToCustomer(patch, customer); customerService.updateCustomer(customerPatched); return ResponseEntity.ok(customerPatched); } catch (CustomerNotFoundException e) { - return ResponseEntity.status(HttpStatus.NOT_FOUND).build(); + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .build(); } catch (JsonPatchException | JsonProcessingException e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .build(); } }