gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor refactorings and code style changes (#807)

Browse Source 
* Made minor changes in some patterns such as removed throws clause where not needed, changed incorrect order of arguments in assertEquals

* Minor refactorings and code style changes. 1) Removed several use of raw types 2) Removed unnecessary throws clauses 3) Used lambda expressions wherever applicable 4) Used apt assertion methods for readability 5) Use of try with resources wherever applicable 6) Corrected incorrect order of assertXXX arguments

* Removed unused import from Promise

* Addressed review comments

* Addressed checkstyle issue
This commit is contained in:
Narendra Pathai
2018-10-23 13:45:41 +05:30
committed by GitHub
parent 25ed7c09c5
commit 2aa9e78ddd
112 changed files with 312 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
View File

@ -34,33 +34,31 @@ import java.util.List;
*/
public class LoadBalancer {
private static List<Server> servers = new ArrayList<>();
private static final List<Server> SERVERS = new ArrayList<>();
private static int lastServedId;
static {
int id = 0;
servers.add(new Server("localhost", 8081, ++id));
servers.add(new Server("localhost", 8080, ++id));
servers.add(new Server("localhost", 8082, ++id));
servers.add(new Server("localhost", 8083, ++id));
servers.add(new Server("localhost", 8084, ++id));
for (int port : new int[] {8080, 8081, 8082, 8083, 8084}) {
SERVERS.add(new Server("localhost", port, ++id));
}
}
/**
* Add new server
*/
public final void addServer(Server server) {
synchronized (servers) {
servers.add(server);
synchronized (SERVERS) {
SERVERS.add(server);
}
}
public final int getNoOfServers() {
return servers.size();
return SERVERS.size();
}
public static int getLastServedId() {
public int getLastServedId() {
return lastServedId;
}
@ -68,10 +66,10 @@ public class LoadBalancer {
* Handle request
*/
public synchronized void serverRequest(Request request) {
if (lastServedId >= servers.size()) {
if (lastServedId >= SERVERS.size()) {
lastServedId = 0;
}
Server server = servers.get(lastServedId++);
Server server = SERVERS.get(lastServedId++);
server.serve(request);
}

10
monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
View File

@ -22,9 +22,7 @@
*/
package com.iluwatar.monostate;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
@ -34,6 +32,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import org.junit.jupiter.api.Test;
/**
* Date: 12/21/15 - 12:26 PM
*
@ -47,9 +47,9 @@ public class LoadBalancerTest {
final LoadBalancer secondBalancer = new LoadBalancer();
firstBalancer.addServer(new Server("localhost", 8085, 6));
// Both should have the same number of servers.
assertTrue(firstBalancer.getNoOfServers() == secondBalancer.getNoOfServers());
assertEquals(firstBalancer.getNoOfServers(), secondBalancer.getNoOfServers());
// Both Should have the same LastServedId
assertTrue(firstBalancer.getLastServedId() == secondBalancer.getLastServedId());
assertEquals(firstBalancer.getLastServedId(), secondBalancer.getLastServedId());
}
@Test