HttpClient executeAsync interface change

BobHanson · BobHanson · commit 4bbed56d0048 · 2020-06-24T09:54:04.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/HttpClient.java b/sources/net.sf.j2s.java.core/src/javajs/http/HttpClient.java
@@ -37,7 +37,7 @@ public interface HttpRequest {
 		 */
 		public HttpResponse execute() throws IOException;
 
-		HttpResponse executeAsync(Consumer<? super HttpResponse> success, 
+		public void executeAsync(Consumer<? super HttpResponse> success, 
 				BiConsumer<? super HttpResponse, Throwable> failure,
 				BiConsumer<? super HttpResponse, Throwable> always);
 	}
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
@@ -187,13 +187,16 @@ public HttpRequest addFile(String name, InputStream stream) {
 
 		@Override
 		public HttpResponse execute() throws IOException {
-			return executeAsync(null, null, null);
+			return executeImpl(new Response(null, null, null));
 		}
 
 		@Override
-		public HttpResponse executeAsync(Consumer<? super HttpResponse> succeed,
+		public void executeAsync(Consumer<? super HttpResponse> succeed,
 				BiConsumer<? super HttpResponse, Throwable> fail, BiConsumer<? super HttpResponse, Throwable> always) {
-			Response r = new Response(succeed, fail, always);
+			executeImpl(new Response(succeed, fail, always));
+		}
+
+		private HttpResponse executeImpl(Response r) {
 			Runnable runner = new Runnable() {
 
 				@Override
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_HTTP.java b/sources/net.sf.j2s.java.core/src/test/Test_HTTP.java
@@ -41,9 +41,7 @@ public static void main(String[] args) {
 			System.out.println(resp.getText());
 
 			req.addParameter("testing", "here");
-
-
-			resp = req.executeAsync(new Consumer<HttpResponse>() {
+			req.executeAsync(new Consumer<HttpResponse>() {
 
 				@Override
 				public void accept(HttpResponse t) {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public interface HttpRequest {`
`37`	`37`	`*/`
`38`	`38`	`public HttpResponse execute() throws IOException;`
`39`	`39`
`40`		`- HttpResponse executeAsync(Consumer<? super HttpResponse> success,`
	`40`	`+ public void executeAsync(Consumer<? super HttpResponse> success,`
`41`	`41`	`BiConsumer<? super HttpResponse, Throwable> failure,`
`42`	`42`	`BiConsumer<? super HttpResponse, Throwable> always);`
`43`	`43`	`}`