iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix formatting

Browse Source
This commit is contained in:
Ahmed Tawila
2017-07-30 23:04:14 +02:00
parent 52745f2a1c
commit 4f2857deb5
5 changed files with 570 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/pom.xml
+493 -493
View File
File diff suppressed because it is too large Load Diff
spring-core/pom.xml
+1 -1
View File
@@ -144,4 +144,4 @@
</repository> </repository>
</repositories> </repositories>
</project> </project>
spring-core/src/main/java/com/baeldung/streamutils/CopyStream.java
+9 -9
View File
@@ -9,14 +9,14 @@ import org.apache.commons.io.IOUtils;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
public class CopyStream { public class CopyStream {
public static String getStringFromInputStream(InputStream input) throws IOException { public static String getStringFromInputStream(InputStream input) throws IOException {
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
IOUtils.copy(input, writer, "UTF-8"); IOUtils.copy(input, writer, "UTF-8");
return writer.toString(); return writer.toString();
} }
public InputStream getNonClosingInputStream() throws IOException { public InputStream getNonClosingInputStream() throws IOException {
InputStream in = new FileInputStream("src/test/resources/input.txt"); InputStream in = new FileInputStream("src/test/resources/input.txt");
return StreamUtils.nonClosing(in); return StreamUtils.nonClosing(in);
} }
} }
spring-core/src/main/java/com/baeldung/streamutils/DrainStream.java
+3 -3
View File
@@ -5,7 +5,7 @@ import java.io.InputStream;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
public class DrainStream { public class DrainStream {
public InputStream getInputStream() { public InputStream getInputStream() {
return StreamUtils.emptyInput(); return StreamUtils.emptyInput();
} }
} }
spring-core/src/test/java/com/baeldung/streamutils/CopyStreamTest.java
+64 -64
View File
@@ -18,83 +18,83 @@ import static com.baeldung.streamutils.CopyStream.getStringFromInputStream;
public class CopyStreamTest { public class CopyStreamTest {
@Test @Test
public void whenCopyInputStreamToOutputStream_thenCorrect() throws IOException { public void whenCopyInputStreamToOutputStream_thenCorrect() throws IOException {
String inputFileName = "src/test/resources/input.txt"; String inputFileName = "src/test/resources/input.txt";
String outputFileName = "src/test/resources/output.txt"; String outputFileName = "src/test/resources/output.txt";
File outputFile = new File(outputFileName); File outputFile = new File(outputFileName);
InputStream in = new FileInputStream(inputFileName); InputStream in = new FileInputStream(inputFileName);
OutputStream out = new FileOutputStream(outputFileName); OutputStream out = new FileOutputStream(outputFileName);
StreamUtils.copy(in, out); StreamUtils.copy(in, out);
assertTrue(outputFile.exists()); assertTrue(outputFile.exists());
String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName)); String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName));
String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName)); String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName));
Assert.assertEquals(inputFileContent, outputFileContent); Assert.assertEquals(inputFileContent, outputFileContent);
} }
@Test @Test
public void whenCopyRangeOfInputStreamToOutputStream_thenCorrect() throws IOException { public void whenCopyRangeOfInputStreamToOutputStream_thenCorrect() throws IOException {
String inputFileName = "src/test/resources/input.txt"; String inputFileName = "src/test/resources/input.txt";
String outputFileName = "src/test/resources/output.txt"; String outputFileName = "src/test/resources/output.txt";
File outputFile = new File(outputFileName); File outputFile = new File(outputFileName);
InputStream in = new FileInputStream(inputFileName); InputStream in = new FileInputStream(inputFileName);
OutputStream out = new FileOutputStream(outputFileName); OutputStream out = new FileOutputStream(outputFileName);
StreamUtils.copyRange(in, out, 1, 10); StreamUtils.copyRange(in, out, 1, 10);
assertTrue(outputFile.exists()); assertTrue(outputFile.exists());
String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName)); String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName));
String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName)); String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName));
Assert.assertEquals(inputFileContent.substring(1, 11), outputFileContent); Assert.assertEquals(inputFileContent.substring(1, 11), outputFileContent);
} }
@Test @Test
public void whenCopyStringToOutputStream_thenCorrect() throws IOException { public void whenCopyStringToOutputStream_thenCorrect() throws IOException {
String string = "Should be copied to OutputStream."; String string = "Should be copied to OutputStream.";
String outputFileName = "src/test/resources/output.txt"; String outputFileName = "src/test/resources/output.txt";
File outputFile = new File(outputFileName); File outputFile = new File(outputFileName);
OutputStream out = new FileOutputStream("src/test/resources/output.txt"); OutputStream out = new FileOutputStream("src/test/resources/output.txt");
StreamUtils.copy(string, StandardCharsets.UTF_8, out); StreamUtils.copy(string, StandardCharsets.UTF_8, out);
assertTrue(outputFile.exists()); assertTrue(outputFile.exists());
String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName)); String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName));
Assert.assertEquals(outputFileContent, string); Assert.assertEquals(outputFileContent, string);
} }
@Test @Test
public void whenCopyInputStreamToString_thenCorrect() throws IOException { public void whenCopyInputStreamToString_thenCorrect() throws IOException {
String inputFileName = "src/test/resources/input.txt"; String inputFileName = "src/test/resources/input.txt";
InputStream is = new FileInputStream(inputFileName); InputStream is = new FileInputStream(inputFileName);
String content = StreamUtils.copyToString(is, StandardCharsets.UTF_8); String content = StreamUtils.copyToString(is, StandardCharsets.UTF_8);
String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName)); String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName));
Assert.assertEquals(inputFileContent, content); Assert.assertEquals(inputFileContent, content);
} }
@Test @Test
public void whenCopyByteArrayToOutputStream_thenCorrect() throws IOException { public void whenCopyByteArrayToOutputStream_thenCorrect() throws IOException {
String outputFileName = "src/test/resources/output.txt"; String outputFileName = "src/test/resources/output.txt";
String string = "Should be copied to OutputStream."; String string = "Should be copied to OutputStream.";
byte[] byteArray = string.getBytes(); byte[] byteArray = string.getBytes();
OutputStream out = new FileOutputStream("src/test/resources/output.txt"); OutputStream out = new FileOutputStream("src/test/resources/output.txt");
StreamUtils.copy(byteArray, out); StreamUtils.copy(byteArray, out);
String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName)); String outputFileContent = getStringFromInputStream(new FileInputStream(outputFileName));
Assert.assertEquals(outputFileContent, string); Assert.assertEquals(outputFileContent, string);
} }
@Test @Test
public void whenCopyInputStreamToByteArray_thenCorrect() throws IOException { public void whenCopyInputStreamToByteArray_thenCorrect() throws IOException {
String inputFileName = "src/test/resources/input.txt"; String inputFileName = "src/test/resources/input.txt";
InputStream in = new FileInputStream(inputFileName); InputStream in = new FileInputStream(inputFileName);
byte[] out = StreamUtils.copyToByteArray(in); byte[] out = StreamUtils.copyToByteArray(in);
String content = new String(out); String content = new String(out);
String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName)); String inputFileContent = getStringFromInputStream(new FileInputStream(inputFileName));
Assert.assertEquals(inputFileContent, content); Assert.assertEquals(inputFileContent, content);
} }
} }