Merge branch 'master' of https://github.com/fluxw42/java-design-patterns into fluxw42-master

Conflicts:
	monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
This commit is contained in:
Ilkka Seppala
2015-12-26 12:36:38 +02:00
31 changed files with 1104 additions and 59 deletions
@@ -28,8 +28,8 @@ public class App {
public static void main(String[] args) {
LoadBalancer loadBalancer1 = new LoadBalancer();
LoadBalancer loadBalancer2 = new LoadBalancer();
loadBalancer1.serverequest(new Request("Hello"));
loadBalancer2.serverequest(new Request("Hello World"));
loadBalancer1.serverRequest(new Request("Hello"));
loadBalancer2.serverRequest(new Request("Hello World"));
}
}
@@ -45,7 +45,7 @@ public class LoadBalancer {
/**
* Handle request
*/
public void serverequest(Request request) {
public void serverRequest(Request request) {
if (lastServedId >= servers.size()) {
lastServedId = 0;
}
@@ -28,7 +28,7 @@ public class Server {
return port;
}
public final void serve(Request request) {
public void serve(Request request) {
System.out.println("Server ID " + id + " associated to host : " + getHost() + " and Port "
+ getPort() + " Processed request with value " + request.value);
}