Merge branch 'release/2'

Author: meanmail

gradle.properties

@@ -2,7 +2,7 @@
 ### General options ###
 javaVersion=1.8
 gradleVersion=3.5
-pluginVersion=1
+pluginVersion=2
 # if set the 'idePath' then the version ignoring
 # if 'sandboxDir' not set then use default sandbox directory (build/${product}-sandbox)
 # if 'ideVersion' not set then use LATEST-EAP-SNAPSHOT

stepik-java-api/src/main/java/org/stepik/api/objects/attempts/Dataset.java

@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -14,10 +13,10 @@
 public class Dataset {
     @SerializedName("is_multiple_choice")
     private boolean multipleChoice;
-    private String[] options;
+    private List<String> options;
     @SerializedName("is_text_disabled")
     private boolean textDisabled;
-    private List<Pair> pairs;
+    private List<StringPair> pairs;
     private List<String> rows;
     private List<String> columns;
     @SerializedName("is_checkbox")
@@ -80,14 +79,14 @@ public void setMultipleChoice(@Nullable Boolean multipleChoice) {
     }
 
     @NotNull
-    public String[] getOptions() {
+    public List<String> getOptions() {
         if (options == null) {
-            options = new String[0];
+            options = new ArrayList<>();
         }
         return options;
     }
 
-    public void setOptions(@Nullable String[] options) {
+    public void setOptions(@Nullable List<String> options) {
         this.options = options;
     }
 
@@ -100,14 +99,14 @@ public void setTextDisabled(@Nullable Boolean textDisabled) {
         this.textDisabled = textDisabled;
     }
 
-    public List<Pair> getPairs() {
+    public List<StringPair> getPairs() {
         if (pairs == null) {
             pairs = new ArrayList<>();
         }
         return pairs;
     }
 
-    public void setPairs(List<Pair> pairs) {
+    public void setPairs(List<StringPair> pairs) {
         this.pairs = pairs;
     }
 
@@ -133,8 +132,7 @@ public boolean equals(Object o) {
         if (multipleChoice != dataset.multipleChoice) return false;
         if (textDisabled != dataset.textDisabled) return false;
         if (isCheckbox != dataset.isCheckbox) return false;
-        // Probably incorrect - comparing Object[] arrays with Arrays.equals
-        if (!Arrays.equals(options, dataset.options)) return false;
+        if (options != null ? !options.equals(dataset.options) : dataset.options != null) return false;
         if (pairs != null ? !pairs.equals(dataset.pairs) : dataset.pairs != null) return false;
         if (rows != null ? !rows.equals(dataset.rows) : dataset.rows != null) return false;
         if (columns != null ? !columns.equals(dataset.columns) : dataset.columns != null) return false;
@@ -146,7 +144,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = (multipleChoice ? 1 : 0);
-        result = 31 * result + Arrays.hashCode(options);
+        result = 31 * result + (options != null ? options.hashCode() : 0);
         result = 31 * result + (textDisabled ? 1 : 0);
         result = 31 * result + (pairs != null ? pairs.hashCode() : 0);
         result = 31 * result + (rows != null ? rows.hashCode() : 0);

stepik-java-api/src/main/java/org/stepik/api/objects/attempts/DatasetDeserializer.java

@@ -49,17 +49,12 @@ public Dataset deserialize(JsonElement json, Type typeOfT, JsonDeserializationCo
         Boolean textDisabled = getBoolean(object, "is_text_disabled");
         dataset.setTextDisabled(textDisabled);
 
-        JsonArray options = getJsonArray(object, "options");
-        if (options != null) {
-            List<String> optionsArray = new ArrayList<>();
-            options.forEach(option -> optionsArray.add(option.getAsString()));
-            dataset.setOptions(optionsArray.toArray(new String[optionsArray.size()]));
-        }
+        dataset.setOptions(getStringList(object, "options"));
 
         JsonArray pairs = getJsonArray(object, "pairs");
         if (pairs != null) {
-            List<Pair> array = new ArrayList<>();
-            pairs.forEach(pair -> array.add(context.deserialize(pair, Pair.class)));
+            List<StringPair> array = new ArrayList<>();
+            pairs.forEach(pair -> array.add(context.deserialize(pair, StringPair.class)));
             dataset.setPairs(array);
         }
 

stepik-java-api/src/main/java/org/stepik/api/objects/attempts/Pair.java renamed to stepik-java-api/src/main/java/org/stepik/api/objects/attempts/StringPair.java

@@ -3,11 +3,11 @@
 /**
  * @author meanmail
  */
-public class Pair {
+public class StringPair {
     private String first;
     private String second;
 
-    public Pair(String first, String second) {
+    public StringPair(String first, String second) {
         this.first = first;
         this.second = second;
     }
@@ -39,7 +39,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        Pair pair = (Pair) o;
+        StringPair pair = (StringPair) o;
 
         //noinspection SimplifiableIfStatement
         if (first != null ? !first.equals(pair.first) : pair.first != null) return false;

stepik-java-api/src/main/java/org/stepik/api/objects/recommendations/ReactionValues.java

@@ -1,18 +1,43 @@
 package org.stepik.api.objects.recommendations;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.HashMap;
+
 /**
  * @author meanmail
  */
 public enum ReactionValues {
-    TOO_EASY(-1), TOO_HARD(0), INTERESTING(1), SOLVED(2);
+    UNKNOWN(Integer.MIN_VALUE), TOO_EASY(-1), TOO_HARD(0), INTERESTING(1), SOLVED(2);
 
+    private static HashMap<String, ReactionValues> map;
     private final int value;
 
     ReactionValues(int value) {
         this.value = value;
     }
 
+    public static ReactionValues of(@NotNull String value) {
+        if (map == null) {
+            map = new HashMap<>();
+            Arrays.stream(values())
+                    .forEach(reactionValues -> map.put(reactionValues.name().toLowerCase(), reactionValues));
+        }
+        return map.getOrDefault(value, UNKNOWN);
+    }
+
     public int getValue() {
         return value;
     }
+
+    public boolean in(ReactionValues... values) {
+        for (ReactionValues value : values) {
+            if (this.equals(value)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

stepik-java-api/src/main/java/org/stepik/api/objects/submissions/Reply.java

@@ -71,8 +71,11 @@ public void setAttachments(@Nullable List<Attachment> attachments) {
         this.attachments = attachments;
     }
 
-    @Nullable
+    @NotNull
     public String getText() {
+        if (text == null) {
+            text = "";
+        }
         return text;
     }
 
@@ -120,17 +123,23 @@ public void setOrdering(@Nullable List<Integer> ordering) {
         this.ordering = ordering;
     }
 
-    @Nullable
+    @NotNull
     public String getNumber() {
+        if (number == null) {
+            number = "";
+        }
         return number;
     }
 
     public void setNumber(@Nullable String number) {
         this.number = number;
     }
 
-    @Nullable
+    @NotNull
     public String getFile() {
+        if (file == null) {
+            file = "";
+        }
         return file;
     }
 
@@ -161,4 +170,41 @@ public List<String> getBlanks() {
     public void setBlanks(@Nullable List<String> blanks) {
         this.blanks = blanks;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Reply reply = (Reply) o;
+
+        if (!getLanguage().equals(reply.getLanguage())) return false;
+        if (!getCode().equals(reply.getCode())) return false;
+        if (!getFormula().equals(reply.getFormula())) return false;
+        if (!getAttachments().equals(reply.getAttachments())) return false;
+        if (!getText().equals(reply.getText())) return false;
+        if (!getFiles().equals(reply.getFiles())) return false;
+        if (!getChoices().equals(reply.getChoices())) return false;
+        if (!getOrdering().equals(reply.getOrdering())) return false;
+        if (!getNumber().equals(reply.getNumber())) return false;
+        //noinspection SimplifiableIfStatement
+        if (!getFile().equals(reply.getFile())) return false;
+        return getBlanks().equals(reply.getBlanks());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getLanguage().hashCode();
+        result = 31 * result + getCode().hashCode();
+        result = 31 * result + getFormula().hashCode();
+        result = 31 * result + getAttachments().hashCode();
+        result = 31 * result + getText().hashCode();
+        result = 31 * result + getFiles().hashCode();
+        result = 31 * result + getChoices().hashCode();
+        result = 31 * result + getOrdering().hashCode();
+        result = 31 * result + getNumber().hashCode();
+        result = 31 * result + getFile().hashCode();
+        result = 31 * result + getBlanks().hashCode();
+        return result;
+    }
 }

stepik-java-api/src/main/java/org/stepik/api/objects/submissions/Submission.java

@@ -5,10 +5,18 @@
 import org.jetbrains.annotations.Nullable;
 import org.stepik.api.objects.AbstractObject;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.Date;
+import java.util.TimeZone;
+
 /**
  * @author meanmail
  */
 public class Submission extends AbstractObject {
+    private final static SimpleDateFormat timeISOFormat = getTimeISOFormat();
+
     private String status;
     private double score;
     private String hint;
@@ -20,6 +28,14 @@ public class Submission extends AbstractObject {
     private int attempt;
     private String session;
     private double eta;
+    private transient Date utcTime;
+
+    private static SimpleDateFormat getTimeISOFormat() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        TimeZone tz = TimeZone.getTimeZone("UTC");
+        format.setTimeZone(tz);
+        return format;
+    }
 
     @NotNull
     public String getStatus() {
@@ -57,13 +73,21 @@ public void setReply(@Nullable Reply reply) {
         this.reply = reply;
     }
 
-    @Nullable
-    public String getTime() {
-        return time;
+    @NotNull
+    public Date getTime() {
+        if (utcTime == null) {
+            try {
+                utcTime = timeISOFormat.parse(time);
+            } catch (ParseException e) {
+                return Date.from(Instant.EPOCH);
+            }
+        }
+        return utcTime;
     }
 
-    public void setTime(@Nullable String time) {
-        this.time = time;
+    public void setTime(@Nullable Date time) {
+        this.time = timeISOFormat.format(time);
+        utcTime = time;
     }
 
     public double getScore() {

stepik-java-api/src/main/java/org/stepik/api/objects/submissions/SubmissionPost.java

@@ -1,6 +1,7 @@
 package org.stepik.api.objects.submissions;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author meanmail
@@ -17,6 +18,10 @@ public Reply getReply() {
         return reply;
     }
 
+    public void setReply(@Nullable Reply reply) {
+        this.reply = reply;
+    }
+
     public long getAttempt() {
         return attempt;
     }

stepik-java-api/src/main/java/org/stepik/api/queries/submissions/StepikSubmissionsPostQuery.java

@@ -4,6 +4,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.stepik.api.actions.StepikAbstractAction;
 import org.stepik.api.objects.submissions.Attachment;
+import org.stepik.api.objects.submissions.Reply;
 import org.stepik.api.objects.submissions.Submissions;
 import org.stepik.api.objects.submissions.SubmissionsPost;
 import org.stepik.api.queries.StepikAbstractPostQuery;
@@ -98,4 +99,9 @@ public StepikSubmissionsPostQuery code(@NotNull String value) {
     protected String getBody() {
         return getJsonConverter().toJson(submissions);
     }
+
+    public StepikSubmissionsPostQuery reply(@NotNull Reply reply) {
+        submissions.getSubmission().setReply(reply);
+        return this;
+    }
 }

stepik-union/src/main/java/org/stepik/core/StudyUtils.java

@@ -1,7 +1,5 @@
 package org.stepik.core;
 
-import com.intellij.ide.ui.LafManager;
-import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -18,14 +16,11 @@
 import org.stepik.api.objects.steps.Step;
 import org.stepik.api.objects.steps.Steps;
 import org.stepik.core.courseFormat.StudyNode;
-import org.stepik.core.courseFormat.stepHelpers.StepHelper;
-import org.stepik.core.templates.Templater;
 import org.stepik.core.ui.StudyToolWindow;
 import org.stepik.core.ui.StudyToolWindowFactory;
 import org.stepik.core.utils.ProjectFilesUtils;
 
 import javax.swing.*;
-import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -76,20 +71,6 @@ static StudyToolWindow getStudyToolWindow(@NotNull final Project project) {
         return null;
     }
 
-    @NotNull
-    public static String getStepContent(@NotNull StepHelper stepHelper) {
-        return processTemplate(stepHelper, "quiz/" + stepHelper.getType());
-    }
-
-    @NotNull
-    private static String processTemplate(@NotNull StepHelper stepHelper, @NotNull String templateName) {
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("stepNode", stepHelper);
-        params.put("darcula", LafManager.getInstance().getCurrentLookAndFeel() instanceof DarculaLookAndFeelInfo);
-
-        return Templater.processTemplate(templateName, params);
-    }
-
     @Nullable
     public static StudyPluginConfigurator getConfigurator(@NotNull final Project project) {
         StudyPluginConfigurator[] extensions = StudyPluginConfigurator.EP_NAME.getExtensions();