JSHttpClient fix for async

BobHanson · BobHanson · commit a36b3c216968 · 2020-06-24T08:15:59.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
@@ -17,6 +17,7 @@
 import java.util.Map.Entry;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 /**
  * SwingJS implementation of javajs.http.HttpClient and associated classes.
@@ -98,7 +99,7 @@ protected AjaxURLConnection(URL u) {
 
 		public abstract void addFormData(String name, Object value, String contentType, String fileName);
 
-		public abstract void getBytesAsync(Consumer<byte[]> whenDone);
+		public abstract void getBytesAsync(Function<byte[], Void> whenDone);
 
 	}
 	
@@ -357,11 +358,12 @@ Response getResponse() throws IOException {
 					public void run() {
 						// asynchronous methods cannot throw an exception.
 						if (allowInputStream) {
-							conn.getBytesAsync(new Consumer<byte[]>() {
+							conn.getBytesAsync(new Function<byte[], Void>() {
 
 								@Override
-								public void accept(byte[] t) {
+								public Void apply(byte[] t) {
 									doCallback(t != null);
+									return null;
 								}
 
 							});
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,24 +41,24 @@ public static void main(String[] args) {
 			System.out.println(resp.getText());
 
 			
-//			req = client.put(new URI("https://www.compbio.dundee.ac.uk/slivka/api/services/example"));
-//			
-//			req.addFile("input-file",new ByteArrayInputStream(json.getBytes()));
-//			req.addParameter("content", "len:11 long");
-//
-//			resp = req.executeAsync(new Consumer<HttpResponse>() {
-//
-//				@Override
-//				public void accept(HttpResponse t) {
-//					try {
-//						System.out.println(t.getText());
-//					} catch (IOException e) {
-//						// TODO Auto-generated catch block
-//						e.printStackTrace();
-//					}
-//				}
-//				
-//			}, null, null);
+			req = client.put(new URI("https://www.compbio.dundee.ac.uk/slivka/api/services/example"));
+			
+			req.addFile("input-file",new ByteArrayInputStream(json.getBytes()));
+			req.addParameter("content", "len:11 long");
+
+			resp = req.executeAsync(new Consumer<HttpResponse>() {
+
+				@Override
+				public void accept(HttpResponse t) {
+					try {
+						System.out.println(t.getText());
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				
+			}, null, null);
 
 			
 		} catch (Exception e3) {
