From 3009c7db28665f1c31e4d63e9c897a06bcce36a3 Mon Sep 17 00:00:00 2001 From: Sam Hieken <99104112+sam-hieken@users.noreply.github.com> Date: Sat, 9 Aug 2025 17:39:57 -0400 Subject: [PATCH 1/3] Changed Class parameters to Type for getForObject and getForEntity methods Signed-off-by: Sam Hieken --- .../springframework/web/client/RestTemplate.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 7b8558a51e30..a8d2becc1b81 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -297,7 +297,7 @@ public void setObservationConvention(ClientRequestObservationConvention observat // GET @Override - public @Nullable T getForObject(String url, Class responseType, @Nullable Object... uriVariables) throws RestClientException { + public @Nullable T getForObject(String url, Type responseType, @Nullable Object... uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); HttpMessageConverterExtractor responseExtractor = new HttpMessageConverterExtractor<>(responseType, getMessageConverters(), logger); @@ -305,7 +305,7 @@ public void setObservationConvention(ClientRequestObservationConvention observat } @Override - public @Nullable T getForObject(String url, Class responseType, Map uriVariables) throws RestClientException { + public @Nullable T getForObject(String url, Type responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); HttpMessageConverterExtractor responseExtractor = new HttpMessageConverterExtractor<>(responseType, getMessageConverters(), logger); @@ -313,7 +313,7 @@ public void setObservationConvention(ClientRequestObservationConvention observat } @Override - public @Nullable T getForObject(URI url, Class responseType) throws RestClientException { + public @Nullable T getForObject(URI url, Type responseType) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); HttpMessageConverterExtractor responseExtractor = new HttpMessageConverterExtractor<>(responseType, getMessageConverters(), logger); @@ -321,7 +321,7 @@ public void setObservationConvention(ClientRequestObservationConvention observat } @Override - public ResponseEntity getForEntity(String url, Class responseType, @Nullable Object... uriVariables) + public ResponseEntity getForEntity(String url, Type responseType, @Nullable Object... uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); @@ -330,7 +330,7 @@ public ResponseEntity getForEntity(String url, Class responseType, @Nu } @Override - public ResponseEntity getForEntity(String url, Class responseType, Map uriVariables) + public ResponseEntity getForEntity(String url, Type responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); @@ -339,7 +339,7 @@ public ResponseEntity getForEntity(String url, Class responseType, Map } @Override - public ResponseEntity getForEntity(URI url, Class responseType) throws RestClientException { + public ResponseEntity getForEntity(URI url, Type responseType) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); ResponseExtractor> responseExtractor = responseEntityExtractor(responseType); return nonNull(execute(url, HttpMethod.GET, requestCallback, responseExtractor)); @@ -813,7 +813,7 @@ protected void handleResponse(URI url, HttpMethod method, ClientHttpResponse res * header based on the given response type, cross-checked against the * configured message converters. */ - public RequestCallback acceptHeaderRequestCallback(Class responseType) { + public RequestCallback acceptHeaderRequestCallback(Type responseType) { return new AcceptHeaderRequestCallback(responseType); } From 31aae1a666c579aec429cdf1b1a198dcf47187a2 Mon Sep 17 00:00:00 2001 From: Sam Hieken <99104112+sam-hieken@users.noreply.github.com> Date: Sat, 9 Aug 2025 17:47:36 -0400 Subject: [PATCH 2/3] Changed Class params to Type for postForObject and postForEntity methods Signed-off-by: Sam Hieken --- .../org/springframework/web/client/RestTemplate.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index a8d2becc1b81..9ffb9c35ee32 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -392,7 +392,7 @@ public HttpHeaders headForHeaders(URI url) throws RestClientException { } @Override - public @Nullable T postForObject(String url, @Nullable Object request, Class responseType, + public @Nullable T postForObject(String url, @Nullable Object request, Type responseType, @Nullable Object... uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); @@ -402,7 +402,7 @@ public HttpHeaders headForHeaders(URI url) throws RestClientException { } @Override - public @Nullable T postForObject(String url, @Nullable Object request, Class responseType, + public @Nullable T postForObject(String url, @Nullable Object request, Type responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); @@ -412,7 +412,7 @@ public HttpHeaders headForHeaders(URI url) throws RestClientException { } @Override - public @Nullable T postForObject(URI url, @Nullable Object request, Class responseType) + public @Nullable T postForObject(URI url, @Nullable Object request, Type responseType) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); @@ -423,7 +423,7 @@ public HttpHeaders headForHeaders(URI url) throws RestClientException { @Override public ResponseEntity postForEntity(String url, @Nullable Object request, - Class responseType, @Nullable Object... uriVariables) throws RestClientException { + Type responseType, @Nullable Object... uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); ResponseExtractor> responseExtractor = responseEntityExtractor(responseType); @@ -432,7 +432,7 @@ public ResponseEntity postForEntity(String url, @Nullable Object request, @Override public ResponseEntity postForEntity(String url, @Nullable Object request, - Class responseType, Map uriVariables) throws RestClientException { + Type responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); ResponseExtractor> responseExtractor = responseEntityExtractor(responseType); @@ -440,7 +440,7 @@ public ResponseEntity postForEntity(String url, @Nullable Object request, } @Override - public ResponseEntity postForEntity(URI url, @Nullable Object request, Class responseType) + public ResponseEntity postForEntity(URI url, @Nullable Object request, Type responseType) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); From 6b1a55bc0aba04001a6574b1fb22022e657f1a40 Mon Sep 17 00:00:00 2001 From: Sam Hieken <99104112+sam-hieken@users.noreply.github.com> Date: Sat, 9 Aug 2025 18:00:57 -0400 Subject: [PATCH 3/3] Changed Class params to Type for patchForObject and patchForEntity methods Signed-off-by: Sam Hieken <99104112+sam-hieken@users.noreply.github.com> Signed-off-by: Sam Hieken --- .../java/org/springframework/web/client/RestTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 9ffb9c35ee32..ed7cf74ab29f 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -477,7 +477,7 @@ public void put(URI url, @Nullable Object request) throws RestClientException { // PATCH @Override - public @Nullable T patchForObject(String url, @Nullable Object request, Class responseType, + public @Nullable T patchForObject(String url, @Nullable Object request, Type responseType, @Nullable Object... uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); @@ -487,7 +487,7 @@ public void put(URI url, @Nullable Object request) throws RestClientException { } @Override - public @Nullable T patchForObject(String url, @Nullable Object request, Class responseType, + public @Nullable T patchForObject(String url, @Nullable Object request, Type responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType); @@ -497,7 +497,7 @@ public void put(URI url, @Nullable Object request) throws RestClientException { } @Override - public @Nullable T patchForObject(URI url, @Nullable Object request, Class responseType) + public @Nullable T patchForObject(URI url, @Nullable Object request, Type responseType) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request, responseType);