1
1
package com .regexplanet ;
2
2
3
- import com .fasterxml .jackson .databind .ObjectMapper ;
4
3
5
4
import org .springframework .stereotype .Controller ;
6
5
import org .springframework .web .bind .annotation .GetMapping ;
7
6
import org .springframework .web .bind .annotation .RequestParam ;
8
7
9
8
import java .io .IOException ;
10
- import java .io .PrintWriter ;
11
9
import java .time .ZoneOffset ;
12
10
import java .time .ZonedDateTime ;
13
11
import java .time .format .DateTimeFormatter ;
14
- import java .util .HashMap ;
12
+ import java .util .LinkedHashMap ;
15
13
import java .util .Map ;
16
14
17
15
@ Controller
@@ -22,7 +20,7 @@ public void handle(jakarta.servlet.http.HttpServletResponse resp, @RequestParam(
22
20
throws IOException {
23
21
24
22
// Create a JSON response
25
- Map <String , Object > retVal = new HashMap <>();
23
+ Map <String , Object > retVal = new LinkedHashMap <>();
26
24
retVal .put ("success" , Boolean .TRUE );
27
25
retVal .put ("message" , "OK" );
28
26
retVal .put ("commit" , System .getenv ("COMMIT" ));
@@ -42,26 +40,6 @@ public void handle(jakarta.servlet.http.HttpServletResponse resp, @RequestParam(
42
40
retVal .put ("java.vm.name" , System .getProperty ("java.vm.name" ));
43
41
retVal .put ("file.encoding" , System .getProperty ("file.encoding" ));
44
42
45
- // Convert the map to JSON using Jackson
46
- ObjectMapper objectMapper = new ObjectMapper ();
47
- String jsonResponse = objectMapper .writeValueAsString (retVal );
48
-
49
- // Write the JSON response
50
- if (callback != null && callback .matches ("^[a-zA-Z_][a-zA-Z0-9_]*$" )) {
51
- resp .setContentType ("application/javascript" );
52
- resp .setCharacterEncoding ("UTF-8" );
53
- PrintWriter writer = resp .getWriter ();
54
- writer .write (callback );
55
- writer .write ("(" );
56
- writer .write (jsonResponse );
57
- writer .write (");" );
58
- } else {
59
- resp .setHeader ("Access-Control-Allow-Origin" , "*" );
60
- resp .setHeader ("Access-Control-Allow-Methods" , "GET, POST" );
61
- resp .setHeader ("Access-Control-Max-Age" , "604800" );
62
- resp .setContentType ("application/json" );
63
- resp .setCharacterEncoding ("UTF-8" );
64
- resp .getWriter ().write (jsonResponse );
65
- }
43
+ HandleJsonp .handleJsonp (resp , callback , retVal );
66
44
}
67
45
}
0 commit comments