From ed9afa3686a9a0310c8f32ed2142732d5075946c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 22 Nov 2018 17:43:31 +0100 Subject: [PATCH] FastByteArrayOutputStream.read byte-to-int conversion Issue: SPR-17492 --- .../util/FastByteArrayOutputStream.java | 8 +-- .../util/FastByteArrayOutputStreamTests.java | 54 ++++++++++--------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java b/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java index 886f92c0ce..81d761ac0d 100644 --- a/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java +++ b/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -367,7 +367,7 @@ public class FastByteArrayOutputStream extends OutputStream { else { if (this.nextIndexInCurrentBuffer < this.currentBufferLength) { this.totalBytesRead++; - return this.currentBuffer[this.nextIndexInCurrentBuffer++]; + return this.currentBuffer[this.nextIndexInCurrentBuffer++] & 0xFF; } else { if (this.buffersIterator.hasNext()) { @@ -487,7 +487,7 @@ public class FastByteArrayOutputStream extends OutputStream { /** * Update the message digest with the remaining bytes in this stream. - * @param messageDigest The message digest to update + * @param messageDigest the message digest to update */ @Override public void updateMessageDigest(MessageDigest messageDigest) { @@ -497,7 +497,7 @@ public class FastByteArrayOutputStream extends OutputStream { /** * Update the message digest with the next len bytes in this stream. * Avoids creating new byte arrays and use internal buffers for performance. - * @param messageDigest The message digest to update + * @param messageDigest the message digest to update * @param len how many bytes to read from this stream and use to update the message digest */ @Override diff --git a/spring-core/src/test/java/org/springframework/util/FastByteArrayOutputStreamTests.java b/spring-core/src/test/java/org/springframework/util/FastByteArrayOutputStreamTests.java index 15217c87b3..69bd046684 100644 --- a/spring-core/src/test/java/org/springframework/util/FastByteArrayOutputStreamTests.java +++ b/spring-core/src/test/java/org/springframework/util/FastByteArrayOutputStreamTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -16,39 +16,34 @@ package org.springframework.util; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; -import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; /** - * Test suite for {@link FastByteArrayOutputStream} + * Test suite for {@link FastByteArrayOutputStream}. + * * @author Craig Andrews */ public class FastByteArrayOutputStreamTests { private static final int INITIAL_CAPACITY = 256; - private FastByteArrayOutputStream os; + private final FastByteArrayOutputStream os = new FastByteArrayOutputStream(INITIAL_CAPACITY);; - private byte[] helloBytes; - - - @Before - public void setUp() throws Exception { - this.os = new FastByteArrayOutputStream(INITIAL_CAPACITY); - this.helloBytes = "Hello World".getBytes("UTF-8"); - } + private final byte[] helloBytes = "Hello World".getBytes(StandardCharsets.UTF_8);; @Test public void size() throws Exception { this.os.write(this.helloBytes); - assertEquals(this.os.size(), this.helloBytes.length); + assertEquals(this.helloBytes.length, this.os.size()); } @Test @@ -124,17 +119,26 @@ public class FastByteArrayOutputStreamTests { @Test public void getInputStreamAvailable() throws Exception { this.os.write(this.helloBytes); - assertEquals(this.os.getInputStream().available(), this.helloBytes.length); + assertEquals(this.helloBytes.length, this.os.getInputStream().available()); } @Test public void getInputStreamRead() throws Exception { this.os.write(this.helloBytes); InputStream inputStream = this.os.getInputStream(); - assertEquals(inputStream.read(), this.helloBytes[0]); - assertEquals(inputStream.read(), this.helloBytes[1]); - assertEquals(inputStream.read(), this.helloBytes[2]); - assertEquals(inputStream.read(), this.helloBytes[3]); + assertEquals(this.helloBytes[0], inputStream.read()); + assertEquals(this.helloBytes[1], inputStream.read()); + assertEquals(this.helloBytes[2], inputStream.read()); + assertEquals(this.helloBytes[3], inputStream.read()); + } + + @Test + public void getInputStreamReadBytePromotion() throws Exception { + byte[] bytes = new byte[] { -1 }; + this.os.write(bytes); + InputStream inputStream = this.os.getInputStream(); + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + assertEquals(bais.read(), inputStream.read()); } @Test @@ -166,9 +170,9 @@ public class FastByteArrayOutputStreamTests { public void getInputStreamSkip() throws Exception { this.os.write(this.helloBytes); InputStream inputStream = this.os.getInputStream(); - assertEquals(inputStream.read(), this.helloBytes[0]); - assertEquals(inputStream.skip(1), 1); - assertEquals(inputStream.read(), this.helloBytes[2]); + assertEquals(this.helloBytes[0], inputStream.read()); + assertEquals(1, inputStream.skip(1)); + assertEquals(this.helloBytes[2], inputStream.read()); assertEquals(this.helloBytes.length - 3, inputStream.available()); } @@ -176,7 +180,7 @@ public class FastByteArrayOutputStreamTests { public void getInputStreamSkipAll() throws Exception { this.os.write(this.helloBytes); InputStream inputStream = this.os.getInputStream(); - assertEquals(inputStream.skip(1000), this.helloBytes.length); + assertEquals(this.helloBytes.length, inputStream.skip(1000)); assertEquals(0, inputStream.available()); } @@ -187,8 +191,7 @@ public class FastByteArrayOutputStreamTests { InputStream inputStream = this.os.getInputStream(); DigestUtils.appendMd5DigestAsHex(inputStream, builder); builder.append("\""); - String actual = builder.toString(); - assertEquals("\"0b10a8db164e0754105b7a99be72e3fe5\"", actual); + assertEquals("\"0b10a8db164e0754105b7a99be72e3fe5\"", builder.toString()); } @Test @@ -201,8 +204,7 @@ public class FastByteArrayOutputStreamTests { InputStream inputStream = this.os.getInputStream(); DigestUtils.appendMd5DigestAsHex(inputStream, builder); builder.append("\""); - String actual = builder.toString(); - assertEquals("\"06225ca1e4533354c516e74512065331d\"", actual); + assertEquals("\"06225ca1e4533354c516e74512065331d\"", builder.toString()); }