Merge pull request #1 from java-sheets/dev

Cleanup and dockerize

Author: ehenoma

Dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:16
+
+ADD ./src src
+ADD ./run.sh run.sh
+
+ENTRYPOINT ["run.sh"]

run.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 javac ./src/Box.java ./src/Controller.java
 jar --create --file ./src/box.jar --main-class Box -C src Box.class
 java -cp src Controller "$@"

src/Box.java

@@ -2,8 +2,6 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.time.Duration;
 import java.util.UUID;
 
@@ -59,10 +57,9 @@ public void accept() throws IOException {
     }
   }
 
-  public static void main(String[] arguments) throws IOException {
+  public static void main(String[] arguments) {
     validateArguments(arguments);
     var box = createBoxFromArguments(arguments);
-    Files.writeString(Path.of(box.id.toString() + ".box.txt"), box.id.toString());
     try {
       box.start();
     } catch (IOException failure) {

src/Controller.java

@@ -150,16 +150,27 @@ private static void redirect(
     }
   }
 
+  private static final int internalPort = 3_1337 ;
+
   // All logging is done to System.err since output is redirected to System.out
   public static void main(String[] arguments) throws InterruptedException {
     validateArguments(arguments);
     var executor = Executors.newCachedThreadPool();
-    var controller = new Controller(3_1337, arguments[0], executor);
+    var binaryPath = arguments[0];
+    var controller = new Controller(internalPort, binaryPath, executor);
     runController(executor, controller);
-    int boxCount = arguments.length > 1 ? Integer.parseInt(arguments[1]) : 3;
-    startSomeBoxes(controller, boxCount);
+    startSomeBoxes(controller, readBoxCount(arguments));
     Thread.sleep(10_000);
-    executor.shutdown();
+    executor.shutdownNow();
+  }
+
+  private static final int boxCountIndex = 1;
+  private static final int defaultBoxCount = 3;
+
+  private static int readBoxCount(String[] arguments) {
+    return arguments.length > boxCountIndex
+      ? Integer.parseInt(arguments[boxCountIndex])
+      : defaultBoxCount;
   }
 
   private static void runController(Executor executor, Controller controller) {