don't know v2

Author: 16BitS3G4l

src/jswerve/BaseHTTPServer.java

@@ -1,33 +1,28 @@
 package jswerve;
 
-import java.io.BufferedReader;
-import java.io.PrintWriter; 
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.Date;
+import java.util.ArrayList;
 
-public class BaseHTTPServer {
+public class BaseHTTPServer implements Runnable {
 
     private int port = 80; 
-    private BufferedReader reader;
-    private PrintWriter writer;
     private ServerSocket ss;
     private Socket s;
-
-    public void initServerSocket() {
+    public static boolean isStopped = false;
+    
+    private void initServerSocket() {
         try { 
             ss = new ServerSocket(port);
         } catch(IOException e) {
-            System.out.println(e.getMessage());
+            System.out.println(e.getMessage()); // replace with logging utility
         } 
     }
 
-    public void acceptConectionsAndThrowToHandlers() throws InterruptedException {
+    private void acceptConectionsAndThrowToHandlers() {
         try {
-            while (true) {
+            while (!isStopped) {
                 s = ss.accept();
 
                 (new Thread(new ConnectionHandler(s))).start();
@@ -38,26 +33,27 @@ public void acceptConectionsAndThrowToHandlers() throws InterruptedException {
         }
     }
 
-    public BaseHTTPServer(int port) throws InterruptedException {
+    public BaseHTTPServer(int port) {
     	this.port = port;
-        initServerSocket();
-        try {
-			acceptConectionsAndThrowToHandlers();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
     }
-
-    public BaseHTTPServer() throws InterruptedException {
-        initServerSocket();
-        try {
-			acceptConectionsAndThrowToHandlers();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+    
+    public void stop() {
+    	isStopped = true;
     }
+    
+    public void run() {
+    	initServerSocket();
+    	
+    	try {
+    		acceptConectionsAndThrowToHandlers();
+		} catch (Exception e) {
+			e.printStackTrace(); // replace with logging utility
+		}	
 
+    }
+    
+    public void setRoute(String route, RouteHandler rh) {
+    	
+    }
+}
 
-}

src/jswerve/ConnectionHandler.java

@@ -1,49 +1,53 @@
 package jswerve;
 
-import java.io.InputStream;
-
 import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.OutputStreamWriter;
-import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Date;
 
 public class ConnectionHandler implements Runnable {
 
 	StringBuilder reqFullContents;
     BufferedReader br;
     PrintWriter pw;
     Socket conn;
+    private boolean close = false;
 
-    public ConnectionHandler(Socket s) throws IOException {
-        this.conn  = s;
-        
-        br = new BufferedReader(
-        		new InputStreamReader(s.getInputStream()));
-        
-        pw = new PrintWriter(
-        		new OutputStreamWriter(s.getOutputStream()));
-        
-        // read the contents of request, assign stringbuilder to entirity of value, and then parse using requestparser,
-        // then finally compose a response and send it. 
-        
-        Response resp = new Response(STATUS.OK);
-        
-        resp.setConnectionType("close");
-        resp.setContentType("text/html");
-        
-        
-        pw.close();
+    public ConnectionHandler(Socket s) {	
+    	this.conn  = s;
     }
 
     public void run() {
-        try {
-			conn.close();
-		} catch (IOException e) {
-			// add to logs
-		}
-    }
+	    	try {
+	            br = new BufferedReader(
+	            		new InputStreamReader(conn.getInputStream()));
+	            
+	            String content;
+	            
+	            while((content = br.readLine()) != null)
+	            	System.out.println(content);
+	    	} catch (IOException e) {
+	    			e.printStackTrace();
+	    			// insert logging utility
+	            }
+	            
+	            try {
+	    			pw = new PrintWriter(
+	    					new OutputStreamWriter(conn.getOutputStream()));
+	    		} catch (IOException e) {
+	    			e.printStackTrace();
+	    		}
+	            
+	            Response resp = new Response(STATUS.OK);
+	            
+	            resp.setConnectionType("close");
+	            resp.setContentType("text/html");
+	            resp.insertContent("hello world!");
+	            resp.insertContent("<br><div><b>sdf</b></div>");
+	            pw.print(resp);
+	            
+	            pw.close();
+	    }
 }

src/jswerve/Response.java

@@ -2,45 +2,45 @@
 
 public class Response {
 
-	StringBuilder reqContents;
+	private StringBuilder respContents;
 	private boolean bodyContentInserted = false;
 
 	public Response(STATUS s) {
-		reqContents = new StringBuilder(30);
+		respContents = new StringBuilder(30);
 
 		if(s.equals(STATUS.OK)) {
-			reqContents.append("HTTP/1.1 200");
+			respContents.append("HTTP/1.1 200");
 		}
 
 		else if(s.equals(STATUS.NOT_FOUND)) {
-			reqContents.append("HTTP/1.1 404");
+			respContents.append("HTTP/1.1 404");
 		}
 	}
 
 	public void setContentType(String contentType) {
-		if(!reqContents.toString().contains(contentType)) {
-			reqContents.append("\nContent-type: " + contentType);	
+		if(!respContents.toString().contains(contentType)) {
+			respContents.append("\nContent-type: " + contentType);	
 		}
 	}
 
 	public void setConnectionType(String connectionType) {
-		if(!reqContents.toString().contains(connectionType)) {
-			reqContents.append("\nConnection-type: " + connectionType);		
+		if(!respContents.toString().contains(connectionType)) {
+			respContents.append("\nConnection-type: " + connectionType);		
 		}
 	}
 
 	public void insertContent(String content) {
 		if(!bodyContentInserted) {
-			reqContents.append("\n\n" + content);
+			respContents.append("\n\n" + content);
 			bodyContentInserted = true;
 		}
 
 		else {
-			reqContents.append("\n" + content);
+			respContents.append("\n" + content);
 		}
 	}
 
 	public String toString() {
-		return reqContents.toString();
+		return respContents.toString();
 	}
 }

src/jswerve/RouteHandler.java

@@ -0,0 +1,5 @@
+package jswerve;
+
+public interface RouteHandler {
+	
+}

src/jswerve/STATUS.java

@@ -2,5 +2,5 @@
 
 public enum STATUS {
 	OK, 
-	NOT_FOUND 
+	NOT_FOUND
 }

src/jswerve/TestingClient.java

@@ -3,9 +3,10 @@
 public class TestingServer {
 
     public static void main(String[] args) throws InterruptedException {
-    	int port = 8000;
+    	int port = 8080;
     	System.out.println("Starting server at port: " + port);
 
-    	BaseHTTPServer bhs = new BaseHTTPServer(port);
+    	BaseHTTPServer bhs = new BaseHTTPServer(8080);
+    	(new Thread(bhs)).start();
     }
 }