Skip to content

Commit

Permalink
feat : upgrade to springboot 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@rajadilipkolli
rajadilipkolli committed Nov 1, 2024
1 parent 92ddb34 commit d0fe553
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 73 deletions.
4 changes: 2 additions & 2 deletions httpClients/boot-restclient/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.5</version>
<version>3.4.0-RC1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example.restclient</groupId>
Expand Down Expand Up @@ -72,7 +72,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.22.0</version>
<version>1.24.0</version>
<style>AOSP</style>
</googleJavaFormat>
<importOrder/>
Expand Down
105 changes: 105 additions & 0 deletions ...ain/java/com/example/restclient/bootrestclient/config/ClientLoggerRequestInterceptor.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
package com.example.restclient.bootrestclient.config;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.stereotype.Component;

@Component
public class ClientLoggerRequestInterceptor implements ClientHttpRequestInterceptor {

private static final Logger log = LoggerFactory.getLogger(ClientLoggerRequestInterceptor.class);

@Override
public ClientHttpResponse intercept(
HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
throws IOException {
logRequest(request, body);
ClientHttpResponse response = execution.execute(request, body);
return logResponse(response);
}

private BufferingClientHttpResponseWrapper logResponse(ClientHttpResponse response)
throws IOException {
log.info(
"============================response begin==========================================");
log.info("Status code : {}", response.getStatusCode());
log.info("Status text : {}", response.getStatusText());
logHeaders(response.getHeaders());
byte[] responseBody = response.getBody().readAllBytes();
if (responseBody.length > 0) {
log.info("Response body: {}", new String(responseBody, StandardCharsets.UTF_8));
}
log.info(
"=======================response end=================================================");
return new BufferingClientHttpResponseWrapper(response, responseBody);
}

private void logRequest(HttpRequest request, byte[] body) {

log.info(
"===========================request begin================================================");
log.info("URI : {}", request.getURI());
log.info("Method : {}", request.getMethod());
logHeaders(request.getHeaders());
if (body.length > 0) {
log.info("Request body: {}", new String(body, StandardCharsets.UTF_8));
}
log.info(
"==========================request end================================================");
}

private void logHeaders(HttpHeaders headers) {
log.info("Headers : ");
headers.forEach((name, values) -> values.forEach(value -> log.info("{}={}", name, value)));
}

private static class BufferingClientHttpResponseWrapper implements ClientHttpResponse {
private final ClientHttpResponse response;
private final byte[] body;

public BufferingClientHttpResponseWrapper(ClientHttpResponse response, byte[] body) {
this.response = response;
this.body = body;
}

@Override
public InputStream getBody() throws IOException {
return new ByteArrayInputStream(body);
}

@Override
public HttpHeaders getHeaders() {
return response.getHeaders();
}

@Override
public HttpStatusCode getStatusCode() throws IOException {
return response.getStatusCode();
}

@Override
public int getRawStatusCode() throws IOException {
return response.getRawStatusCode();
}

@Override
public String getStatusText() throws IOException {
return response.getStatusText();
}

@Override
public void close() {
response.close();
}
}
}
74 changes: 3 additions & 71 deletions ...t/src/main/java/com/example/restclient/bootrestclient/config/RestClientConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
package com.example.restclient.bootrestclient.config;

import java.io.IOException;
import java.net.http.HttpClient;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.web.client.RestClientCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpRequest;
import org.springframework.http.MediaType;
import org.springframework.http.client.BufferingClientHttpRequestFactory;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.client.JdkClientHttpRequestFactory;
import org.springframework.lang.NonNull;
import org.springframework.retry.annotation.EnableRetry;
import org.springframework.util.StreamUtils;
import org.springframework.web.client.RestClient;
import org.springframework.web.util.DefaultUriBuilderFactory;

Expand All @@ -34,7 +23,7 @@ RestClient restClient(RestClient.Builder restClientBuilder) {
@Bean
RestClientCustomizer restClientCustomizer(
ApplicationProperties applicationProperties,
@NonNull BufferingClientHttpRequestFactory bufferingClientHttpRequestFactory) {
ClientLoggerRequestInterceptor clientLoggerRequestInterceptor) {
DefaultUriBuilderFactory factory =
new DefaultUriBuilderFactory(applicationProperties.getExternalCallUrl());
factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.URI_COMPONENT);
Expand All @@ -45,64 +34,7 @@ RestClientCustomizer restClientCustomizer(
httpHeaders -> {
httpHeaders.setContentType(MediaType.APPLICATION_JSON);
httpHeaders.setAccept(List.of(MediaType.APPLICATION_JSON));
});
// .requestFactory(bufferingClientHttpRequestFactory)
// .requestInterceptor(
// (request, body, execution) -> {
// logRequest(request, body);
// ClientHttpResponse response = execution.execute(request, body);
// logResponse(response);
// return response;
// });
}

private void logResponse(ClientHttpResponse response) throws IOException {
log.info(
"============================response begin==========================================");
log.info("Status code : {}", response.getStatusCode());
log.info("Status text : {}", response.getStatusText());
log.info("Headers : {}", response.getHeaders());
log.info(
"Response body: {}",
StreamUtils.copyToString(response.getBody(), Charset.defaultCharset()));
log.info(
"=======================response end=================================================");
}

private void logRequest(HttpRequest request, byte[] body) {

log.info(
"===========================request begin================================================");
log.info("URI : {}", request.getURI());
log.info("Method : {}", request.getMethod());
log.info("Headers : {}", request.getHeaders());
log.info("Request body: {}", new String(body, StandardCharsets.UTF_8));
log.info(
"==========================request end================================================");
}

@Bean
HttpClient jdkClient() {
return HttpClient.newBuilder()
.version(HttpClient.Version.HTTP_2)
.connectTimeout(Duration.ofSeconds(30))
.followRedirects(HttpClient.Redirect.NORMAL)
.build();
}

@Bean
JdkClientHttpRequestFactory jdkClientHttpRequestFactory(@NonNull HttpClient jdkClient) {
JdkClientHttpRequestFactory jdkClientHttpRequestFactory =
new JdkClientHttpRequestFactory(jdkClient);
jdkClientHttpRequestFactory.setReadTimeout(Duration.ofSeconds(60));
return jdkClientHttpRequestFactory;
}

// BufferingClientHttpRequestFactory allows us to read the response body multiple times for a
// single request.
@Bean
BufferingClientHttpRequestFactory bufferingClientHttpRequestFactory(
@NonNull JdkClientHttpRequestFactory jdkClientHttpRequestFactory) {
return new BufferingClientHttpRequestFactory(jdkClientHttpRequestFactory);
})
.requestInterceptor(clientLoggerRequestInterceptor);
}
}
4 changes: 4 additions & 0 deletions httpClients/boot-restclient/src/main/resources/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ spring.mvc.problemdetails.enabled=true
spring.threads.virtual.enabled=true

application.external-call-url=https://jsonplaceholder.typicode.com

spring.http.client.factory=jdk
spring.http.client.connect-timeout=PT30S
spring.http.client.read-timeout=PT1M

0 comments on commit d0fe553

Please sign in to comment.