Merge branch 'release/0.14'

Author: meanmail

gradle.properties

@@ -2,7 +2,7 @@
 ### General options ###
 javaVersion=1.8
 gradleVersion=3.2.1
-pluginVersion=0.13
+pluginVersion=0.14
 # 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/Utils.java

@@ -17,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -33,6 +34,7 @@ public class Utils {
     public static String mapToGetString(@NotNull String name, @NotNull String[] values) {
         String encodedName = encode(name);
         return Arrays.stream(values)
+                .filter(Objects::nonNull)
                 .map(value -> encodedName + "=" + encode(value))
                 .collect(Collectors.joining("&"));
     }

stepik-java-api/src/main/java/org/stepik/api/actions/StepikRecommendationReactionsAction.java

@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.stepik.api.client.StepikApiClient;
+import org.stepik.api.queries.recommendations.StepikReactionsPostQuery;
 
 /**
  * @author meanmail
@@ -10,4 +11,10 @@ public class StepikRecommendationReactionsAction extends StepikAbstractAction {
     public StepikRecommendationReactionsAction(@NotNull StepikApiClient stepikApiClient) {
         super(stepikApiClient);
     }
+
+    @NotNull
+    public StepikReactionsPostQuery post() {
+        return new StepikReactionsPostQuery(this);
+    }
+
 }

stepik-java-api/src/main/java/org/stepik/api/actions/StepikRecommendationsAction.java

@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.stepik.api.client.StepikApiClient;
+import org.stepik.api.queries.recommendations.StepikRecommendationsGetQuery;
 
 /**
  * @author meanmail
@@ -10,4 +11,9 @@ public class StepikRecommendationsAction extends StepikAbstractAction {
     public StepikRecommendationsAction(@NotNull StepikApiClient stepikApiClient) {
         super(stepikApiClient);
     }
+
+    @NotNull
+    public StepikRecommendationsGetQuery get() {
+        return new StepikRecommendationsGetQuery(this);
+    }
 }

stepik-java-api/src/main/java/org/stepik/api/objects/courses/Course.java

@@ -721,8 +721,11 @@ public void setCreateDate(@Nullable String createDate) {
         this.createDate = createDate;
     }
 
-    @Nullable
+    @NotNull
     public String getUpdateDate() {
+        if (updateDate == null) {
+            updateDate = "";
+        }
         return updateDate;
     }
 

stepik-java-api/src/main/java/org/stepik/api/objects/lessons/CompoundUnitLesson.java

@@ -85,4 +85,9 @@ public int getPosition() {
     public String getProgress() {
         return getLesson().getProgress();
     }
+
+    @NotNull
+    public String getUpdateDate() {
+        return lesson.getUpdateDate();
+    }
 }

stepik-java-api/src/main/java/org/stepik/api/objects/lessons/Lesson.java

@@ -385,8 +385,11 @@ public void setCreateDate(@Nullable String createDate) {
         this.createDate = createDate;
     }
 
-    @Nullable
+    @NotNull
     public String getUpdateDate() {
+        if (updateDate == null) {
+            updateDate = "";
+        }
         return updateDate;
     }
 

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

@@ -0,0 +1,50 @@
+package org.stepik.api.objects.recommendations;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author meanmail
+ */
+public class Reaction {
+    private int reaction;
+    private long lesson;
+    private long user;
+    private String time;
+
+    public int getReaction() {
+        return reaction;
+    }
+
+    public void setReaction(int reaction) {
+        this.reaction = reaction;
+    }
+
+    public long getLesson() {
+        return lesson;
+    }
+
+    public void setLesson(long lesson) {
+        this.lesson = lesson;
+    }
+
+    public long getUser() {
+        return user;
+    }
+
+    public void setUser(long user) {
+        this.user = user;
+    }
+
+    @NotNull
+    public String getTime() {
+        if (time == null) {
+            time = "";
+        }
+        return time;
+    }
+
+    public void setTime(@Nullable String time) {
+        this.time = time;
+    }
+}

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

@@ -0,0 +1,48 @@
+package org.stepik.api.objects.recommendations;
+
+/**
+ * @author meanmail
+ */
+public class ReactionPost {
+    private int reaction;
+    private String lesson;
+    private String user;
+
+    public int getReaction() {
+        return reaction;
+    }
+
+    public void setReaction(int reaction) {
+        this.reaction = reaction;
+    }
+
+    public long getLesson() {
+        if (lesson == null) {
+            lesson = "0";
+        }
+        try {
+            return Long.valueOf(lesson);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
+    }
+
+    public void setLesson(long lesson) {
+        this.lesson = String.valueOf(lesson);
+    }
+
+    public long getUser() {
+        if (user == null) {
+            user = "0";
+        }
+        try {
+            return Long.valueOf(user);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
+    }
+
+    public void setUser(long user) {
+        this.user = String.valueOf(user);
+    }
+}

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

@@ -0,0 +1,18 @@
+package org.stepik.api.objects.recommendations;
+
+/**
+ * @author meanmail
+ */
+public enum ReactionValues {
+    TOO_EASY(-1), TOO_HARD(0), INTERESTING(1), SOLVED(2);
+
+    private final int value;
+
+    ReactionValues(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}