Skip to content

Commit 059a7af

Browse files
committed
Remove spied injected Factory classes
1 parent 82913ab commit 059a7af

File tree

7 files changed

+14
-89
lines changed

7 files changed

+14
-89
lines changed

src/main/java/httpserver/App.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package httpserver;
22

3+
import java.io.IOException;
4+
35
public class App {
46
public static void main(String[] args) {
5-
int portNumber = Integer.parseInt(args[1]);
7+
int port = Integer.parseInt(args[1]);
68
String fileDirectory = args[3];
7-
9+
SocketServer socketServer = new SocketServer(port, fileDirectory);
10+
try {
11+
socketServer.run();
12+
} catch (IOException e) {
13+
e.printStackTrace();
14+
}
815
}
916
}

src/main/java/httpserver/ServerSocketFactory.java

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
package httpserver;
22

33
import java.io.IOException;
4-
import java.io.InputStream;
5-
import java.io.OutputStream;
64
import java.net.ServerSocket;
75
import java.net.Socket;
86

97
public class SocketServer {
108

119
private final String fileDirectory;
1210
private final int port;
13-
private final ServerSocketFactory serverSocketFactory;
1411

15-
public SocketServer(int port, String fileDirectory, ServerSocketFactory serverSocketFactory) {
12+
public SocketServer(int port, String fileDirectory) {
1613
this.port = port;
1714
this.fileDirectory = fileDirectory;
18-
this.serverSocketFactory = serverSocketFactory;
1915
}
2016

2117
public void run() throws IOException {
22-
ServerSocket serverSocket = serverSocketFactory.makeServerSocket(port);
23-
serverSocket.accept();
18+
ServerSocket serverSocket = new ServerSocket(port);
19+
Socket clientSocket = serverSocket.accept();
20+
IoProcessor ioProcessor = new IoProcessor(fileDirectory);
21+
ioProcessor.process(clientSocket.getInputStream(), clientSocket.getOutputStream());
2422
}
2523
}

src/test/java/.DS_Store

6 KB
Binary file not shown.

src/test/java/httpserver/ServerSocketFactoryMock.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/test/java/httpserver/ServerSocketStub.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/test/java/httpserver/SocketServerTest.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)