rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy progress

This commit is contained in:
rusefi 2020-07-18 16:44:38 -04:00
parent f6f5e5208a
commit 988ede9601
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
java_console/io/src/main/java/com/rusefi/server/ControllerInfo.java
View File

@ -1,9 +1,9 @@
package com.rusefi.server;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import java.io.StringReader;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.util.Objects;
/**
@ -58,25 +58,28 @@ public class ControllerInfo {
}
public static ControllerInfo valueOf(String jsonString) {
JsonReader reader = Json.createReader(new StringReader(jsonString));
JsonObject jsonObject = reader.readObject();
String vehicleName = jsonObject.getString(VEHICLE_NAME);
String engineMake = jsonObject.getString(ENGINE_MAKE);
String engineCode = jsonObject.getString(ENGINE_CODE);
String signature = jsonObject.getString(SIGNATURE);
JSONParser parser = new JSONParser();
JSONObject jsonObject;
try {
jsonObject = (JSONObject) parser.parse(jsonString);
} catch (ParseException e) {
throw new IllegalStateException(e);
}
String vehicleName = (String) jsonObject.get(VEHICLE_NAME);
String engineMake = (String) jsonObject.get(ENGINE_MAKE);
String engineCode = (String) jsonObject.get(ENGINE_CODE);
String signature = (String) jsonObject.get(SIGNATURE);
return new ControllerInfo(vehicleName, engineCode, engineMake, signature);
}
public String toJson() {
JsonObject jsonObject = Json.createObjectBuilder()
.add(ENGINE_MAKE, engineMake)
.add(ENGINE_CODE, engineCode)
.add(VEHICLE_NAME, vehicleName)
.add(SIGNATURE, signature)
.build();
return jsonObject.toString();
JSONObject jsonObject = new JSONObject();
jsonObject.put(ENGINE_MAKE, engineMake);
jsonObject.put(ENGINE_CODE, engineCode);
jsonObject.put(VEHICLE_NAME, vehicleName);
jsonObject.put(SIGNATURE, signature);
return jsonObject.toJSONString();
}
@Override

36
java_console/io/src/main/java/com/rusefi/server/SessionDetails.java
View File

@ -1,9 +1,9 @@
package com.rusefi.server;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import java.io.StringReader;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.util.Objects;
import java.util.Random;
@ -42,24 +42,28 @@ public class SessionDetails {
}
public String toJson() {
JsonObject jsonObject = Json.createObjectBuilder()
.add(CONTROLLER, controllerInfo.toJson())
.add(ONE_TIME_TOKEN, oneTimeToken)
.add(AUTH_TOKEN, authToken)
.build();
return jsonObject.toString();
JSONObject jsonObject = new JSONObject();
jsonObject.put(CONTROLLER, controllerInfo.toJson());
jsonObject.put(ONE_TIME_TOKEN, oneTimeToken);
jsonObject.put(AUTH_TOKEN, authToken);
return jsonObject.toJSONString();
}
public static SessionDetails valueOf(String jsonString) {
JsonReader reader = Json.createReader(new StringReader(jsonString));
JSONParser parser = new JSONParser();
JSONObject jsonObject;
try {
jsonObject = (JSONObject) parser.parse(jsonString);
} catch (ParseException e) {
throw new IllegalStateException(e);
}
JsonObject jsonObject = reader.readObject();
String authToken = jsonObject.getString(AUTH_TOKEN);
int oneTimeCode = jsonObject.getInt(ONE_TIME_TOKEN);
String authToken = (String) jsonObject.get(AUTH_TOKEN);
long oneTimeCode = (Long)jsonObject.get(ONE_TIME_TOKEN);
ControllerInfo controllerInfo = ControllerInfo.valueOf(jsonObject.getString(CONTROLLER));
ControllerInfo controllerInfo = ControllerInfo.valueOf((String) jsonObject.get(CONTROLLER));
return new SessionDetails(controllerInfo, authToken, oneTimeCode);
return new SessionDetails(controllerInfo, authToken, (int) oneTimeCode);
}
@Override