Skip to content

Commit af20300

Browse files
joviegasjoviegas
committed
Upated test cases
1 parent acbb470 commit af20300

File tree

3 files changed

+81
-58
lines changed

3 files changed

+81
-58
lines changed

‎http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/RepeatableInputStreamRequestEntityTest.java‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.util.Random;
4747
import java.util.concurrent.CountDownLatch;
4848
import java.util.concurrent.TimeUnit;
49+
import java.util.concurrent.atomic.AtomicInteger;
4950
import org.junit.jupiter.api.BeforeEach;
5051
import org.junit.jupiter.api.DisplayName;
5152
import org.junit.jupiter.api.Test;
@@ -202,8 +203,18 @@ public boolean markSupported() {
202203
void writeTo_FirstAttempt_DoesNotResetStream() throws IOException {
203204
// Given
204205
String content = "test content";
205-
ByteArrayInputStream inputStream = spy(new ByteArrayInputStream(content.getBytes()));
206-
ContentStreamProvider provider = () -> inputStream;
206+
207+
// Create a custom stream that tracks reset calls
208+
AtomicInteger resetCallCount = new AtomicInteger(0);
209+
ByteArrayInputStream trackingStream = new ByteArrayInputStream(content.getBytes()) {
210+
@Override
211+
public synchronized void reset() {
212+
resetCallCount.incrementAndGet();
213+
super.reset();
214+
}
215+
};
216+
217+
ContentStreamProvider provider = () -> trackingStream;
207218

208219
SdkHttpRequest httpRequest = httpRequestBuilder.build();
209220
HttpExecuteRequest request = HttpExecuteRequest.builder()
@@ -214,19 +225,31 @@ void writeTo_FirstAttempt_DoesNotResetStream() throws IOException {
214225
entity = new RepeatableInputStreamRequestEntity(request);
215226
ByteArrayOutputStream output = new ByteArrayOutputStream();
216227

228+
// When
217229
entity.writeTo(output);
218230

231+
// Then
219232
assertEquals(content, output.toString());
220-
verify(inputStream, never()).reset();
233+
assertEquals(0, resetCallCount.get(), "Reset should not be called on first attempt");
221234
}
222235

223236
@Test
224237
@DisplayName("writeTo should reset stream on subsequent attempts if repeatable")
225238
void writeTo_SubsequentAttemptWithRepeatableStream_ResetsStream() throws IOException {
226239
// Given
227240
String content = "test content";
228-
ByteArrayInputStream inputStream = spy(new ByteArrayInputStream(content.getBytes()));
229-
ContentStreamProvider provider = () -> inputStream;
241+
242+
// Create a custom stream that tracks reset calls
243+
AtomicInteger resetCallCount = new AtomicInteger(0);
244+
ByteArrayInputStream trackingStream = new ByteArrayInputStream(content.getBytes()) {
245+
@Override
246+
public synchronized void reset() {
247+
resetCallCount.incrementAndGet();
248+
super.reset();
249+
}
250+
};
251+
252+
ContentStreamProvider provider = () -> trackingStream;
230253

231254
SdkHttpRequest httpRequest = httpRequestBuilder.build();
232255
HttpExecuteRequest request = HttpExecuteRequest.builder()
@@ -235,13 +258,19 @@ void writeTo_SubsequentAttemptWithRepeatableStream_ResetsStream() throws IOExcep
235258
.build();
236259

237260
entity = new RepeatableInputStreamRequestEntity(request);
238-
// First write
239-
entity.writeTo(new ByteArrayOutputStream());
240-
// Second write
261+
262+
// When - First write
263+
ByteArrayOutputStream firstOutput = new ByteArrayOutputStream();
264+
entity.writeTo(firstOutput);
265+
266+
// When - Second write
241267
ByteArrayOutputStream secondOutput = new ByteArrayOutputStream();
242268
entity.writeTo(secondOutput);
243-
verify(inputStream, times(1)).reset();
269+
270+
// Then
271+
assertEquals(content, firstOutput.toString());
244272
assertEquals(content, secondOutput.toString());
273+
assertEquals(1, resetCallCount.get(), "Reset should be called exactly once for second attempt");
245274
}
246275

247276
@Test

‎http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/internal/RepeatableInputStreamRequestEntity.java‎

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@
3232
import software.amazon.awssdk.utils.Logger;
3333

3434
/**
35-
* Custom implementation of HttpEntity that delegates to an
36-
* InputStreamEntity, with the one notable difference, that if
37-
* the underlying InputStream supports being reset, this RequestEntity will
38-
* report that it is repeatable and will reset the stream on all subsequent
39-
* attempts to write out the request.
35+
* Custom implementation of HttpEntity that delegates to an InputStreamEntity, with the one notable difference, that if the
36+
* underlying InputStream supports being reset, this RequestEntity will report that it is repeatable and will reset the stream on
37+
* all subsequent attempts to write out the request.
4038
*/
4139
@SdkInternalApi
4240
public class RepeatableInputStreamRequestEntity extends HttpEntityWrapper {
@@ -80,7 +78,7 @@ public class RepeatableInputStreamRequestEntity extends HttpEntityWrapper {
8078
* @param request The details of the request being written out (content type,
8179
* content length, and content).
8280
*/
83-
public RepeatableInputStreamRequestEntity(final HttpExecuteRequest request) {
81+
public RepeatableInputStreamRequestEntity(HttpExecuteRequest request) {
8482
super(createInputStreamEntity(request));
8583

8684
isChunked = request.httpRequest().matchingHeaders(TRANSFER_ENCODING).contains(CHUNKED);
@@ -92,14 +90,14 @@ public RepeatableInputStreamRequestEntity(final HttpExecuteRequest request) {
9290
* the content length.
9391
*/
9492
long contentLength = request.httpRequest().firstMatchingHeader("Content-Length")
95-
.map(this::parseContentLength)
93+
.map(RepeatableInputStreamRequestEntity::parseContentLength)
9694
.orElse(-1L);
9795

9896
content = getContent(request.contentStreamProvider());
9997

10098
// Create InputStreamEntity with proper ContentType handling for HttpClient 5.x
10199
ContentType contentType = request.httpRequest().firstMatchingHeader("Content-Type")
102-
.map(this::parseContentType)
100+
.map(RepeatableInputStreamRequestEntity::parseContentType)
103101
.orElse(null);
104102

105103
if (contentLength >= 0) {
@@ -113,30 +111,20 @@ private static InputStreamEntity createInputStreamEntity(HttpExecuteRequest requ
113111
InputStream content = getContent(request.contentStreamProvider());
114112

115113
long contentLength = request.httpRequest().firstMatchingHeader("Content-Length")
116-
.map(RepeatableInputStreamRequestEntity::parseContentLengthStatic)
114+
.map(RepeatableInputStreamRequestEntity::parseContentLength)
117115
.orElse(-1L);
118116

119117
ContentType contentType = request.httpRequest().firstMatchingHeader("Content-Type")
120-
.map(RepeatableInputStreamRequestEntity::parseContentTypeStatic)
118+
.map(RepeatableInputStreamRequestEntity::parseContentType)
121119
.orElse(null);
122120

123121
if (contentLength >= 0) {
124122
return new InputStreamEntity(content, contentLength, contentType);
125-
} else {
126-
return new InputStreamEntity(content, contentType);
127-
}
128-
}
129-
130-
private long parseContentLength(String contentLength) {
131-
try {
132-
return Long.parseLong(contentLength);
133-
} catch (NumberFormatException nfe) {
134-
log.warn(() -> "Unable to parse content length from request. Buffering contents in memory.");
135-
return -1;
136123
}
124+
return new InputStreamEntity(content, contentType);
137125
}
138126

139-
private static long parseContentLengthStatic(String contentLength) {
127+
private static long parseContentLength(String contentLength) {
140128
try {
141129
return Long.parseLong(contentLength);
142130
} catch (NumberFormatException nfe) {
@@ -145,19 +133,7 @@ private static long parseContentLengthStatic(String contentLength) {
145133
}
146134
}
147135

148-
private ContentType parseContentType(String contentTypeValue) {
149-
if (contentTypeValue == null) {
150-
return null;
151-
}
152-
try {
153-
return ContentType.parse(contentTypeValue);
154-
} catch (Exception e) {
155-
log.warn(() -> "Unable to parse content type: " + contentTypeValue);
156-
return null;
157-
}
158-
}
159-
160-
private static ContentType parseContentTypeStatic(String contentTypeValue) {
136+
private static ContentType parseContentType(String contentTypeValue) {
161137
if (contentTypeValue == null) {
162138
return null;
163139
}

‎http-clients/apache5-client/src/test/java/software/amazon/awssdk/http/apache5/internal/RepeatableInputStreamRequestEntityTest.java‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
import static org.junit.jupiter.api.Assertions.assertTrue;
2828
import static org.mockito.Mockito.any;
2929
import static org.mockito.Mockito.mock;
30-
import static org.mockito.Mockito.never;
31-
import static org.mockito.Mockito.spy;
32-
import static org.mockito.Mockito.times;
33-
import static org.mockito.Mockito.verify;
3430
import static org.mockito.Mockito.when;
3531

3632
import java.io.ByteArrayInputStream;
@@ -45,6 +41,7 @@
4541
import java.util.Random;
4642
import java.util.concurrent.CountDownLatch;
4743
import java.util.concurrent.TimeUnit;
44+
import java.util.concurrent.atomic.AtomicInteger;
4845
import org.junit.jupiter.api.BeforeEach;
4946
import org.junit.jupiter.api.DisplayName;
5047
import org.junit.jupiter.api.Test;
@@ -122,7 +119,7 @@ void constructor_WithContentType_SetsContentTypeCorrectly() {
122119
.request(httpRequest)
123120
.build();
124121
entity = new RepeatableInputStreamRequestEntity(request);
125-
assertEquals(contentType, entity.getContentType().toString());
122+
assertEquals(contentType, entity.getContentType());
126123
}
127124

128125
@Test
@@ -203,8 +200,16 @@ public boolean markSupported() {
203200
void writeTo_FirstAttempt_DoesNotResetStream() throws IOException {
204201
// Given
205202
String content = "test content";
206-
ByteArrayInputStream inputStream = spy(new ByteArrayInputStream(content.getBytes()));
207-
ContentStreamProvider provider = () -> inputStream;
203+
// Create a custom stream that tracks reset calls
204+
AtomicInteger resetCallCount = new AtomicInteger(0);
205+
ByteArrayInputStream trackingStream = new ByteArrayInputStream(content.getBytes()) {
206+
@Override
207+
public synchronized void reset() {
208+
resetCallCount.incrementAndGet();
209+
super.reset();
210+
}
211+
};
212+
ContentStreamProvider provider = () -> trackingStream;
208213

209214
SdkHttpRequest httpRequest = httpRequestBuilder.build();
210215
HttpExecuteRequest request = HttpExecuteRequest.builder()
@@ -216,16 +221,25 @@ void writeTo_FirstAttempt_DoesNotResetStream() throws IOException {
216221
ByteArrayOutputStream output = new ByteArrayOutputStream();
217222
entity.writeTo(output);
218223
assertEquals(content, output.toString());
219-
verify(inputStream, never()).reset();
224+
assertEquals(0, resetCallCount.get(), "Reset should not be called on first attempt");
220225
}
221226

222227
@Test
223228
@DisplayName("writeTo should reset stream on subsequent attempts if repeatable")
224229
void writeTo_SubsequentAttemptWithRepeatableStream_ResetsStream() throws IOException {
225230
// Given
226231
String content = "test content";
227-
ByteArrayInputStream inputStream = spy(new ByteArrayInputStream(content.getBytes()));
228-
ContentStreamProvider provider = () -> inputStream;
232+
233+
// Create a custom stream that tracks reset calls
234+
AtomicInteger resetCallCount = new AtomicInteger(0);
235+
ByteArrayInputStream trackingStream = new ByteArrayInputStream(content.getBytes()) {
236+
@Override
237+
public synchronized void reset() {
238+
resetCallCount.incrementAndGet();
239+
super.reset();
240+
}
241+
};
242+
ContentStreamProvider provider = () -> trackingStream;
229243

230244
SdkHttpRequest httpRequest = httpRequestBuilder.build();
231245
HttpExecuteRequest request = HttpExecuteRequest.builder()
@@ -236,14 +250,16 @@ void writeTo_SubsequentAttemptWithRepeatableStream_ResetsStream() throws IOExcep
236250
entity = new RepeatableInputStreamRequestEntity(request);
237251

238252
// First write
239-
entity.writeTo(new ByteArrayOutputStream());
253+
ByteArrayOutputStream firstOutput = new ByteArrayOutputStream();
254+
entity.writeTo(firstOutput);
240255

241256
//Second write
242257
ByteArrayOutputStream secondOutput = new ByteArrayOutputStream();
243258
entity.writeTo(secondOutput);
244259

245-
verify(inputStream, times(1)).reset();
260+
assertEquals(content, firstOutput.toString());
246261
assertEquals(content, secondOutput.toString());
262+
assertEquals(1, resetCallCount.get(), "Reset should be called exactly once for second attempt");
247263
}
248264

249265
@Test
@@ -326,7 +342,9 @@ public int read() throws IOException {
326342
return -1;
327343
}
328344
hasBeenRead = true;
329-
return data[position++] & 0xFF;
345+
int i = data[position] & 0xFF;
346+
position++;
347+
return i;
330348
}
331349

332350
@Override
@@ -445,7 +463,7 @@ void constructor_WithMixedHeaders_HandlesAllCorrectly() {
445463
entity = new RepeatableInputStreamRequestEntity(request);
446464

447465
assertEquals(2048L, entity.getContentLength());
448-
assertEquals("application/xml", entity.getContentType().toString());
466+
assertEquals("application/xml", entity.getContentType());
449467
assertTrue(entity.isChunked());
450468
}
451469

0 commit comments

Comments
 (0)