Skip to content

Commit 57d3411

Browse files
jamesdbloomjamesdbloom
committed
slightly clarified the nameing and removed comments that are obvious from the code / naming
1 parent e60f8df commit 57d3411

File tree

5 files changed

+48
-88
lines changed

5 files changed

+48
-88
lines changed

‎mockserver-client-java/src/main/java/org/mockserver/client/ForwardChainExpectation.java

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

33
import com.google.common.annotations.VisibleForTesting;
44

5-
import org.mockserver.client.MockServerEventBus.MockServerEvent;
6-
import org.mockserver.client.MockServerEventBus.MockServerEventSubscriber;
5+
import org.mockserver.client.MockServerEventBus.EventType;
6+
import org.mockserver.client.MockServerEventBus.SubscriberHandler;
77
import org.mockserver.client.netty.websocket.WebSocketClient;
88
import org.mockserver.client.netty.websocket.WebSocketException;
99
import org.mockserver.mock.Expectation;
@@ -24,14 +24,14 @@ public ForwardChainExpectation(MockServerClient mockServerClient, Expectation ex
2424
this.mockServerClient = mockServerClient;
2525
this.expectation = expectation;
2626

27-
MockServerEventBus.getInstance().subscribe(new MockServerEventSubscriber() {
27+
MockServerEventBus.getInstance().subscribe(new SubscriberHandler() {
2828
@Override
2929
public void handle() {
3030
if (webSocketClient != null) {
3131
webSocketClient.stopClient();
3232
}
3333
}
34-
}, MockServerEvent.STOP, MockServerEvent.RESET);
34+
}, EventType.STOP, EventType.RESET);
3535
}
3636

3737
/**

‎mockserver-client-java/src/main/java/org/mockserver/client/MockServerClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.base.Strings;
44
import org.apache.commons.lang3.StringUtils;
55
import org.mockserver.Version;
6-
import org.mockserver.client.MockServerEventBus.MockServerEvent;
6+
import org.mockserver.client.MockServerEventBus.EventType;
77
import org.mockserver.client.netty.NettyHttpClient;
88
import org.mockserver.client.netty.SocketConnectionException;
99
import org.mockserver.configuration.ConfigurationProperties;
@@ -211,7 +211,7 @@ public List<Integer> bind(Integer... ports) {
211211
* Stop MockServer gracefully (only support for Netty version, not supported for WAR version)
212212
*/
213213
public MockServerClient stop() {
214-
MockServerEventBus.getInstance().publish(MockServerEvent.STOP);
214+
MockServerEventBus.getInstance().publish(EventType.STOP);
215215
return stop(false);
216216
}
217217

