Merge pull request #215 from BobHanson/master

BobHanson · web-flow · commit 755c88db6477 · 2021-07-02T21:35:24.000-05:00
httpclient
diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@ java2script/java2script is the overall master of the project. However, all activ
 These notes are for Java developers who want to convert their Java applets or Java applications to 
 JavaScript, allowing continued, simultaneous one-source development of both Java and JavaScript. 
 
+A discussion of application limitations and features is at https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.core/dist/swingjs/differences.txt 
+
 Developers of java2script/SwingJS itself should read README-developers.md
 
 Bob Hanson (hansonr@stolaf.edu)
@@ -56,27 +58,31 @@ In the author's own words, "There are Java APIs that are impossible to implement
 
 https://www.leaningtech.com/cheerpj/ "CheerpJ converts Java applications or libraries into JavaScript. Works on bytecode, does not require access to the source code. Compatible with 100% of Java including reflection and dynamic classes. Existing Java archives can be converted to Web applications effortlessly"
 
-This sounds terrific. Very straightforward -- just convert the Java class files to JavaScript. I don't doubt that most of what is written here is true. I am dubious about that "100%" claim, as there are plenty of problems in Java that would take considerably more work than just using class files directly. The Java Reporter demonstration at https://www.leaningtech.com/cheerpj/demos/ crashed both Firefox and Chrome for me, so I cannot really evaluate what I see here. 
+This sounds terrific. And truly it is. I am very impressed! Basically run the Java byte code in JavaScript. The Java Reporter demonstration at https://www.leaningtech.com/cheerpj/demos/ crashed both Firefox and Chrome for me, so I cannot really evaluate what I see here. But I have played with the JFiddle at https://javafiddle.leaningtech.com/, and it is pretty amazing. 
 
 The primary differences between java2script/SwingJS and CheerpJ, to the best of my knowledge, include:
 
-- implementing a true HTML5 UI rather than just painting a canvas the way Java does
+- fast start-up time. SwingJS applications generally start within a second or two, sometimes within 100 ms
+- small downloads, anywhere from about 800K for a small non-GUI program to 10 MB for a full-blown Swing application (JSmol)
+- class-level just-in-time dynamic class loading; no need to retrieve entire JAR files just for a few methods
+- leveraging features of HTML5 and modern JavaScript rather than just painting a canvas the way Java does natively
 - delivering an easily interpretable and debuggable JavaScript translation of Java classes, with little or no obscurification (unless that is desired)
-- well-designed JavaScript-friendly Java core classes that leverage the considerable power of HTML5 rather than ignoring that completely
+- well-designed JavaScript-friendly Java core classes that leverage the considerable power of JavaScript
 - open source and completely extensible
 
 # History - 2019-
 
