Skip to content

Commit 7c72830

Browse files
onlyskinonlyskin
committed
Rename class
1 parent e8dd20f commit 7c72830

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

src/main/java/httpserver/ResponderSupplierFactory.java renamed to src/main/java/httpserver/MethodResponderSupplierFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import httpserver.responder.*;
88
import httpserver.route.*;
99

10-
public class ResponderSupplierFactory {
10+
public class MethodResponderSupplierFactory {
1111
public MethodResponderSupplier makeResponderSupplier() {
1212
MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier();
1313

1414
PathExaminer pathExaminer = new PathExaminer();
1515
FileOperator fileOperator = new FileOperator();
16-
Router router = getRouter(pathExaminer, fileOperator);
16+
Router router = makeRouter(pathExaminer, fileOperator);
1717
Html html = new Html();
1818
RangeHeaderValueParser rangeHeaderValueParser = new RangeHeaderValueParser();
1919
Hasher hasher = new Hasher();
@@ -46,7 +46,7 @@ public MethodResponderSupplier makeResponderSupplier() {
4646
return methodResponderSupplier;
4747
}
4848

49-
private Router getRouter(PathExaminer pathExaminer, FileOperator fileOperator) {
49+
private Router makeRouter(PathExaminer pathExaminer, FileOperator fileOperator) {
5050
Route[] routeList = new Route[]{
5151
new CoffeeRoute(),
5252
new TeaRoute(),

‎src/main/java/httpserver/SocketHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import httpserver.request.Request;
44
import httpserver.request.RequestParser;
5-
import httpserver.responder.GeneralResponder;
5+
import httpserver.responder.Responder;
66
import httpserver.response.BadRequestResponse;
77
import httpserver.response.MethodNotAllowedResponse;
88
import httpserver.response.Response;
@@ -14,18 +14,18 @@ public class SocketHandler implements Runnable {
1414
private final AppConfig appConfig;
1515
private final InputStream inputStream;
1616
private final RequestParser requestParser;
17-
private final GeneralResponder generalResponder;
17+
private final Responder responder;
1818
private final ResponseWriter responseWriter;
1919

2020
public SocketHandler(AppConfig appConfig,
2121
InputStream inputStream,
2222
RequestParser requestParser,
23-
GeneralResponder generalResponder,
23+
Responder responder,
2424
ResponseWriter responseWriter) {
2525
this.appConfig = appConfig;
2626
this.inputStream = inputStream;
2727
this.requestParser = requestParser;
28-
this.generalResponder = generalResponder;
28+
this.responder = responder;
2929
this.responseWriter = responseWriter;
3030
}
3131

@@ -34,7 +34,7 @@ public void run() {
3434

3535
try {
3636
Request request = requestParser.parse(inputStream);
37-
response = generalResponder.respond(appConfig, request);
37+
response = responder.respond(appConfig, request);
3838
} catch (IllegalArgumentException e) {
3939
response = new MethodNotAllowedResponse();
4040
} catch (Exception e) {

‎src/main/java/httpserver/SocketHandlerFactory.java‎

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

33
import httpserver.request.RequestParser;
4-
import httpserver.responder.GeneralResponder;
4+
import httpserver.responder.Responder;
55

66
import java.io.IOException;
77
import java.io.InputStream;
@@ -13,15 +13,15 @@ public SocketHandler newSocketHandler(AppConfig appConfig, Socket clientSocket)
1313
return new SocketHandler(appConfig,
1414
clientSocket.getInputStream(),
1515
new RequestParser(appConfig),
16-
new GeneralResponder(new ResponderSupplierFactory().makeResponderSupplier()),
16+
new Responder(new MethodResponderSupplierFactory().makeResponderSupplier()),
1717
new ResponseWriter(clientSocket.getOutputStream()));
1818
}
1919

2020
public SocketHandler newSocketHandlerFromStreams(AppConfig appConfig, InputStream inputStream, OutputStream outputStream) throws IOException {
2121
return new SocketHandler(appConfig,
2222
inputStream,
2323
new RequestParser(appConfig),
24-
new GeneralResponder(new ResponderSupplierFactory().makeResponderSupplier()),
24+
new Responder(new MethodResponderSupplierFactory().makeResponderSupplier()),
2525
new ResponseWriter(outputStream));
2626
}
2727
}

src/main/java/httpserver/responder/GeneralResponder.java renamed to src/main/java/httpserver/responder/Responder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
import java.io.IOException;
1111

12-
public class GeneralResponder {
12+
public class Responder {
1313
private final MethodResponderSupplier methodResponderSupplier;
1414

15-
public GeneralResponder(MethodResponderSupplier methodResponderSupplier) {
15+
public Responder(MethodResponderSupplier methodResponderSupplier) {
1616
this.methodResponderSupplier = methodResponderSupplier;
1717
}
1818

‎src/test/java/httpserver/SocketHandlerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import httpserver.file.FileOperator;
44
import httpserver.request.Request;
55
import httpserver.request.RequestParser;
6-
import httpserver.responder.GeneralResponder;
6+
import httpserver.responder.Responder;
77
import httpserver.response.Response;
88
import org.junit.Test;
99

@@ -40,21 +40,21 @@ public void callsInjectedPartsCorrectly() throws Exception {
4040
RequestParser requestParserMock = mock(RequestParser.class);
4141
Request requestMock = mock(Request.class);
4242
when(requestParserMock.parse(inputStreamMock)).thenReturn(requestMock);
43-
GeneralResponder generalResponderMock = mock(GeneralResponder.class);
43+
Responder responderMock = mock(Responder.class);
4444
Response responseMock = mock(Response.class);
45-
when(generalResponderMock.respond(appConfigMock, requestMock)).thenReturn(responseMock);
45+
when(responderMock.respond(appConfigMock, requestMock)).thenReturn(responseMock);
4646
ResponseWriter responseWriterMock = mock(ResponseWriter.class);
4747

4848
SocketHandler socketHandler = new SocketHandler(appConfigMock,
4949
inputStreamMock,
5050
requestParserMock,
51-
generalResponderMock,
51+
responderMock,
5252
responseWriterMock);
5353

5454
socketHandler.run();
5555

5656
verify(requestParserMock).parse(inputStreamMock);
57-
verify(generalResponderMock).respond(appConfigMock, requestMock);
57+
verify(responderMock).respond(appConfigMock, requestMock);
5858
verify(responseWriterMock).write(responseMock);
5959
verify(inputStreamMock).close();
6060
}

src/test/java/httpserver/responder/GeneralResponderTest.java renamed to src/test/java/httpserver/responder/ResponderTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@
1111
import static org.junit.Assert.*;
1212
import static org.mockito.Mockito.*;
1313

14-
public class GeneralResponderTest {
14+
public class ResponderTest {
1515

1616
private final AppConfig appConfigMock;
1717
private final Request requestMock;
1818
private final MethodResponderSupplier methodResponderSupplierMock;
1919
private final MethodResponder methodResponderMock;
20-
private final GeneralResponder generalResponder;
20+
private final Responder responder;
2121

22-
public GeneralResponderTest() {
22+
public ResponderTest() {
2323
appConfigMock = mock(AppConfig.class);
2424
requestMock = mock(Request.class);
2525
methodResponderSupplierMock = mock(MethodResponderSupplier.class);
2626
methodResponderMock = mock(MethodResponder.class);
27-
generalResponder = new GeneralResponder(methodResponderSupplierMock);
27+
responder = new Responder(methodResponderSupplierMock);
2828
}
2929

3030
@Test
3131
public void callsSupplyResponderOnResponderSupplierWithRequest() throws Exception {
3232
when(methodResponderMock.allows(any(Request.class))).thenReturn(true);
3333
when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
3434

35-
generalResponder.respond(appConfigMock, requestMock);
35+
responder.respond(appConfigMock, requestMock);
3636

3737
verify(methodResponderSupplierMock).supplyResponder(requestMock);
3838
verify(methodResponderMock).respond(appConfigMock, requestMock);
@@ -43,7 +43,7 @@ public void returns405IfTheResponderCalledDoesntAllowTheRequest() throws Excepti
4343
when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
4444
when(methodResponderMock.allows(any(Request.class))).thenReturn(false);
4545

46-
Response response = generalResponder.respond(appConfigMock, requestMock);
46+
Response response = responder.respond(appConfigMock, requestMock);
4747

4848
assertEquals(405, response.getStatusCode());
4949
}
@@ -52,7 +52,7 @@ public void returns405IfTheResponderCalledDoesntAllowTheRequest() throws Excepti
5252
public void returns405IfTheMethodSupplierThrowsAnException() throws Exception {
5353
when(methodResponderSupplierMock.supplyResponder(any())).thenThrow(new Exception());
5454

55-
Response response = generalResponder.respond(appConfigMock, requestMock);
55+
Response response = responder.respond(appConfigMock, requestMock);
5656

5757
assertEquals(405, response.getStatusCode());
5858
}
@@ -63,7 +63,7 @@ public void returnsServerErrorResponseIfTheResponderCalledReturnsAnError() throw
6363
when(methodResponderMock.respond(any(), any())).thenThrow(new IOException());
6464
when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
6565

66-
Response response = generalResponder.respond(appConfigMock, requestMock);
66+
Response response = responder.respond(appConfigMock, requestMock);
6767

6868
assertEquals(500, response.getStatusCode());
6969
}

0 commit comments

Comments
 (0)