Merge pull request #8 from Together-Java/feature/multi-snippets

Feature/multi snippets

Author: Alathreon

JShellAPI/RunDocker.bat

@@ -0,0 +1 @@
+docker run --rm -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock --name jshellapi togetherjava.org:5001/togetherjava/jshellbackend:master

JShellAPI/RunDocker.sh

@@ -0,0 +1 @@
+docker run --rm -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock --name jshellapi togetherjava.org:5001/togetherjava/jshellbackend:master

JShellAPI/gradle/wrapper/gradle-wrapper.jar

@@ -7,6 +7,7 @@ public record Config(
         long regularSessionTimeoutSeconds,
         long oneTimeSessionTimeoutSeconds,
         long evalTimeoutSeconds,
+        int sysOutCharLimit,
         long maxAliveSessions,
         int dockerMaxRamMegaBytes,
         double dockerCPUsUsage,
@@ -15,6 +16,7 @@ public record Config(
         if(regularSessionTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + regularSessionTimeoutSeconds);
         if(oneTimeSessionTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + oneTimeSessionTimeoutSeconds);
         if(evalTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + evalTimeoutSeconds);
+        if(sysOutCharLimit <= 0) throw new RuntimeException("Invalid value " + sysOutCharLimit);
         if(maxAliveSessions <= 0) throw new RuntimeException("Invalid value " + maxAliveSessions);
         if(dockerMaxRamMegaBytes <= 0) throw new RuntimeException("Invalid value " + dockerMaxRamMegaBytes);
         if(dockerCPUsUsage <= 0) throw new RuntimeException("Invalid value " + dockerCPUsUsage);

JShellAPI/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,4 @@
+package org.togetherjava.jshellapi.dto;
+
+public record JShellEvalAbortion(String sourceCause, String remainingSource, JShellEvalAbortionCause cause) {
+}

JShellAPI/src/main/java/org/togetherjava/jshellapi/Config.java

@@ -0,0 +1,26 @@
+package org.togetherjava.jshellapi.dto;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.List;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+public sealed interface JShellEvalAbortionCause {
+
+    @JsonTypeName("TIMEOUT")
+    record TimeoutAbortionCause() implements JShellEvalAbortionCause {
+    }
+
+    @JsonTypeName("UNCAUGHT_EXCEPTION")
+    record UnhandledExceptionAbortionCause(String exceptionClass, String exceptionMessage) implements JShellEvalAbortionCause {
+    }
+
+    @JsonTypeName("COMPILE_TIME_ERROR")
+    record CompileTimeErrorAbortionCause(List<String> errors) implements JShellEvalAbortionCause {
+    }
+
+    @JsonTypeName("SYNTAX_ERROR")
+    record SyntaxErrorAbortionCause() implements JShellEvalAbortionCause {
+    }
+}

JShellAPI/src/main/java/org/togetherjava/jshellapi/dto/JShellEvalAbortion.java

@@ -5,18 +5,11 @@
 import java.util.List;
 
 public record JShellResult(
-        SnippetStatus status,
-        SnippetType type,
-        int id,
-        String source,
-        @Nullable
-        String result,
-        @Nullable
-        JShellExceptionResult exception,
+        List<JShellSnippetResult> snippetsResults,
+        @Nullable JShellEvalAbortion abortion,
         boolean stdoutOverflow,
-        String stdout,
-        List<String> errors) {
+        String stdout) {
     public JShellResult {
-        errors = List.copyOf(errors);
+        snippetsResults = List.copyOf(snippetsResults);
     }
 }

JShellAPI/src/main/java/org/togetherjava/jshellapi/dto/JShellEvalAbortionCause.java

@@ -0,0 +1,12 @@
+package org.togetherjava.jshellapi.dto;
+
+import org.springframework.lang.Nullable;
+
+public record JShellSnippetResult(
+        SnippetStatus status,
+        SnippetType type,
+        int id,
+        String source,
+        @Nullable
+        String result) {
+}