JSHttpClient second draft

BobHanson · BobHanson · commit 86a7901e2bc6 · 2020-06-23T16:28:49.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/JSHttpClient.java b/sources/net.sf.j2s.java.core/src/javajs/http/JSHttpClient.java
@@ -171,8 +171,7 @@ public HttpResponse execute() throws IOException {
 
 		@Override
 		public HttpResponse executeAsync(Consumer<? super HttpResponse> succeed,
-				BiConsumer<? super HttpResponse, Throwable> fail, 
-				BiConsumer<? super HttpResponse, Throwable> always) {
+				BiConsumer<? super HttpResponse, Throwable> fail, BiConsumer<? super HttpResponse, Throwable> always) {
 			isAsync = (succeed != null || fail != null || always != null);
 			this.succeed = succeed;
 			this.fail = fail;
@@ -200,7 +199,6 @@ public void run() {
 			return r;
 		}
 
-
 		@SuppressWarnings("resource")
 		public Response fulfillGet() throws Exception {
 			URI uri = getUri();
@@ -282,7 +280,7 @@ public class Response implements HttpResponse {
 			private int state = 0;
 
 			ByteArrayInputStream inputStream;
-			
+
 			private Throwable exception;
 
 			/**
@@ -333,6 +331,11 @@ public void accept(byte[] t) {
 				return this;
 			}
 
+			/**
+			 * Make the proper callback, depending upon response code and exception state.
+			 * 
+			 * @param ok
+			 */
 			protected void doCallback(boolean ok) {
 				ok &= (exception == null);
 				if (ok && succeed != null)
@@ -343,22 +346,13 @@ else if (!ok && fail != null)
 					always.accept(this, exception);
 			}
 
-			@Override
-			public int getStatusCode() {
-				try {
-					return (state != 0 ? state : conn.getResponseCode());
-				} catch (Throwable e) {
-					handleError(e);
-					return state;
-				}
-			}
-
 			/**
+			 * Handle any errors that arise in the process of processing this request.
 			 * 
 			 * @param e
 			 * @return true if aSynchronous and has been handled
 			 */
-			private boolean handleError(Throwable e) {
+			protected boolean handleError(Throwable e) {
 				exception = e;
 				// setting e = null to indicated handled.
 				if (isAsync) {
@@ -374,6 +368,16 @@ private boolean handleError(Throwable e) {
 				return e == null;
 			}
 
+			@Override
+			public int getStatusCode() {
+				try {
+					return (state != 0 ? state : conn.getResponseCode());
+				} catch (Throwable e) {
+					handleError(e);
+					return state;
+				}
+			}
+
 			@Override
 			public Map<String, String> getHeaders() {
 				Map<String, String> headers = new LinkedHashMap<>();
