JSHttpClient successful test #1 and #2

BobHanson · BobHanson · commit 62e66fbe5fc4 · 2020-06-23T17:40:00.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/HttpClientFactory.java b/sources/net.sf.j2s.java.core/src/javajs/http/HttpClientFactory.java
@@ -14,7 +14,7 @@
  */
 public class HttpClientFactory {
 	
-	private static String defaultClassName = "javajs.util.JSHttpClient";
+	private static String defaultClassName = "javajs.http.JSHttpClient";
 	
 	public static void setDefaultClassName(String className) {
 		if (className != null)
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
@@ -231,9 +231,9 @@ public HttpResponse executeAsync(Consumer<? super HttpResponse> succeed,
 				public void run() {
 					try {
 						if (hasFormBody)
-							fulfillPost();
+							fulfillPost(r);
 						else
-							fulfillGet();
+							fulfillGet(r);
 					} catch (Exception e) {
 						r.handleError(e);
 					}
@@ -248,7 +248,7 @@ public void run() {
 		}
 
 		@SuppressWarnings("resource")
-		public Response fulfillGet() throws Exception {
+		public Response fulfillGet(Response r) throws Exception {
 			URI uri = getUri();
 			String data = "";
 			for (Entry<String, String> e : htGetParams.entrySet()) {
@@ -262,12 +262,11 @@ public Response fulfillGet() throws Exception {
 				uri = new URI(uri.toString() + "?" + data);
 			}
 			getConnection(uri);
-			return new Response().getResponse();
+			return r.getResponse();
 		}
 
-		public Response fulfillPost() throws IOException {
+		public Response fulfillPost(Response r) throws IOException {
 			getConnection(uri);
-			Response r = new Response();
 			for (int i = 0; i < listPostFiles.size(); i++) {
 				Object[] name_data = listPostFiles.get(i);
 				String name = (String) name_data[0];
@@ -446,7 +445,7 @@ public Map<String, String> getHeaders() {
 			public String getText() throws IOException {
 				return new String(getContent().readAllBytes());
 			}
-
+			
 			/**
 			 * In SwingJS, this is always a ByteArrayInputStream.
 			 */
@@ -476,6 +475,11 @@ public void close() {
 				}
 			}
 
+			@Override
+			public String toString() {
+				return "JSHttpClient " + method + " state=" + state + " uri=" + uri;
+			}
+
 		}
 
 	}
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
@@ -0,0 +1,70 @@
+package test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.util.function.Consumer;
+
+import javajs.http.HttpClient;
+import javajs.http.HttpClient.HttpRequest;
+import javajs.http.HttpClient.HttpResponse;
+import javajs.http.HttpClientFactory;
+
+/** A JavaScript-only class */
+
+public class Test_HTTP extends Test_ {
+
+	@SuppressWarnings("unused")
+	public static void main(String[] args) {
+
+		if (/** @j2sNative false && */ true)
+			return;
+		try {
+
+			HttpClient client = HttpClientFactory.getClient(null);
+			
+			HttpRequest req = client.get(new URI("https://www.compbio.dundee.ac.uk/slivka/api/services"));
+			HttpResponse resp = req.execute();
+			
+			System.out.println(resp);
+			System.out.println(resp.getText());
+			
+			req = client.put(new URI("https://www.compbio.dundee.ac.uk/slivka/api/services/example"));
+			
+			String json = "{\"key1\":\"val1\", \"key2\":\"val2\"}";		
+			req.addFile("input-file",new ByteArrayInputStream(json.getBytes()));
+			req.addParameter("content", "len:11 long");
+
+			resp = req.execute();
+			
+			System.out.println(resp);
+			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);
+
+			
+		} catch (Exception e3) {
+			e3.printStackTrace();
+		}
+
+	}
+	
+}

Original file line number	Diff line number	Diff line change
`@@ -231,9 +231,9 @@ public HttpResponse executeAsync(Consumer<? super HttpResponse> succeed,`
`231`	`231`	`public void run() {`
`232`	`232`	`try {`
`233`	`233`	`if (hasFormBody)`
`234`		`- fulfillPost();`
	`234`	`+ fulfillPost(r);`
`235`	`235`	`else`
`236`		`- fulfillGet();`
	`236`	`+ fulfillGet(r);`
`237`	`237`	`} catch (Exception e) {`
`238`	`238`	`r.handleError(e);`
`239`	`239`	`}`
`@@ -248,7 +248,7 @@ public void run() {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`@SuppressWarnings("resource")`
`251`		`- public Response fulfillGet() throws Exception {`
	`251`	`+ public Response fulfillGet(Response r) throws Exception {`
`252`	`252`	`URI uri = getUri();`
`253`	`253`	`String data = "";`
`254`	`254`	`for (Entry<String, String> e : htGetParams.entrySet()) {`
`@@ -262,12 +262,11 @@ public Response fulfillGet() throws Exception {`
`262`	`262`	`uri = new URI(uri.toString() + "?" + data);`
`263`	`263`	`}`
`264`	`264`	`getConnection(uri);`
`265`		`- return new Response().getResponse();`
	`265`	`+ return r.getResponse();`
`266`	`266`	`}`
`267`	`267`
`268`		`- public Response fulfillPost() throws IOException {`
	`268`	`+ public Response fulfillPost(Response r) throws IOException {`
`269`	`269`	`getConnection(uri);`
`270`		`- Response r = new Response();`
`271`	`270`	`for (int i = 0; i < listPostFiles.size(); i++) {`
`272`	`271`	`Object[] name_data = listPostFiles.get(i);`
`273`	`272`	`String name = (String) name_data[0];`
`@@ -446,7 +445,7 @@ public Map<String, String> getHeaders() {`
`446`	`445`	`public String getText() throws IOException {`
`447`	`446`	`return new String(getContent().readAllBytes());`
`448`	`447`	`}`
`449`		`-`
	`448`	`+`
`450`	`449`	`/**`
`451`	`450`	`* In SwingJS, this is always a ByteArrayInputStream.`
`452`	`451`	`*/`
`@@ -476,6 +475,11 @@ public void close() {`
`476`	`475`	`}`
`477`	`476`	`}`
`478`	`477`
	`478`	`+ @Override`
	`479`	`+ public String toString() {`
	`480`	`+ return "JSHttpClient " + method + " state=" + state + " uri=" + uri;`
	`481`	`+ }`
	`482`	`+`
`479`	`483`	`}`
`480`	`484`
`481`	`485`	`}`