Typescript Refactor (V2)

backend/src/main/java/com/mcmasterbaja/FileAnalyzeResource.java

@@ -5,6 +5,7 @@
 import com.mcmasterbaja.exceptions.InvalidArgumentException;
 import com.mcmasterbaja.live.Serial;
 import com.mcmasterbaja.model.AnalyzerParams;
+import com.mcmasterbaja.model.MinMax;
 import com.mcmasterbaja.services.FileMetadataService;
 import com.mcmasterbaja.services.StorageService;
 import jakarta.inject.Inject;
@@ -67,21 +68,22 @@ public RestResponse<File> runAnalyzer(@BeanParam AnalyzerParams params) {
 
   @GET
   @jakarta.ws.rs.Path("minMax/{filekey}")
-  public Double[] getMinMax(
+  public MinMax getMinMax(
       @PathParam("filekey") String filekey, @QueryParam("column") String column) {
     logger.info("Getting min and max for file: " + filekey);
 
     String typeFolder = fileMetadataService.getTypeFolder(Paths.get(filekey));
     Path targetPath = storageService.load(Paths.get(typeFolder)).resolve(filekey);
-    Double[] minMax = fileMetadataService.getMinMax(targetPath, column);
+    MinMax minMax = fileMetadataService.getMinMax(targetPath, column);
 
     return minMax;
   }
 
   @PATCH
   @jakarta.ws.rs.Path("togglelive")
-  public String toggleLive() {
+  public Boolean toggleLive() {
     logger.info("Toggling live data to: " + Serial.exit);
+    Boolean exit = Serial.exit;
 
     if (!Serial.exit) {
       Serial.exit = true;
@@ -93,6 +95,6 @@ public String toggleLive() {
           .start();
     }
 
-    return "Live data toggled to " + Serial.exit;
+    return exit;
   }
 }

backend/src/main/java/com/mcmasterbaja/FileDeleteResource.java

@@ -16,34 +16,34 @@ public class FileDeleteResource {
 
   @DELETE
   @jakarta.ws.rs.Path("/file/{filekey}")
-  public String deleteFile(@PathParam("filekey") String filekey) {
+  public void deleteFile(@PathParam("filekey") String filekey) {
     logger.info("Deleting file: " + filekey);
 
     Path targetPath = Paths.get(filekey);
     storageService.delete(targetPath);
 
-    return "File deleted successfully";
+    return;
   }
 
   @DELETE
   @jakarta.ws.rs.Path("/folder/{folderkey}")
-  public String deleteFolder(@PathParam("folderkey") String folderkey) {
+  public void deleteFolder(@PathParam("folderkey") String folderkey) {
     logger.info("Deleting folder: " + folderkey);
 
     Path targetPath = Paths.get(folderkey);
     storageService.deleteAll(targetPath);
 
-    return "All files deleted successfully";
+    return;
   }
 
   @DELETE
   @jakarta.ws.rs.Path("/all")
-  public String deleteAllFiles() {
+  public void deleteAllFiles() {
     logger.info("Deleting all files");
 
     storageService.deleteAll();
     storageService.init();
 
-    return "All files deleted successfully";
+    return;
   }
 }

backend/src/main/java/com/mcmasterbaja/FileUploadResource.java

@@ -23,7 +23,7 @@ public class FileUploadResource {
   @POST
   @jakarta.ws.rs.Path("/file")
   @Consumes(MediaType.MULTIPART_FORM_DATA)
-  public String uploadFile(
+  public void uploadFile(
       @RestForm("fileName") String fileName,
       @RestForm("fileData") @PartType(MediaType.APPLICATION_OCTET_STREAM) InputStream fileData) {
 
@@ -71,7 +71,5 @@ public String uploadFile(
         }
         throw new IllegalArgumentException("Invalid filetype: " + fileExtension);
     }
-
-    return "File uploaded successfully";
   }
 }

backend/src/main/java/com/mcmasterbaja/model/MinMax.java

@@ -0,0 +1,16 @@
+package com.mcmasterbaja.model;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+@Getter
+public class MinMax {
+  private final Double min;
+  private final Double max;
+
+  public MinMax(Double min, Double max) {
+    this.min = min;
+    this.max = max;
+  }
+}

backend/src/main/java/com/mcmasterbaja/services/DefaultFileMetadataService.java

@@ -6,6 +6,7 @@
 import com.mcmasterbaja.exceptions.FileNotFoundException;
 import com.mcmasterbaja.exceptions.MalformedCsvException;
 import com.mcmasterbaja.exceptions.StorageException;
+import com.mcmasterbaja.model.MinMax;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import java.io.BufferedReader;
@@ -49,7 +50,7 @@ public long getSize(Path targetPath) {
     }
   }
 
-  public Double[] getMinMax(Path targetPath, String column) {
+  public MinMax getMinMax(Path targetPath, String column) {
     int columnIndex = -1;
     Double min = Double.MAX_VALUE;
     Double max = Double.MIN_VALUE;
@@ -92,7 +93,7 @@ public Double[] getMinMax(Path targetPath, String column) {
           "Failed to get min max of file: " + targetPath.toString(), targetPath.toString(), e);
     }
 
-    return new Double[] {min, max};
+    return new MinMax(min, max);
   }
 
   public String getLast(Path targetPath, int columnIndex) {

backend/src/main/java/com/mcmasterbaja/services/FileMetadataService.java

@@ -1,5 +1,6 @@
 package com.mcmasterbaja.services;
 
+import com.mcmasterbaja.model.MinMax;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 
@@ -26,9 +27,9 @@ public interface FileMetadataService {
    *
    * @param targetPath The Path of the file to read.
    * @param column The column to analyze.
-   * @return A double[] containing the minimum and maximum values.
+   * @return A MinMax object containing the minimum and maximum values.
    */
-  Double[] getMinMax(Path targetPath, String column);
+  MinMax getMinMax(Path targetPath, String column);
 
   /**
    * Gets the last value of the column in the file.

front-end/eslint.config.mjs

@@ -0,0 +1,12 @@
+// @ts-check
+
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+// TODO: Consider linting with type information
+// https://typescript-eslint.io/getting-started/typed-linting
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.strict,
+  ...tseslint.configs.stylistic,
+);