Added eval exception handling

Author: Alathreon

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

@@ -0,0 +1,4 @@
+package org.togetherjava.jshellapi.dto;
+
+public record JShellExceptionResult(String exceptionClass, String exceptionMessage) {
+}

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

@@ -8,6 +8,7 @@ public record JShellResult(
         int id,
         String source,
         String result,
+        JShellExceptionResult exception,
         boolean stdoutOverflow,
         String stdout,
         List<String> errors) {

JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java

@@ -1,6 +1,7 @@
 package org.togetherjava.jshellapi.service;
 
 import org.apache.tomcat.util.http.fileupload.util.Closeable;
+import org.togetherjava.jshellapi.dto.JShellExceptionResult;
 import org.togetherjava.jshellapi.dto.JShellResult;
 import org.togetherjava.jshellapi.dto.SnippetStatus;
 import org.togetherjava.jshellapi.dto.SnippetType;
@@ -91,14 +92,20 @@ public Optional<JShellResult> eval(String code) throws DockerException {
             String source = desanitize(reader.readLine());
             String result = reader.readLine();
             if(result.equals("NONE")) result = null;
+            String rawException = reader.readLine();
+            JShellExceptionResult exception = null;
+            if(!rawException.isEmpty()) {
+                String[] split = rawException.split(":");
+                exception = new JShellExceptionResult(split[0], split[1]);
+            }
             boolean stdoutOverflow = Boolean.parseBoolean(reader.readLine());
             String stdout = desanitize(reader.readLine());
             List<String> errors = new ArrayList<>();
             String error;
             while(!(error = reader.readLine()).isEmpty()) {
                 errors.add(desanitize(error));
             }
-            return Optional.of(new JShellResult(status, type, id, source, result, stdoutOverflow, stdout, errors));
+            return Optional.of(new JShellResult(status, type, id, source, result, exception, stdoutOverflow, stdout, errors));
         } catch (IOException | NumberFormatException ex) {
             close();
             throw new DockerException(ex);

JShellWrapper/src/main/java/JShellWrapper.java

@@ -1,6 +1,4 @@
-import jdk.jshell.JShell;
-import jdk.jshell.Snippet;
-import jdk.jshell.SnippetEvent;
+import jdk.jshell.*;
 
 import java.io.PrintStream;
 import java.util.*;
@@ -55,6 +53,7 @@ private void ok() {
      * snippet id<br>
      * source<br>
      * result or NONE<br>
+     * nothing or ExceptionClass:Exception message<br>
      * is stdout overflow<br>
      * stdout<br>
      * error 1<br>
@@ -89,6 +88,13 @@ private void eval(Scanner scanner, Config config, JShell shell, StringOutputStre
                 result.add(event.snippet().id());
                 result.add(sanitize(event.snippet().source()));
                 result.add(event.value() != null ? event.value() : "NONE");
+                if(event.exception() == null) {
+                    result.add("");
+                } else if(event.exception() instanceof EvalException evalException) {
+                    result.add(sanitize(evalException.getExceptionClassName() + ":" + evalException.getMessage()));
+                } else {
+                    result.add(sanitize(event.exception().getClass().getName() + ":" + event.exception().getMessage()));
+                }
                 result.add(String.valueOf(out.isOverflow()));
                 result.add(sanitize(out.readAll()));
                 if(event.status() == Snippet.Status.REJECTED) {