From 2fd76932ee11ecd25fc80f7bce24e6855c053ee0 Mon Sep 17 00:00:00 2001 From: "Liana.Bakradze" Date: Fri, 14 Apr 2017 13:45:24 +0300 Subject: [PATCH] bring back language to json (EDU-882) --- .../jetbrains/edu/learning/courseFormat/Course.java | 2 +- .../edu/learning/stepic/EduStepicClient.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java index d203b338f186..43b76a0353a4 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java @@ -26,7 +26,7 @@ public class Course { @Expose @SerializedName("summary") private String description; @Expose @SerializedName("title") private String name; - transient private String myLanguage = "Python"; + @Expose @SerializedName("language") private String myLanguage = "Python"; //this field is used to distinguish ordinary and CheckIO projects, //"PyCharm" is used here for historical reasons diff --git a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java index d4ed1b144f15..e1b6bfee8f9a 100644 --- a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java +++ b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java @@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import java.io.IOException; -import java.lang.reflect.Modifier; import java.net.InetSocketAddress; import java.net.Proxy; import java.net.URI; @@ -70,10 +69,10 @@ public class EduStepicClient { } static T deserializeStepicResponse(Class container, String responseString) { - Gson gson = new GsonBuilder().registerTypeAdapter(StepicWrappers.StepOptions.class, new StudySerializationUtils.Json.StepicStepOptionsAdapter()). - excludeFieldsWithModifiers(Modifier.TRANSIENT). - setDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"). - setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); + Gson gson = + new GsonBuilder().registerTypeAdapter(StepicWrappers.StepOptions.class, new StudySerializationUtils.Json.StepicStepOptionsAdapter()). + setDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"). + setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); return gson.fromJson(responseString, container); } @@ -116,7 +115,8 @@ public class EduStepicClient { CloseableHttpClient httpClient = getBuilder().setDefaultHeaders(headers).build(); try { - final StepicWrappers.AuthorWrapper wrapper = getFromStepic(EduStepicNames.CURRENT_USER, StepicWrappers.AuthorWrapper.class, httpClient); + final StepicWrappers.AuthorWrapper wrapper = + getFromStepic(EduStepicNames.CURRENT_USER, StepicWrappers.AuthorWrapper.class, httpClient); if (wrapper != null && !wrapper.users.isEmpty()) { StepicUser user = wrapper.users.get(0); return user != null && !user.isGuest();