From 3f93a4ece608b3f9d902d7a209e18c175378945d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 17 Apr 2023 18:03:44 +0100 Subject: [PATCH] Polish "Add content buffering support to MockServerRestTemplateCustomizer" See gh-34833 --- .../MockServerRestTemplateCustomizer.java | 11 ++++--- ...MockServerRestTemplateCustomizerTests.java | 33 +++++++++---------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java index a7bb97a44cc..aabcd34437e 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -102,10 +102,13 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer } /** - * Use the {@link BufferingClientHttpRequestFactory} wrapper to buffer the input and - * output streams, and for example, allow multiple reads of the response body. + * Set if the {@link BufferingClientHttpRequestFactory} wrapper should be used to + * buffer the input and output streams, and for example, allow multiple reads of the + * response body. + * @param bufferContent if request and response content should be buffered + * @since 3.1.0 */ - public void bufferContent(boolean bufferContent) { + public void setBufferContent(boolean bufferContent) { this.bufferContent = bufferContent; } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java index bd1e7de4bc5..8f08c63abc9 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java @@ -106,7 +106,23 @@ class MockServerRestTemplateCustomizerTests { this.customizer.customize(new RestTemplateBuilder().rootUri("https://example.com").build()); assertThat(this.customizer.getServer()).extracting("expectationManager") .isInstanceOf(SimpleRequestExpectationManager.class); + } + @Test + void bufferContentShouldDefaultToFalse() { + MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(); + RestTemplate restTemplate = new RestTemplate(); + customizer.customize(restTemplate); + assertThat(restTemplate.getRequestFactory()).isInstanceOf(ClientHttpRequestFactory.class); + } + + @Test + void setBufferContentShouldEnableContentBuffering() { + MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(); + RestTemplate restTemplate = new RestTemplate(); + customizer.setBufferContent(true); + customizer.customize(restTemplate); + assertThat(restTemplate.getRequestFactory()).isInstanceOf(BufferingClientHttpRequestFactory.class); } @Test @@ -180,21 +196,4 @@ class MockServerRestTemplateCustomizerTests { assertThat(this.customizer.getServer(template2)).extracting("expectationManager").isEqualTo(manager2); } - @Test - void bufferContentShouldBeFalseByDefault() { - MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(); - RestTemplate restTemplate = new RestTemplate(); - customizer.customize(restTemplate); - assertThat(restTemplate.getRequestFactory()).isInstanceOf(ClientHttpRequestFactory.class); - } - - @Test - void enableBufferContent() { - MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(); - RestTemplate restTemplate = new RestTemplate(); - customizer.bufferContent(true); - customizer.customize(restTemplate); - assertThat(restTemplate.getRequestFactory()).isInstanceOf(BufferingClientHttpRequestFactory.class); - } - }