Merge branch 'release/0.15'

Author: meanmail

gradle.properties

@@ -2,7 +2,7 @@
 ### General options ###
 javaVersion=1.8
 gradleVersion=3.2.1
-pluginVersion=0.14
+pluginVersion=0.15
 # 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

@@ -69,7 +69,7 @@ public static List<String> getStringList(@NotNull JsonObject object, @NotNull St
     }
 
     @Nullable
-    private static <T> List<T> getList(
+    public static <T> List<T> getList(
             @NotNull JsonObject object,
             @NotNull String fieldName,
             @NotNull Function<JsonElement, T> getter) {

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

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

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

@@ -2,6 +2,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.stepik.api.client.StepikApiClient;
+import org.stepik.api.objects.ObjectsContainer;
+import org.stepik.api.queries.reviews.StepikReviewSessionsPostQuery;
 
 /**
  * @author meanmail
@@ -10,4 +12,9 @@ public class StepikReviewSessionsAction extends StepikAbstractAction {
     public StepikReviewSessionsAction(@NotNull StepikApiClient stepikApiClient) {
         super(stepikApiClient);
     }
+
+    @NotNull
+    public <R extends ObjectsContainer> StepikReviewSessionsPostQuery post() {
+        return new StepikReviewSessionsPostQuery(this);
+    }
 }

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

@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.stepik.api.client.StepikApiClient;
+import org.stepik.api.objects.users.User;
 import org.stepik.api.queries.stepiks.StepikStepiksGetQuery;
 
 /**
@@ -16,4 +17,10 @@ public StepikStepiksAction(@NotNull StepikApiClient stepikApiClient) {
     public StepikStepiksGetQuery get() {
         return new StepikStepiksGetQuery(this);
     }
+
+    public User getCurrentUser() {
+        return this.get()
+                .id(1)
+                .execute().getUser();
+    }
 }

stepik-java-api/src/main/java/org/stepik/api/objects/ObjectsContainer.java

@@ -32,4 +32,12 @@ public Meta getMeta() {
 
     @NotNull
     public abstract Class<T> getItemClass();
+
+    public T get(int index) {
+        return getItems().get(index);
+    }
+
+    public T getFirst() {
+        return getItems().get(0);
+    }
 }

stepik-java-api/src/main/java/org/stepik/api/objects/instructions/Instruction.java

@@ -0,0 +1,84 @@
+package org.stepik.api.objects.instructions;
+
+import com.google.gson.annotations.SerializedName;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.stepik.api.objects.AbstractObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author meanmail
+ */
+public class Instruction extends AbstractObject {
+    private long step;
+    @SerializedName("min_reviews")
+    private int minReviews;
+    @SerializedName("strategy_type")
+    private String strategyType;
+    private List<Integer> rubrics;
+    @SerializedName("is_frozen")
+    private boolean isFrozen;
+    private String text;
+
+    public long getStep() {
+        return step;
+    }
+
+    public void setStep(long step) {
+        this.step = step;
+    }
+
+    public int getMinReviews() {
+        return minReviews;
+    }
+
+    public void setMinReviews(int minReviews) {
+        this.minReviews = minReviews;
+    }
+
+    @NotNull
+    public String getStrategyType() {
+        if (strategyType == null) {
+            strategyType = "";
+        }
+        return strategyType;
+    }
+
+    public void setStrategyType(@Nullable String strategyType) {
+        this.strategyType = strategyType;
+    }
+
+    @NotNull
+    public List<Integer> getRubrics() {
+        if (rubrics == null) {
+            rubrics = new ArrayList<>();
+        }
+        return rubrics;
+    }
+
+    public void setRubrics(@Nullable List<Integer> rubrics) {
+        this.rubrics = rubrics;
+    }
+
+    public boolean isFrozen() {
+        return isFrozen;
+    }
+
+    public void setFrozen(boolean frozen) {
+        this.isFrozen = frozen;
+    }
+
+    @NotNull
+    public String getText() {
+        if (text == null) {
+            text = "";
+        }
+        return text;
+    }
+
+    public void setText(@Nullable String text) {
+        this.text = text;
+    }
+}

stepik-java-api/src/main/java/org/stepik/api/objects/instructions/Instructions.java

@@ -0,0 +1,41 @@
+package org.stepik.api.objects.instructions;
+
+import org.jetbrains.annotations.NotNull;
+import org.stepik.api.objects.ObjectsContainer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author meanmail
+ */
+public class Instructions extends ObjectsContainer<Instruction> {
+    private List<Instruction> instructions;
+    private List<Rubric> rubrics;
+
+    public List<Instruction> getInstructions() {
+        if (instructions == null) {
+            instructions = new ArrayList<>();
+        }
+        return instructions;
+    }
+
+    public List<Rubric> getRubrics() {
+        if (rubrics == null) {
+            rubrics = new ArrayList<>();
+        }
+        return rubrics;
+    }
+
+    @NotNull
+    @Override
+    public List<Instruction> getItems() {
+        return getInstructions();
+    }
+
+    @NotNull
+    @Override
+    public Class<Instruction> getItemClass() {
+        return Instruction.class;
+    }
+}

stepik-java-api/src/main/java/org/stepik/api/objects/instructions/Rubric.java

@@ -0,0 +1,52 @@
+package org.stepik.api.objects.instructions;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.stepik.api.objects.AbstractObject;
+
+/**
+ * @author meanmail
+ */
+public class Rubric extends AbstractObject {
+    private int instruction;
+    private String text;
+    private int cost;
+    private int position;
+
+    public int getInstruction() {
+        return instruction;
+    }
+
+    public void setInstruction(int instruction) {
+        this.instruction = instruction;
+    }
+
+    @NotNull
+    public String getText() {
+        if (text == null) {
+            text = "";
+        }
+        return text;
+    }
+
+    public void setText(@Nullable String text) {
+        this.text = text;
+    }
+
+    public int getCost() {
+        return cost;
+    }
+
+    public void setCost(int cost) {
+        this.cost = cost;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+}

stepik-java-api/src/main/java/org/stepik/api/objects/metrics/Metric.java

@@ -11,7 +11,7 @@
  */
 public class Metric {
     private String name;
-    private Integer timestamp;
+    private Long timestamp;
     private Map<String, String> tags;
     private Map<String, Object> data;
 
@@ -57,11 +57,11 @@ public void setName(@Nullable String name) {
     }
 
     @Nullable
-    public Integer getTimestamp() {
+    public Long getTimestamp() {
         return timestamp;
     }
 
-    public void setTimestamp(@Nullable Integer timestamp) {
+    public void setTimestamp(@Nullable Long timestamp) {
         this.timestamp = timestamp;
     }
 }