bug fixed

Author: NintenSAGA

src/main/java/edu/nju/http/client/HttpClient.java

@@ -107,6 +107,14 @@ public HttpResponseMessage post(String rawUri, String body, String ... headers)
         return request(WebMethods.POST, rawUri, body, headers);
     }
 
+    /**
+     * Perform HTTP request
+     * @param method HTTP method. Supports GET and POST
+     * @param rawUri Raw URI string
+     * @param body Message body
+     * @param headers Message Headers
+     * @return Received response
+     */
     HttpResponseMessage request(String method, String rawUri, String body, String ... headers) throws IOException {
         assert WebMethods.GET.equals(method) || WebMethods.POST.equals(method);
         assert rawUri != null;
@@ -162,34 +170,34 @@ private HttpResponseMessage request(HttpRequestMessage request) throws IOExcepti
                 connected = true;
             }
 
-            // -------------------- Header editing -------------------- //
+            // -------------------- 1. Header editing -------------------- //
             request.addHeader("Host", hostName);
             request.addHeader(Headers.USER_AGENT, "Wget/1.21.3");
             request.addHeader(Headers.ACCEPT_ENCODING, "gzip");
             request.addHeader(Headers.ACCEPT, "*/*");
 
             if (keepAlive) request.addHeader(Headers.CONNECTION, Headers.KEEP_ALIVE);
 
-            // -------------------- Cache checking -------------------- //
+            // -------------------- 2. Cache checking -------------------- //
             checkCache(request);
 
-            // -------------------- Pack and send -------------------- //
+            // -------------------- 3. Pack and send -------------------- //
             MessagePacker packer = new MessagePacker(request, null);
             packer.send(aSocket);
 
             /*               Output 1               */
             System.out.println(present(request));
 
-            // -------------------- Receive and parse -------------------- //
+            // -------------------- 4. Receive and parse -------------------- //
             MessageParser parser = new MessageParser(aSocket, 10000);
             HttpResponseMessage hrm = parser.parseToHttpResponseMessage();
 
-            // -------------------- Status Handler -------------------- //
+            // -------------------- 5. Status Handler -------------------- //
             hrm = handler.handle(this, hrm);
 
             Log.logClient("Request complete");
 
-            // -------------------- Caching -------------------- //
+            // -------------------- 6. Caching -------------------- //
             String content_type = hrm.getHeaderVal(Headers.CONTENT_TYPE);
             if (    hrm.getStatusCode() != 304
                     && content_type != null
@@ -224,7 +232,7 @@ private void checkCache(HttpRequestMessage hrm) {
         }
     }
 
-    public String present(HttpMessage hrm) {
+    private String present(HttpMessage hrm) {
         StringBuilder sb = new StringBuilder();
         sb.append(hrm.getStartLineAndHeaders());
         var ct = hrm.getHeaderVal(Headers.CONTENT_TYPE);
@@ -247,17 +255,23 @@ Config.CLIENT_CACHE, getHostName() + this.getRawPath()))
         return sb.toString();
     }
 
-    public String decorate(String s, String mark) {
+    private String decorate(String s, String mark) {
         return Arrays.stream(s.split("\n"))
                 .map(ss -> mark + ss)
                 .collect(Collectors.joining("\n"));
     }
 
+    /**
+     * Present the HTTP Request Message as String
+    */
     public String present(HttpRequestMessage hrm) {
         return "\n>> ==================== HTTP Request Message ==================== <<\n" +
                 decorate(present((HttpMessage) hrm), ">> ");
     }
 
+    /**
+     * Present the HTTP Response Message as String
+    */
     public String present(HttpResponseMessage hrm) {
         return "\n<< ==================== HTTP Response Message ==================== >>\n" +
                 decorate(present((HttpMessage) hrm), "<< ");

src/main/java/edu/nju/http/server/HttpServer.java

@@ -135,8 +135,10 @@ public void shutdown() {
     }
 
     /**
-     * Should be packed in a Thread <br/>
-     * Socket handler --> TargetHandler --> Output handler <br/>
+     * Socket handler
+     * --> Message Parser
+     * --> TargetHandler
+     * --> Message Packer <br/>
      */
     private void handleSocket(AsynchronousSocketChannel socket, boolean keepAlive, int timeOut) {
         Log.logSocket(socket, "Accepted");

src/main/java/edu/nju/http/server/TargetHandler.java

@@ -56,11 +56,15 @@ private TargetHandler() {
 
         StringBuilder sb = new StringBuilder();
 
+        /* Load preset targets from the config file */
         try {
             for (String prefix : json.keySet()) {
+                /* Package name */
                 for (Object className : json.getJSONArray(prefix).toList()) {
+                    /* Class name */
                     Class<?> targetClass = Class.forName("%s.%s".formatted(prefix, className));
                     for (Method method : targetClass.getDeclaredMethods()) {
+                        /* Mapped methods */
                         if (method.isAnnotationPresent(mappingClass)) {
                             assert checkMethod(method);
                             Mapping mapping = method.getDeclaredAnnotation(mappingClass);
@@ -110,8 +114,6 @@ private boolean checkMethod(Method method) {
 
     /**
      * Handling the request based on the method and the target
-     *
-     * @return Response object
      */
     public HttpResponseMessage handle(HttpRequestMessage msg) {
         if (!supportedMethods.contains(msg.getMethod()))