refactors to server tls code

src/main/java/JobServ/JobServServer.java

@@ -31,31 +31,30 @@ public class JobServServer {
 
     private Server server;
     private final int port;
-    private final String certChainFilePath;
-    private final String privateKeyFilePath;
-    private final String trustCertCollectionFilePath;
+    private final SslContext ssl;
 
+    /*
+     * Constructor
+     * Sets port and builds sslContext
+     */
     public JobServServer(int port,
-                         String certChainFilePath,
-                         String privateKeyFilePath,
-                         String trustCertCollectionFilePath) {
+                         String serverCert,
+                         String privateKey,
+                         String trustStore) {
         this.port = port;
-        this.certChainFilePath = certChainFilePath;
-        this.privateKeyFilePath = privateKeyFilePath;
-        this.trustCertCollectionFilePath = trustCertCollectionFilePath;
+        SslContextBuilder sslContextBuilder = SslContextBuilder.forServer(new File(serverCert), new File(privateKey));
+
+        // Mutual TLS trust store and require client auth
+        sslContextBuilder.trustManager(new File(trustStore));
+        sslContextBuilder.clientAuth(ClientAuth.REQUIRE);
+
+        this.ssl = GrpcSslContexts.configure(sslClientContextBuilder).build();
     }
 
-    private SslContextBuilder getSslContextBuilder() {
-        SslContextBuilder sslClientContextBuilder = SslContextBuilder.forServer(new File(certChainFilePath),
-                                                                                new File(privateKeyFilePath));
-
-            sslClientContextBuilder.trustManager(new File(trustCertCollectionFilePath));
-            sslClientContextBuilder.clientAuth(ClientAuth.REQUIRE);
-
-        return GrpcSslContexts.configure(sslClientContextBuilder);
-    }
-
-    // starts the GRPC API Server
+    /*
+     * start()
+     * this initializes the server
+     */
     private void start() throws IOException {
         // TODO: this should be passed in from a configuration manager
         server = NettyServerBuilder.forPort(port)
@@ -76,25 +75,38 @@ public class JobServServer {
             });
     }
 
+    /*
+     * stop()
+     * This is called when ctrl+c is pressed
+     */
     private void stop() {
         if (server != null) {
             server.shutdown();
         }
     }
 
-    // spinlock for main()
+    /*
+     * blockUntilShutdown()
+     * This is more or less the main loop of the server.
+     * It spins until shutdown is called.
+     */
     private void blockUntilShutdown() throws InterruptedException {
         if (server != null) {
             server.awaitTermination();
         }
     }
 
-    // Main function. starts GRPC server and spins until server is shutdown
+    /*
+     * main()
+     * Entrypoint of hte server
+     * parses args and initializes a server object.
+     * calls server main loop.
+     */
     public static void main(String[] args) throws IOException, InterruptedException {
         int port = 8448; // TODO: port and key/cert files should be handled by a config manager
 
         if(args.length < 3) {
-            System.out.println("Usage: ./jobserv-server certchain privatekey truststore");
+            System.out.println("Usage: ./jobserv-server cert privatekey truststore");
             return;
         }