Implemented ResponseData#getContentType in Webserver#write, as it was not yet implemented

Joshua · Joshua · commit 7be07e9c4349 · 2023-04-22T21:33:57.000+02:00
Added ResponseData#getHeaders and implemented it in Webserver#write
Added Documentation to ResponseData.Builder
Updated the Version in pom.xml and README.md
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ You can also download the newest version from the [releases](https://github.com/
 <dependency>
     <groupId>de.joshicodes</groupId>
     <artifactId>webapi</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.joshicodes</groupId>
     <artifactId>webapi</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
 
     <build>
         <plugins>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>23.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/de/joshicodes/webapi/Webserver.java b/src/main/java/de/joshicodes/webapi/Webserver.java
@@ -241,6 +241,13 @@ private void write(ResponseData response, HttpExchange exchange) throws IOExcept
         String body = response.getBody();
         if(body != null) {
             exchange.sendResponseHeaders(response.getStatusCode(), body.length());
+
+            if(response.getHeaders() != null)
+                response.getHeaders().forEach((key, value) -> exchange.getResponseHeaders().add(key, value));
+
+            if(response.getContentType() != null)
+                exchange.getResponseHeaders().add("Content-Type", response.getContentType());
+
             exchange.getResponseBody().write(body.getBytes());
             exchange.getResponseBody().close();
         } else {
diff --git a/src/main/java/de/joshicodes/webapi/request/ResponseData.java b/src/main/java/de/joshicodes/webapi/request/ResponseData.java
@@ -11,6 +11,7 @@ public abstract class ResponseData {
     abstract public int getStatusCode();
     abstract public String getContentType();
     abstract public String getHeader(String key);
+    abstract public HashMap<String, String> getHeaders();
 
 
     /**
@@ -81,21 +82,43 @@ public Builder() {
             this.headers = new HashMap<>();
         }
 
+        /**
+         * Sets the body of the response
+         * @param body The body of the response
+         * @return This builder object
+         */
         public Builder setBody(String body) {
             this.body = body;
             return this;
         }
 
+        /**
+         * Sets the status code of the response
+         * @param statusCode The status code of the response
+         * @return This builder object
+         */
         public Builder setStatusCode(int statusCode) {
             this.statusCode = statusCode;
             return this;
         }
 
+        /**
+         * Sets the content type of the response<br>
+         * This overrides the "Content-Type" header if it is set using {@link Builder#setHeader(String, String)}
+         * @param contentType The content type of the response
+         * @return This builder object
+         */
         public Builder setContentType(String contentType) {
             this.contentType = contentType;
             return this;
         }
 
+        /**
+         * Sets a header of the response
+         * @param key The key of the header
+         * @param value The value of the header
+         * @return This builder object
+         */
         public Builder setHeader(String key, String value) {
             this.headers.put(key, value);
             return this;
@@ -122,6 +145,12 @@ public String getContentType() {
                 public String getHeader(String key) {
                     return headers.get(key);
                 }
+
+                @Override
+                public HashMap<String, String> getHeaders() {
+                    return headers;
+                }
+
             };
         }
 
