use server url from argument

dethi · Dec 9, 2017 · 6bb2221 · 6bb2221
1 parent 5baf404
commit 6bb2221
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/eventbus/src/main/java/com/epita/eventbus/EventBusClient.java b/eventbus/src/main/java/com/epita/eventbus/EventBusClient.java
@@ -12,11 +12,9 @@ public interface EventBusClient {
     /**
      * Start the client
      *
-     * @param host The host of the server
-     * @param port The port of the server
      * @return Whether or not the run succeed
      */
-    boolean start(final String host, final int port);
+    boolean start();
 
     /**
      * Subscribe to the given channel.

diff --git a/eventbus/src/main/java/com/epita/eventbus/NettyEventBusClient.java b/eventbus/src/main/java/com/epita/eventbus/NettyEventBusClient.java
@@ -19,15 +19,19 @@ public class NettyEventBusClient implements EventBusClient {
     private final Map<String, List<Subscription>> subscriptionsMap;
     private io.netty.channel.Channel nettyChannel;
     private EventLoopGroup group;
+    private final String host;
+    private final int port;
 
-    public NettyEventBusClient() {
+    public NettyEventBusClient(final String host, final int port) {
         subscriptionsMap = new HashMap<>();
         group = new NioEventLoopGroup();
         nettyChannel = null;
+        this.host = host;
+        this.port = port;
     }
 
     @Override
-    public boolean start(final String host, final int port) {
+    public boolean start() {
         if (nettyChannel != null)
             return false;
 

diff --git a/src/main/java/com/epita/guereza/Main.java b/src/main/java/com/epita/guereza/Main.java
@@ -20,17 +20,16 @@
 import static java.lang.System.exit;
 
 public class Main {
-    private static final String NETTY_HOST = "localhost";
     private static final int NETTY_PORT = 8000;
 
     public static void main(String[] args) {
-        if (args.length != 1) {
-            System.out.println("usage: ./bin [ crawler | indexer | store | server");
+        if (args.length < 1) {
+            System.out.println("usage: ./bin [crawler | indexer | store | server] server_url");
             exit(1);
         }
 
         final String module = args[0];
-        final Scope scope = createScope();
+        final Scope scope = createScope(args[1], NETTY_PORT);
 
         switch (module) {
             case "crawler":
@@ -48,11 +47,11 @@ public static void main(String[] args) {
         }
     }
 
-    private static Scope createScope() {
+    private static Scope createScope(final String host, final int port) {
         return new Scope()
                 .register(new Singleton<>(Crawler.class, new CrawlerService()))
                 .register(new Singleton<>(Indexer.class, new IndexerService()))
-                .register(new Singleton<>(EventBusClient.class, new NettyEventBusClient()));
+                .register(new Singleton<>(EventBusClient.class, new NettyEventBusClient(host, port)));
     }
 
     private static void runCrawler(Scope scope) {
@@ -96,7 +95,7 @@ private static void runStore(Scope scope) {
     }
 
     private static void runApp(Scope scope) {
-        boolean ok = scope.instanceOf(EventBusClient.class).start(NETTY_HOST, NETTY_PORT);
+        boolean ok = scope.instanceOf(EventBusClient.class).start();
         if (ok) {
             scope.instanceOf(App.class).run();
         }