Refactor URL handling in Client and Master.

– Take URL as parameter to constructor.

1 files changed, 11 insertions, 3 deletions

diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 2faf669..d898c1d 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -31,9 +31,17 @@ public class SameController {
         State state = new State("Default");
         Broadcaster broadcaster = BroadcasterImpl.getDefaultBroadcastRunner();
         
-        MasterServiceImpl master = new MasterServiceImpl(state, connections,
-                broadcaster);
-        ClientServiceImpl client = new ClientServiceImpl(state, connections);
+        String baseUrl = String.format("http://%s:%s/",
+                configuration.get("localIp"), configuration.getInt("port"));
+        
+        String masterUrl = baseUrl + "MasterService.json";
+        String clientUrl = baseUrl + "ClientService.json";
+        
+        MasterServiceImpl master = MasterServiceImpl.create(
+                connections, broadcaster, masterUrl);
+        
+        ClientServiceImpl client = new ClientServiceImpl(state, connections,
+                clientUrl);
         PaxosServiceImpl paxos = new PaxosServiceImpl("");
         
         ServerContainer server = new ServerBuilder(port)