@@ -243,7 +243,7 @@ public void close() {
243243
* Reset MockServer by clearing all expectations
244244
*/
245245
public MockServerClient reset() {
246-
MockServerEventBus.getInstance().publish(MockServerEvent.RESET);
246+
MockServerEventBus.getInstance().publish(EventType.RESET);
247247
sendRequest(request().withMethod("PUT").withPath(calculatePath("reset")));
248248
return clientClass.cast(this);
249249
}

‎mockserver-client-java/src/main/java/org/mockserver/client/MockServerEventBus.java

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,45 @@
11
package org.mockserver.client;
22

3+
import com.google.common.collect.LinkedListMultimap;
34
import com.google.common.collect.Multimap;
4-
import com.google.common.collect.MultimapBuilder.ListMultimapBuilder;
55

66
/**
7-
* A publish/subscribe communication channel between {@link MockServerClient}
8-
* and {@link ForwardChainExpectation} instances
9-
*
10-
* Use {@link #getInstance()} to get the instance.
11-
*
7+
* A publish/subscribe communication channel between {@link MockServerClient} and {@link ForwardChainExpectation} instances
8+
*
129
* @author albans
1310
*/
1411
final class MockServerEventBus {
1512
private static MockServerEventBus instance;
1613

17-
private final Multimap<MockServerEvent, MockServerEventSubscriber> subscribers = ListMultimapBuilder
18-
.enumKeys(MockServerEvent.class).arrayListValues().build();
19-
20-
/**
21-
* {@link MockServerEvent} subscribers pass an instance of an implementation of
22-
* this class to
23-
* {@link MockServerEventBus#subscribe(MockServerEventSubscriber, MockServerEvent...)}
24-
* to subscribe to events
25-
*/
26-
static interface MockServerEventSubscriber {
27-
void handle();
28-
}
29-
30-
/**
31-
* Enumeration of events handled by this bus.
32-
*/
33-
static enum MockServerEvent {
34-
STOP, RESET;
35-
}
14+
private final Multimap<EventType, SubscriberHandler> subscribers = LinkedListMultimap.create();
3615

3716
private MockServerEventBus() {
3817
}
3918

40-
/**
41-
* Return the instance of {@link MockServerEventBus}.
42-
*
43-
* @return instance
44-
*/
4519
public static MockServerEventBus getInstance() {
4620
if (instance == null) {
4721
instance = new MockServerEventBus();
4822
}
4923
return instance;
5024
}
5125

52-
/**
53-
* Publish the event given as parameter.
54-
*
55-
* @param event
56-
*/
57-
public void publish(MockServerEvent event) {
58-
for (MockServerEventSubscriber subscriber : subscribers.get(event)) {
26+
void publish(EventType event) {
27+
for (SubscriberHandler subscriber : subscribers.get(event)) {
5928
subscriber.handle();
6029
}
6130
}
6231

63-
/**
64-
* Subscribe the the events given as parameters using the given subscriber.
65-
*
66-
* @param subscriber
67-
* @param events
68-
*/
69-
public void subscribe(MockServerEventSubscriber subscriber, MockServerEvent... events) {
70-
for (MockServerEvent event : events) {
32+
public void subscribe(SubscriberHandler subscriber, EventType... events) {
33+
for (EventType event : events) {
7134
subscribers.put(event, subscriber);
7235
}
7336
}
37+
38+
enum EventType {
39+
STOP, RESET;
40+
}
41+
42+
interface SubscriberHandler {
43+
void handle();
44+
}
7445
}

‎mockserver-client-java/src/test/java/org/mockserver/client/MockServerEventBusTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
import static org.mockito.Mockito.times;
55
import static org.mockito.Mockito.verify;
66
import static org.mockito.MockitoAnnotations.initMocks;
7-
import static org.mockserver.client.MockServerEventBus.MockServerEvent.RESET;
8-
import static org.mockserver.client.MockServerEventBus.MockServerEvent.STOP;
7+
import static org.mockserver.client.MockServerEventBus.EventType.RESET;
8+
import static org.mockserver.client.MockServerEventBus.EventType.STOP;
99

1010
import org.junit.Before;
1111
import org.junit.Test;
1212
import org.mockito.Mock;
13-
import org.mockserver.client.MockServerEventBus.MockServerEventSubscriber;
13+
import org.mockserver.client.MockServerEventBus.SubscriberHandler;
1414

1515
/**
1616
* @author albans
1717
*/
1818
public class MockServerEventBusTest {
1919
@Mock
20-
private MockServerEventSubscriber subscriber;
20+
private SubscriberHandler subscriber;
2121

2222
@Mock
23-
private MockServerEventSubscriber secondSubscriber;
23+
private SubscriberHandler secondSubscriber;
2424

2525
private MockServerEventBus bus;
2626

‎mockserver-client-java/src/test/java/org/mockserver/serialization/java/CompileGeneratedJavaCodeTest.java

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
@Ignore("ignored due to issue with classpath during maven build")
3131
public class CompileGeneratedJavaCodeTest {
3232

33+
private static final String commonImports = "" +
34+
"import org.mockserver.client.MockServerClient;" + NEW_LINE +
35+
"import org.mockserver.matchers.Times;" + NEW_LINE +
36+
"import org.mockserver.matchers.TimeToLive;" + NEW_LINE +
37+
"import org.mockserver.mock.Expectation;" + NEW_LINE +
38+
"import org.mockserver.model.*;" + NEW_LINE +
39+
"import static org.mockserver.model.HttpRequest.request;" + NEW_LINE;
40+
3341
@Test
3442
public void shouldCompileExpectationWithHttpResponse() throws URISyntaxException {
3543

@@ -71,12 +79,7 @@ public void shouldCompileExpectationWithHttpResponse() throws URISyntaxException
7179
)
7280
);
7381

74-
assertTrue(compileJavaCode("" +
75-
"import org.mockserver.client.server.MockServerClient;" + NEW_LINE +
76-
"import org.mockserver.matchers.Times;" + NEW_LINE +
77-
"import org.mockserver.mock.Expectation;" + NEW_LINE +
78-
"import org.mockserver.model.*;" + NEW_LINE +
79-
"import static org.mockserver.model.HttpRequest.request;" + NEW_LINE +
82+
assertTrue(compileJavaCode(commonImports +
8083
"import static org.mockserver.model.HttpResponse.response;" + NEW_LINE + NEW_LINE +
8184
"class TestClass {" + NEW_LINE +
8285
" static {" +
@@ -118,12 +121,7 @@ public void shouldCompileExpectationWithHttpResponseTemplate() throws URISyntaxE
118121
)
119122
);
120123

121-
assertTrue(compileJavaCode("" +
122-
"import org.mockserver.client.server.MockServerClient;" + NEW_LINE +
123-
"import org.mockserver.matchers.Times;" + NEW_LINE +
124-
"import org.mockserver.mock.Expectation;" + NEW_LINE +
125-
"import org.mockserver.model.*;" + NEW_LINE +
126-
"import static org.mockserver.model.HttpRequest.request;" + NEW_LINE +
124+
assertTrue(compileJavaCode(commonImports +
127125
"import static org.mockserver.model.HttpTemplate.template;" + NEW_LINE + NEW_LINE +
128126
"class TestClass {" + NEW_LINE +
129127
" static {" +
@@ -167,18 +165,13 @@ public void shouldCompileExpectationWithHttpForward() throws URISyntaxException
167165
)
168166
);
169167

170-
assertTrue(compileJavaCode("" +
171-
"import org.mockserver.client.server.MockServerClient;" + NEW_LINE +
172-
"import org.mockserver.matchers.Times;" + NEW_LINE +
173-
"import org.mockserver.mock.Expectation;" + NEW_LINE +
174-
"import org.mockserver.model.*;" + NEW_LINE +
175-
"import static org.mockserver.model.HttpRequest.request;" + NEW_LINE +
176-
"import static org.mockserver.model.HttpForward.forward;" + NEW_LINE + NEW_LINE +
177-
"class TestClass {" + NEW_LINE +
178-
" static {" +
179-
" " + expectationAsJavaCode + "" + NEW_LINE +
180-
" }" + NEW_LINE +
181-
"}")
168+
assertTrue(compileJavaCode(commonImports +
169+
"import static org.mockserver.model.HttpForward.forward;" + NEW_LINE + NEW_LINE +
170+
"class TestClass {" + NEW_LINE +
171+
" static {" +
172+
" " + expectationAsJavaCode + "" + NEW_LINE +
173+
" }" + NEW_LINE +
174+
"}")
182175
);
183176
}
184177

@@ -214,12 +207,7 @@ public void shouldCompileExpectationWithClassCallback() throws URISyntaxExceptio
214207
)
215208
);
216209

217-
assertTrue(compileJavaCode("" +
218-
"import org.mockserver.client.server.MockServerClient;" + NEW_LINE +
219-
"import org.mockserver.matchers.Times;" + NEW_LINE +
220-
"import org.mockserver.mock.Expectation;" + NEW_LINE +
221-
"import org.mockserver.model.*;" + NEW_LINE +
222-
"import static org.mockserver.model.HttpRequest.request;" + NEW_LINE +
210+
assertTrue(compileJavaCode(commonImports +
223211
"import static org.mockserver.model.HttpClassCallback.callback;" + NEW_LINE + NEW_LINE +
224212
"class TestClass {" + NEW_LINE +
225213
" static {" +
@@ -262,8 +250,9 @@ public void shouldCompileExpectationWithObjectCallback() throws URISyntaxExcepti
262250
);
263251

264252
assertTrue(compileJavaCode("" +
265-
"import org.mockserver.client.server.MockServerClient;" + NEW_LINE +
253+
"import org.mockserver.client.MockServerClient;" + NEW_LINE +
266254
"import org.mockserver.matchers.Times;" + NEW_LINE +
255+
"import org.mockserver.matchers.TimeToLive;" + NEW_LINE +
267256
"import org.mockserver.mock.Expectation;" + NEW_LINE +
268257
"import org.mockserver.model.*;" + NEW_LINE +
269258
"import static org.mockserver.model.HttpRequest.request;" + NEW_LINE + NEW_LINE +

0 commit comments

Comments
 (0)