Merge pull request #11 from LSafer-Agile/master

Java 8 full support

Author: LSafer

build.gradle.kts

@@ -24,8 +24,8 @@ dependencies {
 
     implementation("org.codehaus.groovy:groovy-all:3.0.8")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
 
     testImplementation("junit:junit:4.13.2")
 }

src/main/java/org/cufy/http/body/FileBody.java

@@ -16,6 +16,7 @@
 package org.cufy.http.body;
 
 import org.cufy.http.Body;
+import org.cufy.http.internal.util.StreamUtil;
 import org.cufy.http.mime.Mime;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -154,7 +155,7 @@ public InputStream openInputStream() {
 	public String toString() {
 		try (InputStream in = new FileInputStream(this.file)) {
 			return new String(
-					in.readAllBytes(),
+					StreamUtil.readAllBytes(in),
 					StandardCharsets.UTF_8
 			);
 		} catch (IOException e) {

src/main/java/org/cufy/http/body/JsonBody.java

@@ -16,6 +16,7 @@
 package org.cufy.http.body;
 
 import org.cufy.http.Body;
+import org.cufy.http.internal.util.StreamUtil;
 import org.cufy.http.json.JsonElement;
 import org.cufy.http.json.JsonObject;
 import org.cufy.http.json.JsonPath;
@@ -136,8 +137,8 @@ public JsonBody(@NotNull Consumer<@NotNull JsonBody> builder) {
 	@Contract(value = "_->new", pure = true)
 	public static JsonBody from(@NotNull Body body) {
 		Objects.requireNonNull(body, "body");
-		try (InputStream stream = body.openInputStream()) {
-			String string = new String(stream.readAllBytes());
+		try (InputStream is = body.openInputStream()) {
+			String string = new String(StreamUtil.readAllBytes(is));
 			JsonObject object = JsonObject.parse(string);
 
 			return new JsonBody(

src/main/java/org/cufy/http/body/ParametersBody.java

@@ -17,6 +17,7 @@
 
 import org.cufy.http.Body;
 import org.cufy.http.internal.syntax.UriRegExp;
+import org.cufy.http.internal.util.StreamUtil;
 import org.cufy.http.mime.Mime;
 import org.cufy.http.mime.MimeSubtype;
 import org.cufy.http.mime.MimeType;
@@ -131,8 +132,8 @@ public ParametersBody(@NotNull Consumer<@NotNull ParametersBody> builder) {
 	@Contract(value = "_->new", pure = true)
 	public static ParametersBody from(@NotNull Body body) {
 		Objects.requireNonNull(body, "body");
-		try (InputStream stream = body.openInputStream()) {
-			String string = new String(stream.readAllBytes());
+		try (InputStream is = body.openInputStream()) {
+			String string = new String(StreamUtil.readAllBytes(is));
 
 			return new ParametersBody(
 					body.getMime(),

src/main/java/org/cufy/http/body/TextBody.java

@@ -17,6 +17,7 @@
 
 import org.cufy.http.Body;
 import org.cufy.http.internal.syntax.HttpRegExp;
+import org.cufy.http.internal.util.StreamUtil;
 import org.cufy.http.mime.Mime;
 import org.cufy.http.mime.MimeSubtype;
 import org.cufy.http.mime.MimeType;
@@ -145,7 +146,7 @@ public TextBody(@NotNull Consumer<@NotNull TextBody> builder) {
 	public static TextBody from(@NotNull Body body) {
 		Objects.requireNonNull(body, "body");
 		try (InputStream stream = body.openInputStream()) {
-			String string = new String(stream.readAllBytes());
+			String string = new String(StreamUtil.readAllBytes(stream));
 
 			return new TextBody(
 					body.getMime(),

src/main/java/org/cufy/http/internal/util/StreamUtil.java

@@ -0,0 +1,75 @@
+/*
+ *	Copyright 2021-2022 Cufy and ProgSpaceSA
+ *
+ *	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 org.cufy.http.internal.util;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Internal utilities to deal with streams.
+ *
+ * @author LSafer
+ * @version 1.0.0
+ * @since 1.0.0 ~2022.01.07
+ */
+@ApiStatus.Internal
+public final class StreamUtil {
+	/**
+	 * Utility classes shall have no instances.
+	 *
+	 * @throws AssertionError when called.
+	 * @since 1.0.0 ~2022.01.07
+	 */
+	private StreamUtil() {
+		throw new AssertionError("No instance for you!");
+	}
+
+	/**
+	 * A utility function to read all the bytes in a particular input stream. The stream
+	 * will not be closed automatically.
+	 *
+	 * @param is the input stream.
+	 * @return the bytes from reading the input stream.
+	 * @throws IOException if any I/O exception occurs while reading the input stream.
+	 * @since 1.0.0 ~2022.01.07
+	 */
+	@Contract(mutates = "param")
+	public static byte @NotNull [] readAllBytes(@NotNull InputStream is) throws IOException {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+		//noinspection CheckForOutOfMemoryOnLargeArrayAllocation
+		byte[] buffer = new byte[8192];
+
+		while (true) {
+			int read = is.read(buffer, 0, buffer.length);
+
+			if (read < 0)
+				break;
+
+			if (read == 0)
+				continue;
+
+			baos.write(buffer, 0, read);
+		}
+
+		return baos.toByteArray();
+	}
+}

src/main/java/org/cufy/http/internal/util/package-info.java

@@ -0,0 +1,23 @@
+/*
+ *	Copyright 2021-2022 Cufy and ProgSpaceSA
+ *
+ *	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.
+ */
+/**
+ * Internal utilities.
+ *
+ * @author LSafer
+ * @version 1.0.0
+ * @since 1.0.0 ~2022.01.07
+ */
+package org.cufy.http.internal.util;

src/main/java/org/cufy/http/json/JsonArray.java

@@ -28,7 +28,6 @@
 import java.io.StringReader;
 import java.util.*;
 import java.util.function.Consumer;
-import java.util.function.IntFunction;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
@@ -80,7 +79,7 @@ public JsonArray(@NotNull List<@NotNull JsonElement> list) {
 	/**
 	 * Construct a new json array with the given {@code builder}.
 	 *
-	 * @param builder the builder to apply to the new jsona array.
+	 * @param builder the builder to apply to the new json array.
 	 * @throws NullPointerException if the given {@code builder} is null.
 	 * @since 0.2.3 ~2021.08.27
 	 */
@@ -522,8 +521,8 @@ public <T> T[] toArray(@NotNull T[] array) {
 		return this.list.toArray(array);
 	}
 
-	@Override
-	public <T> T[] toArray(@NotNull IntFunction<T[]> generator) {
-		return this.list.toArray(generator);
-	}
+//	@Override
+//	public <T> T[] toArray(@NotNull IntFunction<T[]> generator) {
+//		return this.list.toArray(generator);
+//	}
 }