cells: simplify initialization of LocationManagerConnector

Motivation:
As a regular cell, LocationManagerConnector initialized via cell
arguments. However, it uses only in a single place, where all params
already known. Thus, passing params as arguments make it less obvious
which options are used.

Modification:
Update LocationManagerConnector constructor to accept desired arguments.

Result:
Simplified code flow.

Acked-by: Marina Sahakyan
Target: master
Require-book: no
Require-notes: no

Author: kofemann

modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java

@@ -42,13 +42,18 @@ public class LocationManagerConnector
     private volatile int _retries;
     private volatile boolean _isRunning;
 
-    public LocationManagerConnector(String cellName, String args, SocketFactory socketFactory) {
-        super(cellName, "System", args);
-        Args a = getArgs();
-        _domain = a.getOpt("domain");
+    /**
+     * Create a new connector to the location manager.
+     * @param cellName the name of this connector as a cell
+     * @param socketFactory the socket factory to use for creating connections
+     * @param remoteDomain the domain name of the location manager
+     * @param endpoint the address of the location manager
+     */
+    public LocationManagerConnector(String cellName, SocketFactory socketFactory, String remoteDomain, InetSocketAddress endpoint) {
+        super(cellName, "System");
+        _domain = remoteDomain;
         _ssf = requireNonNull(socketFactory);
-        HostAndPort where = HostAndPort.fromString(a.getOpt("where"));
-        _address = new InetSocketAddress(where.getHost(), where.getPort());
+        _address = endpoint;
     }
 
     @Override

modules/cells/src/main/java/dmg/cells/services/LocationManager.java

@@ -39,6 +39,7 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Arrays;
@@ -681,15 +682,6 @@ private String startConnector(String remoteDomain, CoreDomainInfo domainInfo)
           throws ExecutionException, InterruptedException, BadConfigException {
         checkArgument(args.hasOption("mode"), "No mode specified to run connector");
 
-        String cellName = "c-" + remoteDomain + '*';
-        String clientKey = args.getOpt("clientKey");
-        clientKey =
-              (clientKey != null) && (!clientKey.isEmpty()) ? ("-clientKey=" + clientKey) : "";
-        String clientName = args.getOpt("clientUserName");
-        clientName =
-              (clientName != null) && (!clientName.isEmpty()) ? ("-clientUserName=" + clientName)
-                    : "";
-
         HostAndPort where;
         SocketFactory socketFactory;
         Mode mode = Mode.fromString(args.getOption("mode"));
@@ -724,16 +716,10 @@ private String startConnector(String remoteDomain, CoreDomainInfo domainInfo)
                       "Invalid mode to start connector: " + args.getOption("mode"));
         }
 
-        String cellArgs = "-domain=" + remoteDomain + ' '
-              + "-lm=" + getCellName() + ' '
-              + "-role=" + role + ' '
-              + "-where=" + where + ' '
-              + clientKey + ' '
-              + clientName;
-
-        LOGGER.info("Starting connector with {}", cellArgs);
-        LocationManagerConnector c = new LocationManagerConnector(cellName, cellArgs,
-              socketFactory);
+        String cellName = "c-" + remoteDomain + '*';
+        LOGGER.info("Starting connector {} to {} ({})", cellName, remoteDomain, where);
+        InetSocketAddress tunnelEndpoint = new InetSocketAddress(where.getHost(), where.getPort());
+        LocationManagerConnector c = new LocationManagerConnector(cellName, socketFactory, remoteDomain, tunnelEndpoint);
         c.start().get();
         return c.getCellName();
     }