R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Merge branch 'master' of gitea.release11.com:R11/release11-tools into widlam/refactor/issue#201

Browse Source
This commit is contained in:
Mikolaj Widla
2023-05-25 14:59:43 +02:00
parent b733e1e344 97042faaa3
commit 45fab20cc4
15 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Backend/tools-services/src/main/java/com/r11/tools/controller/JsonController.java
View File

@@ -1,8 +1,7 @@
package com.r11.tools.controller;
import com.google.gson.Gson;
import com.google.gson.*;
//import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import com.r11.tools.controller.internal.GlobalControllerManifest;
import com.r11.tools.controller.internal.HandlerType;
import com.r11.tools.controller.internal.RestController;
@@ -11,6 +10,9 @@ import spark.Request;
import spark.Response;
import org.apache.logging.log4j.Logger;
import java.util.List;
import java.util.Map;
@GlobalControllerManifest(path = "/json")
public class JsonController implements RestController {
@@ -32,9 +34,7 @@ public class JsonController implements RestController {
JsonObject responseJson = new JsonObject();
try {
JsonObject requestJson = this.gson.fromJson(request.body(), JsonObject.class);
response.status(200);
Object requestJson = this.gson.fromJson(request.body(), Object.class);
responseJson.addProperty("data", this.prettyGson.toJson(requestJson));
responseJson.addProperty("time", System.currentTimeMillis() - startProcess);
@@ -61,7 +61,7 @@ public class JsonController implements RestController {
JsonObject responseJson = new JsonObject();
try {
JsonObject requestJson = this.prettyGson.fromJson(request.body(), JsonObject.class);
Object requestJson = this.prettyGson.fromJson(request.body(), Object.class);
response.status(200);