jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename ModelAdapter to ModelJsonAdapter

This commit is contained in:
0xboobface 2018-10-16 18:34:41 +02:00
parent 43c29758c4
commit 26a73c3228
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ctbrec/Config.java
View File

@ -40,7 +40,7 @@ public class Config {
private void load() throws FileNotFoundException, IOException { private void load() throws FileNotFoundException, IOException {
Moshi moshi = new Moshi.Builder() Moshi moshi = new Moshi.Builder()
.add(Model.class, new ModelAdapter()) .add(Model.class, new ModelJsonAdapter())
.build(); .build();
JsonAdapter<Settings> adapter = moshi.adapter(Settings.class); JsonAdapter<Settings> adapter = moshi.adapter(Settings.class);
File configDir = OS.getConfigDir(); File configDir = OS.getConfigDir();
@ -76,7 +76,7 @@ public class Config {
public void save() throws IOException { public void save() throws IOException {
Moshi moshi = new Moshi.Builder() Moshi moshi = new Moshi.Builder()
.add(Model.class, new ModelAdapter()) .add(Model.class, new ModelJsonAdapter())
.build(); .build();
JsonAdapter<Settings> adapter = moshi.adapter(Settings.class).indent(" "); JsonAdapter<Settings> adapter = moshi.adapter(Settings.class).indent(" ");
String json = adapter.toJson(settings); String json = adapter.toJson(settings);

2
src/main/java/ctbrec/ModelAdapter.java → src/main/java/ctbrec/ModelJsonAdapter.java
View File

@ -8,7 +8,7 @@ import com.squareup.moshi.JsonReader;
import com.squareup.moshi.JsonReader.Token; import com.squareup.moshi.JsonReader.Token;
import com.squareup.moshi.JsonWriter; import com.squareup.moshi.JsonWriter;
public class ModelAdapter extends JsonAdapter<Model> { public class ModelJsonAdapter extends JsonAdapter<Model> {
@Override @Override
public Model fromJson(JsonReader reader) throws IOException { public Model fromJson(JsonReader reader) throws IOException {

4
src/main/java/ctbrec/recorder/RemoteRecorder.java
View File

@ -19,7 +19,7 @@ import ctbrec.Hmac;
import ctbrec.HttpClient; import ctbrec.HttpClient;
import ctbrec.InstantJsonAdapter; import ctbrec.InstantJsonAdapter;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.ModelAdapter; import ctbrec.ModelJsonAdapter;
import ctbrec.Recording; import ctbrec.Recording;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.Request; import okhttp3.Request;
@ -34,7 +34,7 @@ public class RemoteRecorder implements Recorder {
public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8"); public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
private Moshi moshi = new Moshi.Builder() private Moshi moshi = new Moshi.Builder()
.add(Instant.class, new InstantJsonAdapter()) .add(Instant.class, new InstantJsonAdapter())
.add(Model.class, new ModelAdapter()) .add(Model.class, new ModelJsonAdapter())
.build(); .build();
private JsonAdapter<ModelListResponse> modelListResponseAdapter = moshi.adapter(ModelListResponse.class); private JsonAdapter<ModelListResponse> modelListResponseAdapter = moshi.adapter(ModelListResponse.class);
private JsonAdapter<RecordingListResponse> recordingListResponseAdapter = moshi.adapter(RecordingListResponse.class); private JsonAdapter<RecordingListResponse> recordingListResponseAdapter = moshi.adapter(RecordingListResponse.class);

4
src/main/java/ctbrec/recorder/server/RecorderServlet.java
View File

@ -23,7 +23,7 @@ import com.squareup.moshi.Moshi;
import ctbrec.ChaturbateModel; import ctbrec.ChaturbateModel;
import ctbrec.InstantJsonAdapter; import ctbrec.InstantJsonAdapter;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.ModelAdapter; import ctbrec.ModelJsonAdapter;
import ctbrec.Recording; import ctbrec.Recording;
import ctbrec.recorder.Recorder; import ctbrec.recorder.Recorder;
@ -55,7 +55,7 @@ public class RecorderServlet extends AbstractCtbrecServlet {
LOG.debug("Request: {}", json); LOG.debug("Request: {}", json);
Moshi moshi = new Moshi.Builder() Moshi moshi = new Moshi.Builder()
.add(Instant.class, new InstantJsonAdapter()) .add(Instant.class, new InstantJsonAdapter())
.add(Model.class, new ModelAdapter()) .add(Model.class, new ModelJsonAdapter())
.build(); .build();
JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class); JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
Request request = requestAdapter.fromJson(json); Request request = requestAdapter.fromJson(json);