Set own response content-type

Author: simonwep

src/express/http/response/Response.java

@@ -24,7 +24,7 @@ public class Response {
   private final OutputStream BODY;
   private final Headers HEADER;
 
-  private MediaType contentType = MediaType._txt;
+  private String contentType = MediaType._txt.getMIME();
   private boolean isClose = false;
   private long contentLength = 0;
   private int status = 200;
@@ -112,7 +112,7 @@ public void sendStatus(@NotNull Status status) {
   /**
    * @return The current contentType
    */
-  public MediaType getContentType() {
+  public String getContentType() {
     return contentType;
   }
 
@@ -122,6 +122,15 @@ public MediaType getContentType() {
    * @param contentType - The contentType
    */
   public void setContentType(MediaType contentType) {
+    this.contentType = contentType.getMIME();
+  }
+
+  /**
+   * Set the contentType for this response.
+   *
+   * @param contentType - The contentType
+   */
+  public void setContentType(String contentType) {
     this.contentType = contentType;
   }
 
@@ -164,7 +173,9 @@ public void send(String s) {
   public void send(@NotNull File file) {
     if (checkIfClosed()) return;
     this.contentLength += file.length();
-    this.contentType = Utils.getContentType(file);
+
+    MediaType mediaType = Utils.getContentType(file);
+    this.contentType = mediaType == null ? null : mediaType.getMIME();
     sendHeaders();
 
     try {
@@ -197,7 +208,7 @@ private void sendHeaders() {
     try {
 
       // Fallback
-      String contentType = getContentType().getExtension() == null ? MediaType._bin.getExtension() : getContentType().getMIME();
+      String contentType = getContentType() == null ? MediaType._bin.getExtension() : getContentType();
 
       // Set header and send response
       this.HEADER.set("Content-Type", contentType);

src/express/utils/MediaType.java

@@ -690,7 +690,8 @@ public enum MediaType {
   _ice("ice", "x-conference/x-cooltalk"),
   _par("par", "text/plain-bas"),
   _yaml("yaml", "text/yaml"),
-  _dmg("dmg", "application/x-apple-diskimage");
+  _dmg("dmg", "application/x-apple-diskimage"),
+  _xww("form", "application/x-www-form-urlencoded");
 
   private String MIME;
   private String extension;