Added functionality for controller commands

src/DStore.java

 import java.io.*;
 import java.net.*;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Iterator;
 
 public class DStore {
 
-    private final static HashMap<String, String> fileList = new HashMap<>();
+    private final static HashSet<String> fileList = new HashSet<>();
     private static PrintWriter controller;
 
     public static void main(String[] args) {
@@ -16,16 +16,31 @@ public class DStore {
         Float timeout = Float.parseFloat(args[2]);
         String fileFolder = args[3];
 
-        //TODO Make connection with controller & listen to send acknowledgments
+        //Make connection with controller & listen to send acknowledgments
         try{
             Socket socket = new Socket(InetAddress.getLocalHost(),cPort);
             controller = new PrintWriter(socket.getOutputStream());
 
-
             //Send "JOIN port" to  controller
-            //New thread to listen for "LIST" or "REMOVE filename" on cport
-            //Reply with "LIST file_list" then go back to listening
+            controller.write("JOIN "+port);
 
+            //New thread to listen for "LIST" & "REMOVE FILENAME"
+            new Thread(() -> {
+                try {
+                    BufferedReader contIn = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                    while(true){
+                        String received = contIn.readLine();
+                        String command = received.split(" ")[0];
+
+                        switch (command) {
+                            case "LIST" -> listToController();
+                            case "REMOVE" -> removeFile(fileFolder,(received.split(" ")[1]));
+                        }
+                    }
+                }catch (Exception e){
+                    System.out.println("error "+e);
+                }
+            }).start();
 
         }catch (Exception e){
             System.out.println("error "+e);
@@ -64,11 +79,11 @@ public class DStore {
                         case "STORE" -> {
                             //Get file size (text after third space)
                             int thirdSpace = firstBuffer.indexOf(" ", secondSpace + 1);
-                            String fileSize = firstBuffer.substring(secondSpace, thirdSpace);
+                            int fileSize = Integer.parseInt(firstBuffer.substring(secondSpace, thirdSpace));
 
                             //Store file in new thread and update list
-                            new Thread(new StoreThread(controller,fileFolder,fileName,in,out,client)).start();
-                            fileList.put(fileName, fileSize);
+                            new Thread(new StoreThread(controller,fileFolder,fileName,in,out,client,fileSize)).start();
+                            fileList.add(fileName);
                         }
                         case "LOAD_DATA" -> //Load file in new thread
                                 new Thread(new LoadThread((fileFolder+fileName),in,out,client)).start();
@@ -82,19 +97,19 @@ public class DStore {
         }
     }
 
-    private void listToController() {
+    private static void listToController() {
         //Compile list as string
         StringBuilder stringList = new StringBuilder();
-        ArrayList<String> keys = new ArrayList<>(fileList.keySet());
-        for(String file : keys){
-            stringList.append(file).append(" ").append(fileList.get(file)).append(";");
+
+        for (String s : fileList) {
+            stringList.append(s).append(" ");
         }
 
         //Return value
         controller.write(stringList.toString());
     }
 
-    private void removeFile(String filePath, String fileName){
+    private static void removeFile(String filePath, String fileName){
         //Remove file from folder
         File file = new File(filePath+fileName);
         file.delete();

src/StoreThread.java

@@ -9,14 +9,16 @@ public class StoreThread implements Runnable{
     private final InputStream in;
     private final OutputStream out;
     private final Socket client;
+    private final int fileSize;
 
-    public StoreThread(PrintWriter co, String p, String n, InputStream i, OutputStream o, Socket c) {
+    public StoreThread(PrintWriter co, String p, String n, InputStream i, OutputStream o, Socket c, int fs) {
         controller = co;
         filePath = p;
         fileName = n;
         in = i;
         out = o;
         client = c;
+        fileSize = fs;
     }
 
     @Override
@@ -29,14 +31,9 @@ public class StoreThread implements Runnable{
             File outputFile = new File(filePath+fileName);
             FileOutputStream fileOutput = new FileOutputStream(outputFile);
 
-            //Prepare new buffer for data from client
-            byte[] buf = new byte[1000];
-            int bufLen;
-
-            //Wait for receipt of new data
-            while((bufLen = in.read(buf)) != -1) {
-                fileOutput.write(buf,0,bufLen);
-            }
+            //Read correct bytes from input stream and write to file
+            byte[] buf = in.readNBytes(fileSize);
+            fileOutput.write(buf);
 
             //Send completion ack to controller
             controller.write("STORE_ACK "+fileName);