Merge pull request #1 from appulse-projects/develop

Add StreamReader

Author: xxlabaza

CHANGELOG.md

@@ -11,7 +11,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Add more tests.
 
-## [1.0.3](https://github.com/appulse-projects/utils-java/releases/tag/1.0.3) - 2018-01-28
+## [1.1.0](https://github.com/appulse-projects/utils-java/releases/tag/1.1.0) - 2018-01-30
+
+### Added
+
+- `StreamReader` for effective reading `InputStream`.
+
+## [1.0.4](https://github.com/appulse-projects/utils-java/releases/tag/1.0.4) - 2018-01-28
 
 ### Changed
 

README.md

@@ -29,14 +29,14 @@ For building routine automation, I am using [maven](https://maven.apache.org).
 To build the project, do the following:
 
 ```bash
-$> mvn clean package
+$> mvn clean compile
 ...
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-[INFO] Total time: 15.272 s
-[INFO] Finished at: 2018-01-27T18:04:44+03:00
-[INFO] Final Memory: 47M/483M
+[INFO] Total time: 13.033 s
+[INFO] Finished at: 2018-01-30T00:29:40+03:00
+[INFO] Final Memory: 43M/467M
 [INFO] ------------------------------------------------------------------------
 ```
 
@@ -54,7 +54,7 @@ $> mvn clean test
 [INFO]
 [INFO] Results:
 [INFO]
-[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0
+[INFO] Tests run: 19, Failures: 0, Errors: 0, Skipped: 0
 [INFO]
 ...
 ```

pom.xml

@@ -24,7 +24,7 @@ limitations under the License.
 
   <groupId>io.appulse</groupId>
   <artifactId>utils-java</artifactId>
-  <version>1.0.4</version>
+  <version>1.1.0</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -62,7 +62,7 @@ limitations under the License.
     <url>https://github.com/appulse-projects/utils-java</url>
     <connection>scm:git:https://github.com/appulse-projects/utils-java.git</connection>
     <developerConnection>scm:git:https://github.com/appulse-projects/utils-java.git</developerConnection>
-    <tag>1.0.4</tag>
+    <tag>1.1.0</tag>
   </scm>
 
   <distributionManagement>

src/main/java/io/appulse/utils/StreamReader.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.appulse.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.net.Socket;
+
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import lombok.val;
+
+/**
+ *
+ * @author Artem Labazin
+ * @since 1.1.0
+ */
+public final class StreamReader {
+
+  @SneakyThrows
+  public static byte[] read (@NonNull InputStream stream) {
+    val outputStream = new ByteArrayOutputStream(32);
+    val buffer = new byte[32];
+
+    while (true) {
+      val length = stream.read(buffer);
+      if (length == -1) {
+        break;
+      }
+      outputStream.write(buffer, 0, length);
+    }
+
+    return outputStream.toByteArray();
+  }
+
+  @SneakyThrows
+  public static byte[] read (@NonNull Socket socket) {
+    return read(socket.getInputStream());
+  }
+
+  @SneakyThrows
+  public static byte[] read (@NonNull InputStream stream, int length) {
+    if (length < 0) {
+      throw new IndexOutOfBoundsException();
+    }
+
+    val result = new byte[length];
+    int readed = 0;
+
+    while (readed < length) {
+      val count = stream.read(result, readed, length - readed);
+      if (count < -1) {
+        throw new EOFException();
+      }
+      readed += count;
+    }
+
+    return result;
+  }
+
+  @SneakyThrows
+  public static byte[] read (@NonNull Socket socket, int length) {
+    return read(socket.getInputStream(), length);
+  }
+
+  public static Bytes readBytes (@NonNull InputStream stream) {
+    val result = read(stream);
+    return Bytes.wrap(result);
+  }
+
+  @SneakyThrows
+  public static Bytes readBytes (@NonNull Socket socket) {
+    return readBytes(socket.getInputStream());
+  }
+
+  public static Bytes readBytes (@NonNull InputStream stream, int length) {
+    val result = read(stream, length);
+    return Bytes.wrap(result);
+  }
+
+  @SneakyThrows
+  public static Bytes readBytes (@NonNull Socket socket, int fixedLength) {
+    return readBytes(socket.getInputStream(), fixedLength);
+  }
+
+  private StreamReader () {
+  }
+}

src/test/java/io/appulse/utils/StreamReaderTest.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.appulse.utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+
+/**
+ *
+ * @author Artem Labazin
+ * @since 1.1.0
+ */
+public class StreamReaderTest {
+
+  @Test
+  public void read () throws Exception {
+    byte[] expected = "Hello world".getBytes();
+
+    assertThat(StreamReader.read(new CustomInputStream(expected)))
+        .isEqualTo(expected);
+  }
+
+  @Test
+  public void readWithLength () throws Exception {
+    byte[] bytes = "Hello world".getBytes();
+    byte[] expected = Arrays.copyOfRange(bytes, 0, 2);
+
+    assertThat(StreamReader.read(new CustomInputStream(bytes), 2))
+        .isEqualTo(expected);
+  }
+
+  @FieldDefaults(level = AccessLevel.PRIVATE)
+  private static class CustomInputStream extends InputStream {
+
+    final byte[] bytes;
+
+    int index;
+
+    CustomInputStream (byte[] bytes) {
+      this.bytes = new byte[bytes.length + 1];
+      int middle = bytes.length / 2;
+      System.arraycopy(bytes, 0, this.bytes, 0, middle);
+      this.bytes[middle] = -1;
+      System.arraycopy(bytes, middle, this.bytes, middle + 1, bytes.length - middle);
+    }
+
+    @Override
+    public int read () throws IOException {
+      if (index >= bytes.length) {
+        return -1;
+      }
+      return bytes[index++];
+    }
+  }
+}