Skip to content

Commit 726bfa9

Browse files
onlyskinonlyskin
committed
Rename ResponderSupplier
1 parent dfbb70b commit 726bfa9

File tree

7 files changed

+44
-46
lines changed

7 files changed

+44
-46
lines changed

src/main/java/httpserver/ResponderSupplier.java renamed to src/main/java/httpserver/MethodResponderSupplier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import java.util.ArrayList;
77
import java.util.List;
88

9-
public class ResponderSupplier {
9+
public class MethodResponderSupplier {
1010
private final MethodResponder invalidMethodResponder;
1111
private final List<MethodResponder> methodResponders;
1212

13-
public ResponderSupplier(MethodResponder invalidMethodResponder) {
13+
public MethodResponderSupplier(MethodResponder invalidMethodResponder) {
1414
this.invalidMethodResponder = invalidMethodResponder;
1515
this.methodResponders = new ArrayList<>();
1616
}

‎src/main/java/httpserver/ResponderSupplierFactory.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import httpserver.responder.special.*;
99

1010
public class ResponderSupplierFactory {
11-
public ResponderSupplier makeResponderSupplier() {
12-
ResponderSupplier responderSupplier = new ResponderSupplier(new InvalidMethodResponder());
11+
public MethodResponderSupplier makeResponderSupplier() {
12+
MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier(new InvalidMethodResponder());
1313

1414
PathExaminer pathExaminer = new PathExaminer();
1515
FileOperator fileOperator = new FileOperator();
@@ -18,32 +18,32 @@ public ResponderSupplier makeResponderSupplier() {
1818
RangeHeaderValueParser rangeHeaderValueParser = new RangeHeaderValueParser();
1919
Hasher hasher = new Hasher();
2020

21-
responderSupplier.registerResponder(new GetResponder(
21+
methodResponderSupplier.registerResponder(new GetResponder(
2222
routeMap,
2323
pathExaminer,
2424
html,
2525
rangeHeaderValueParser));
26-
responderSupplier.registerResponder(new HeadResponder(
26+
methodResponderSupplier.registerResponder(new HeadResponder(
2727
routeMap,
2828
pathExaminer,
2929
html,
3030
rangeHeaderValueParser));
31-
responderSupplier.registerResponder(new PostResponder(
31+
methodResponderSupplier.registerResponder(new PostResponder(
3232
pathExaminer,
3333
fileOperator));
34-
responderSupplier.registerResponder(new PutResponder(
34+
methodResponderSupplier.registerResponder(new PutResponder(
3535
pathExaminer,
3636
fileOperator));
37-
responderSupplier.registerResponder(new PatchResponder(
37+
methodResponderSupplier.registerResponder(new PatchResponder(
3838
pathExaminer,
3939
fileOperator,
4040
hasher));
41-
responderSupplier.registerResponder(new DeleteResponder(
41+
methodResponderSupplier.registerResponder(new DeleteResponder(
4242
pathExaminer,
4343
fileOperator));
44-
responderSupplier.registerResponder(new OptionsResponder(responderSupplier));
44+
methodResponderSupplier.registerResponder(new OptionsResponder(methodResponderSupplier));
4545

46-
return responderSupplier;
46+
return methodResponderSupplier;
4747
}
4848

4949
private RouteMap getRouteMap(PathExaminer pathExaminer, FileOperator fileOperator) {

‎src/main/java/httpserver/responder/GeneralResponder.java‎

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

33
import httpserver.AppConfig;
44
import httpserver.request.Request;
5-
import httpserver.ResponderSupplier;
5+
import httpserver.MethodResponderSupplier;
66
import httpserver.response.Response;
77
import httpserver.response.ServerErrorResponse;
88

99
import java.io.IOException;
1010

1111
public class GeneralResponder {
12-
private final ResponderSupplier responderSupplier;
12+
private final MethodResponderSupplier methodResponderSupplier;
1313

14-
public GeneralResponder(ResponderSupplier responderSupplier) {
15-
this.responderSupplier = responderSupplier;
14+
public GeneralResponder(MethodResponderSupplier methodResponderSupplier) {
15+
this.methodResponderSupplier = methodResponderSupplier;
1616
}
1717

1818
public Response respond(AppConfig appConfig, Request request) {
19-
Responder responder = responderSupplier.supplyResponder(request);
19+
Responder responder = methodResponderSupplier.supplyResponder(request);
2020
try {
2121
return responder.respond(appConfig, request);
2222
} catch (IOException e) {

‎src/main/java/httpserver/responder/OptionsResponder.java‎

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

33
import httpserver.AppConfig;
44
import httpserver.request.Request;
5-
import httpserver.ResponderSupplier;
5+
import httpserver.MethodResponderSupplier;
66
import httpserver.header.Header;
77
import httpserver.response.OkResponse;
88
import httpserver.response.Response;
@@ -11,16 +11,16 @@
1111
import java.util.StringJoiner;
1212

1313
public class OptionsResponder extends MethodResponder {
14-
private final ResponderSupplier responderSupplier;
14+
private final MethodResponderSupplier methodResponderSupplier;
1515

16-
public OptionsResponder(ResponderSupplier responderSupplier) {
17-
this.responderSupplier = responderSupplier;
16+
public OptionsResponder(MethodResponderSupplier methodResponderSupplier) {
17+
this.methodResponderSupplier = methodResponderSupplier;
1818
super.methodString = "OPTIONS";
1919
}
2020

2121
@Override
2222
public Response respond(AppConfig appConfig, Request request) {
23-
List<MethodResponder> methodResponders = responderSupplier.allResponders();
23+
List<MethodResponder> methodResponders = methodResponderSupplier.allResponders();
2424
StringJoiner joiner = new StringJoiner(",");
2525

2626
for (MethodResponder methodResponder: methodResponders) {

src/test/java/httpserver/ResponderSupplierTest.java renamed to src/test/java/httpserver/MethodResponderSupplierTest.java

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

15-
public class ResponderSupplierTest {
15+
public class MethodResponderSupplierTest {
1616

1717
private final GetResponder getResponderMock;
1818
private final InvalidMethodResponder invalidMethodResponderMock;
19-
private final ResponderSupplier responderSupplier;
19+
private final MethodResponderSupplier methodResponderSupplier;
2020
private final PostResponder postResponderMock;
2121

22-
public ResponderSupplierTest() {
22+
public MethodResponderSupplierTest() {
2323
getResponderMock = mock(GetResponder.class);
2424
postResponderMock = mock(PostResponder.class);
2525
invalidMethodResponderMock = mock(InvalidMethodResponder.class);
26-
responderSupplier = new ResponderSupplier(invalidMethodResponderMock);
27-
responderSupplier.registerResponder(getResponderMock);
28-
responderSupplier.registerResponder(postResponderMock);
26+
methodResponderSupplier = new MethodResponderSupplier(invalidMethodResponderMock);
27+
methodResponderSupplier.registerResponder(getResponderMock);
28+
methodResponderSupplier.registerResponder(postResponderMock);
2929
}
3030

3131
@Test
3232
public void returnsResponderForMethod() throws Exception {
3333
Request request = new Request("GET", null, null, null);
3434
when(getResponderMock.handles(any())).thenReturn(true);
3535

36-
MethodResponder methodResponder = responderSupplier.supplyResponder(request);
36+
MethodResponder methodResponder = methodResponderSupplier.supplyResponder(request);
3737

3838
assertEquals(getResponderMock, methodResponder);
3939
}
@@ -42,14 +42,14 @@ public void returnsResponderForMethod() throws Exception {
4242
public void returnsInvalidMethodIfNotPresent() throws Exception {
4343
Request request = new Request("AAA", null, null, null);
4444

45-
MethodResponder methodResponder = responderSupplier.supplyResponder(request);
45+
MethodResponder methodResponder = methodResponderSupplier.supplyResponder(request);
4646

4747
assertEquals(invalidMethodResponderMock, methodResponder);
4848
}
4949

5050
@Test
5151
public void returnsAllRespondersRegistered() throws Exception {
52-
List<MethodResponder> actual = responderSupplier.allResponders();
52+
List<MethodResponder> actual = methodResponderSupplier.allResponders();
5353

5454
assertEquals(actual.get(0), getResponderMock);
5555
assertEquals(actual.get(1), postResponderMock);

‎src/test/java/httpserver/responder/GeneralResponderTest.java‎

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

33
import httpserver.AppConfig;
44
import httpserver.request.Request;
5-
import httpserver.ResponderSupplier;
5+
import httpserver.MethodResponderSupplier;
66
import httpserver.response.Response;
77
import org.junit.Test;
88

@@ -15,33 +15,33 @@ public class GeneralResponderTest {
1515

1616
private final AppConfig appConfigMock;
1717
private final Request requestMock;
18-
private final ResponderSupplier responderSupplierMock;
18+
private final MethodResponderSupplier methodResponderSupplierMock;
1919
private final MethodResponder methodResponderMock;
2020
private final GeneralResponder generalResponder;
2121

2222
public GeneralResponderTest() {
2323
appConfigMock = mock(AppConfig.class);
2424
requestMock = mock(Request.class);
2525
when(requestMock.getMethodString()).thenReturn("methodString");
26-
responderSupplierMock = mock(ResponderSupplier.class);
26+
methodResponderSupplierMock = mock(MethodResponderSupplier.class);
2727
methodResponderMock = mock(MethodResponder.class);
28-
generalResponder = new GeneralResponder(responderSupplierMock);
28+
generalResponder = new GeneralResponder(methodResponderSupplierMock);
2929
}
3030

3131
@Test
3232
public void callsSupplyResponderOnResponderSupplierWithRequest() throws Exception {
33-
when(responderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
33+
when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
3434

3535
generalResponder.respond(appConfigMock, requestMock);
3636

37-
verify(responderSupplierMock).supplyResponder(requestMock);
37+
verify(methodResponderSupplierMock).supplyResponder(requestMock);
3838
verify(methodResponderMock).respond(appConfigMock, requestMock);
3939
}
4040

4141
@Test
4242
public void returnsServerErrorResponseIfTheResponderCalledReturnsAnError() throws Exception {
4343
when(methodResponderMock.respond(any(), any())).thenThrow(new IOException());
44-
when(responderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
44+
when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
4545

4646
Response response = generalResponder.respond(appConfigMock, requestMock);
4747

‎src/test/java/httpserver/responder/OptionsResponderTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package httpserver.responder;
22

33
import httpserver.AppConfig;
4-
import httpserver.Method;
54
import httpserver.request.Request;
6-
import httpserver.ResponderSupplier;
5+
import httpserver.MethodResponderSupplier;
76
import httpserver.header.Header;
87
import httpserver.response.Response;
9-
import org.junit.Ignore;
108
import org.junit.Test;
119

1210
import static org.junit.Assert.*;
@@ -26,14 +24,14 @@ public void responderHasListOfAllowedMethodsInAllowHeader() throws Exception {
2624
MethodResponder putResponderMock = mock(PutResponder.class);
2725
when(putResponderMock.allows("")).thenReturn(false);
2826

29-
ResponderSupplier responderSupplier = new ResponderSupplier(mock(InvalidMethodResponder.class));
30-
responderSupplier.registerResponder(getResponderMock);
31-
responderSupplier.registerResponder(headResponderMock);
32-
responderSupplier.registerResponder(putResponderMock);
27+
MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier(mock(InvalidMethodResponder.class));
28+
methodResponderSupplier.registerResponder(getResponderMock);
29+
methodResponderSupplier.registerResponder(headResponderMock);
30+
methodResponderSupplier.registerResponder(putResponderMock);
3331

3432
Request request = new Request("OPTIONS", "", new Header[0], "");
3533

36-
OptionsResponder optionsResponder = new OptionsResponder(responderSupplier);
34+
OptionsResponder optionsResponder = new OptionsResponder(methodResponderSupplier);
3735
Response response = optionsResponder.respond(mock(AppConfig.class), request);
3836

3937
assertEquals(200, response.getStatusCode());

0 commit comments

Comments
 (0)