Skip to content

Commit 109d33c

Browse files
Java 11 migraiton: monostate
1 parent a142c06 commit 109d33c

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

monostate/src/main/java/com/iluwatar/monostate/App.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* <p>In the following example, The {@link LoadBalancer} class represents the app's logic. It
3232
* contains a series of Servers, which can handle requests of type {@link Request}. Two instances of
33-
* LoadBalacer are created. When a request is made to a server via the first LoadBalancer the state
33+
* LoadBalancer are created. When a request is made to a server via the first LoadBalancer the state
3434
* change in the first load balancer affects the second. So if the first LoadBalancer selects the
3535
* Server 1, the second LoadBalancer on a new request will select the Second server. If a third
3636
* LoadBalancer is created and a new request is made to it, then it will select the third server as
@@ -43,8 +43,8 @@ public class App {
4343
* @param args command line args
4444
*/
4545
public static void main(String[] args) {
46-
LoadBalancer loadBalancer1 = new LoadBalancer();
47-
LoadBalancer loadBalancer2 = new LoadBalancer();
46+
var loadBalancer1 = new LoadBalancer();
47+
var loadBalancer2 = new LoadBalancer();
4848
loadBalancer1.serverRequest(new Request("Hello"));
4949
loadBalancer2.serverRequest(new Request("Hello World"));
5050
}

monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public class LoadBalancer {
3838
private static int lastServedId;
3939

4040
static {
41-
int id = 0;
42-
for (int port : new int[]{8080, 8081, 8082, 8083, 8084}) {
41+
var id = 0;
42+
for (var port : new int[]{8080, 8081, 8082, 8083, 8084}) {
4343
SERVERS.add(new Server("localhost", port, ++id));
4444
}
4545
}
@@ -69,7 +69,7 @@ public synchronized void serverRequest(Request request) {
6969
if (lastServedId >= SERVERS.size()) {
7070
lastServedId = 0;
7171
}
72-
Server server = SERVERS.get(lastServedId++);
72+
var server = SERVERS.get(lastServedId++);
7373
server.serve(request);
7474
}
7575

monostate/src/test/java/com/iluwatar/monostate/AppTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public class AppTest {
3232

3333
@Test
3434
public void testMain() {
35-
String[] args = {};
36-
App.main(args);
35+
App.main(new String[]{});
3736
}
3837

3938
}

monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public class LoadBalancerTest {
4444

4545
@Test
4646
public void testSameStateAmongstAllInstances() {
47-
final LoadBalancer firstBalancer = new LoadBalancer();
48-
final LoadBalancer secondBalancer = new LoadBalancer();
47+
final var firstBalancer = new LoadBalancer();
48+
final var secondBalancer = new LoadBalancer();
4949
firstBalancer.addServer(new Server("localhost", 8085, 6));
5050
// Both should have the same number of servers.
5151
assertEquals(firstBalancer.getNoOfServers(), secondBalancer.getNoOfServers());
@@ -55,18 +55,18 @@ public void testSameStateAmongstAllInstances() {
5555

5656
@Test
5757
public void testServe() {
58-
final Server server = mock(Server.class);
58+
final var server = mock(Server.class);
5959
when(server.getHost()).thenReturn("testhost");
6060
when(server.getPort()).thenReturn(1234);
6161
doNothing().when(server).serve(any(Request.class));
6262

63-
final LoadBalancer loadBalancer = new LoadBalancer();
63+
final var loadBalancer = new LoadBalancer();
6464
loadBalancer.addServer(server);
6565

6666
verifyZeroInteractions(server);
6767

68-
final Request request = new Request("test");
69-
for (int i = 0; i < loadBalancer.getNoOfServers() * 2; i++) {
68+
final var request = new Request("test");
69+
for (var i = 0; i < loadBalancer.getNoOfServers() * 2; i++) {
7070
loadBalancer.serverRequest(request);
7171
}
7272

0 commit comments

Comments
 (0)