-SwingJS is now more than just "Swing"-JS. AWT applets and applications are now supported. A test suite of over 500 AWT applets has been used to refine the AWT runtime classes with great success. Many thanks to Karsten Blankenagel (University of Wuppertal) for access to this source code set.
+SwingJS is now more than just "Swing"+JavaScript. AWT applets and applications are now supported. A test suite of over 500 AWT applets has been used to refine the AWT runtime classes with great success. Many thanks to Karsten Blankenagel (University of Wuppertal) for access to this source code set.
 
 Examples include:
 
 MathePrisma (http://www.matheprisma.uni-wuppertal.de/) This site is still using the Java applets as of 2019.03.12; JavaScript versions still in development. 
 
 # History - 2017-
 
+https://github.com/BobHanson/java2script/tree/hanson1 (development branch)
 
-https://github.com/BobHanson/java2script (development master)
+https://github.com/BobHanson/java2script (master)
 
 Current development "Version 3 development master" involves a completely rewritten transpiler (2017) “CompilationParticipant” that follows the Eclipse Java compiler. The implementation nearly perfectly emulates the Java Virtual Machine. It includes fully qualified methods, compile-time method binding, generic methods and classes, Java 8 lambda functions and streams, Java reflection and dynamic class loading for efficient modular just-in-time performance, Java Swing components, modal and nonmodel dialogs, audio, jpdf, the AWT event thread, and many other added packages. Java applications and applets can both be run in JavaScript in any browser. 
 
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/ClientProtocolException.java b/sources/net.sf.j2s.java.core/src/javajs/http/ClientProtocolException.java
@@ -0,0 +1,28 @@
+package javajs.http;
+
+import java.io.IOException;
+
+/**
+ * A generic class for exceptions resulting from the HTTP exchange.
+ */
+public class ClientProtocolException extends IOException {
+
+	private static final long serialVersionUID = 2500725227517025772L;
+
+	public ClientProtocolException() {
+		super();
+	}
+
+	public ClientProtocolException(String message) {
+		super(message);
+	}
+
+	public ClientProtocolException(Throwable cause) {
+		super(cause);
+	}
+
+	public ClientProtocolException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
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
@@ -1,5 +1,6 @@
 package javajs.http;
 
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -88,7 +89,10 @@ public interface HttpRequest {
 		 * @param fileName    server-side fileName to associate with this file
 		 * @return
 		 */
-		public HttpRequest addFilePart(String name, String data, String contentType, String fileName);
+		public default HttpRequest addFilePart(String name, String data, String contentType, String fileName) {
+			var stream = new ByteArrayInputStream(data.getBytes());
+			return addFilePart(name, stream, contentType, fileName);
+		}
 
 		/**
 		 * Add a file-type multipart/form-data derived from a File object, using
@@ -179,6 +183,64 @@ public interface HttpResponse extends Closeable {
 		 */
 		public int getStatusCode();
 
+		/**
+		 * Get the reason phrase for the response code.
+		 * Implementations should use the reason returned by the server.
+		 * Default implementation uses phrases defined by RFC 2616 and RFC 4918
+		 *
+		 * @return status line reason phrase
+		 */
+		public default String getReasonPhrase() {
+			switch (getStatusCode()) {
+			case 100: return "Continue";
+			case 101: return "Switching Protocols";
+			case 200: return "OK";
+			case 201: return "Created";
+			case 202: return "Accepted";
+			case 203: return "Non-Authoritative Information";
+			case 204: return "No Content";
+			case 205: return "Reset Content";
+			case 206: return "Partial Content";
+			case 207: return "Multi-status";
+			case 300: return "Multiple Choices";
+			case 301: return "Moved Permanently";
+			case 302: return "Found";
+			case 303: return "See Other";
+			case 304: return "Not Modified";
+			case 305: return "Use Proxy";
+			case 307: return "Temporary Redirect";
+			case 400: return "Bad Request";
+			case 401: return "Unauthorized";
+			case 402: return "Payment Required";
+			case 403: return "Forbidden";
+			case 404: return "Not Found";
+			case 405: return "Method Not Allowed";
+			case 406: return "Not Acceptable";
+			case 407: return "Proxy Authentication Required";
+			case 408: return "Request Timeout";
+			case 409: return "Conflict";
+			case 410: return "Gone";
+			case 411: return "Length Required";
+			case 412: return "Precondition Failed";
+			case 413: return "Request Entity Too Large";
+			case 414: return "Request-URI Too Long";
+			case 415: return "Unsupported Media Type";
+			case 416: return "Requested Range Not Satisfiable";
+			case 417: return "Expectation Failed";
+			case 422: return "Unprocessable Entity";
+			case 423: return "Locked";
+			case 424: return "Failed Dependency";
+			case 500: return "Internal Server Error";
+			case 501: return "Not Implemented";
+			case 502: return "Bad Gateway";
+			case 503: return "Service Unavailable";
+			case 504: return "Gateway Timeout";
+			case 505: return "HTTP Version Not Supported";
+			case 507: return "Insufficient Storage";
+			default: return "";
+			}
+		}
+
 		/**
 		 * Get the response headers, combining same-name headers with commas, preserving
 		 * order, as per RFC 2616
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/HttpResponseException.java b/sources/net.sf.j2s.java.core/src/javajs/http/HttpResponseException.java
@@ -0,0 +1,45 @@
+package javajs.http;
+
+/**
+ * Exception that can be raised by the application to indicate
+ * a non 2xx server response. The http client will not raise
+ * this exception implicitly. A typical use case is to throw
+ * this exception if the response status code indicate failure.
+ * The status code and the reason phrase should be populated from
+ * the {@link HttpClient.HttpResponse#getStatusCode()} and
+ * {@link HttpClient.HttpResponse#getReasonPhrase()} respectively.
+ */
+public class HttpResponseException extends ClientProtocolException {
+
+	private static final long serialVersionUID = -8481868921105838666L;
+
+	private final int statusCode;
+	private final String reasonPhrase;
+
+	public HttpResponseException(int statusCode, String reasonPhrase, String message) {
+		super(message);
+		this.statusCode = statusCode;
+		this.reasonPhrase = reasonPhrase;
+	}
+
+	public HttpResponseException(int statusCode, String reasonPhrase) {
+		this(statusCode, reasonPhrase, String.format("%d %s", statusCode, reasonPhrase));
+	}
+
+	/**
+	 * Get status code of the response which caused this exception.
+	 *
+	 * @return status code
+	 */
+	public int getStatusCode() {
+		return statusCode;
+	}
+
+	/**
+	 * Get reason phrase complementing the error's status code.
+	 */
+	public String getReasonPhrase() {
+		return reasonPhrase;
+	}
+
+}
