Skip to content

Commit 3a2ebb6

Browse files
committed
change error response to JSON
1 parent 45b2dd1 commit 3a2ebb6

1 file changed

Lines changed: 16 additions & 28 deletions

File tree

src/main/java/net/stoerr/chatgpt/codevengine/AbstractPluginAction.java

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
11
package net.stoerr.chatgpt.codevengine;
22

3-
import static java.util.stream.Collectors.toList;
4-
import static net.stoerr.chatgpt.codevengine.TbUtils.logBody;
5-
import static net.stoerr.chatgpt.codevengine.TbUtils.logError;
6-
import static net.stoerr.chatgpt.codevengine.TbUtils.logInfo;
3+
import com.google.gson.Gson;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
7+
import org.apache.commons.lang3.StringUtils;
8+
import org.apache.commons.lang3.tuple.Pair;
79

10+
import javax.annotation.Nullable;
811
import java.io.IOException;
9-
import java.nio.file.FileVisitResult;
10-
import java.nio.file.Files;
11-
import java.nio.file.Path;
12-
import java.nio.file.PathMatcher;
13-
import java.nio.file.SimpleFileVisitor;
12+
import java.nio.file.*;
1413
import java.nio.file.attribute.BasicFileAttributes;
15-
import java.util.ArrayList;
16-
import java.util.Collections;
17-
import java.util.Comparator;
18-
import java.util.HashMap;
19-
import java.util.List;
20-
import java.util.Locale;
21-
import java.util.Map;
14+
import java.util.*;
2215
import java.util.regex.Pattern;
2316
import java.util.stream.Stream;
2417

25-
import javax.annotation.Nullable;
26-
27-
import org.apache.commons.lang3.StringUtils;
28-
import org.apache.commons.lang3.tuple.Pair;
29-
30-
import com.google.gson.Gson;
31-
32-
import jakarta.servlet.http.HttpServlet;
33-
import jakarta.servlet.http.HttpServletRequest;
34-
import jakarta.servlet.http.HttpServletResponse;
18+
import static java.util.stream.Collectors.toList;
19+
import static net.stoerr.chatgpt.codevengine.TbUtils.*;
3520

3621
public abstract class AbstractPluginAction extends HttpServlet {
3722

@@ -49,9 +34,12 @@ public abstract class AbstractPluginAction extends HttpServlet {
4934
protected static ExecutionAbortedException sendError(HttpServletResponse response, int statusCode, String error) throws ExecutionAbortedException {
5035
logInfo("Error " + statusCode + ": " + error);
5136
response.setStatus(statusCode);
52-
response.setContentType("text/plain;charset=UTF-8");
37+
response.setContentType("application/json;charset=UTF-8");
5338
try {
54-
response.getWriter().write(error);
39+
Map<String, Object> errorResponse = new HashMap<>();
40+
errorResponse.put("error", error);
41+
String jsonError = new Gson().toJson(errorResponse);
42+
response.getWriter().write(jsonError);
5543
} catch (IOException e) {
5644
logInfo("Error writing error: " + e);
5745
}

0 commit comments

Comments
 (0)