refactor k6-constants

k6-adapter/src/main/java/dq/adapter/StimulusAdapter.java

@@ -1,9 +1,9 @@
 package dq.adapter;
 
 import dq.dqlang.constants.LoadTestConstants;
-import dq.dqlang.constants.accuracy.ConstantLoad;
-import dq.dqlang.constants.accuracy.LoadIncrease;
-import dq.dqlang.constants.accuracy.LoadPeak;
+import dq.dqlang.constants.loadprofile.ConstantLoad;
+import dq.dqlang.constants.loadprofile.LoadIncrease;
+import dq.dqlang.constants.loadprofile.LoadPeak;
 import dq.dqlang.k6.options.*;
 import dq.dqlang.loadtest.Stimulus;
 import dq.exception.UnknownTermException;
@@ -50,7 +50,7 @@ public Options adaptStimulus(Stimulus stimulus) {
      */
     public Scenario getLoadPeakScenario(Stimulus stimulus) {
         LoadTestConstants constants = constantsLoader.load();
-        LoadPeak loadPeak = constants.getAccuracy().getLoadPeak();
+        LoadPeak loadPeak = constants.getLoadProfile().getLoadPeak();
 
         String highestLoad = stimulus.getHighestLoad();
         int target;
@@ -88,7 +88,7 @@ public Scenario getLoadPeakScenario(Stimulus stimulus) {
      */
     public Scenario getLoadIncreaseScenario(Stimulus stimulus) {
         LoadTestConstants constants = constantsLoader.load();
-        LoadIncrease loadIncrease = constants.getAccuracy().getLoadIncrease();
+        LoadIncrease loadIncrease = constants.getLoadProfile().getLoadIncrease();
 
         String typeOfIncrease = stimulus.getTypeOfIncrease();
         int exponent;
@@ -141,7 +141,7 @@ private LinkedHashSet<Stage> getIncreasingStages(String stageDuration, int start
      */
     public Scenario getConstantLoadScenario(Stimulus stimulus) {
         LoadTestConstants constants = constantsLoader.load();
-        ConstantLoad constantLoad = constants.getAccuracy().getConstantLoad();
+        ConstantLoad constantLoad = constants.getLoadProfile().getConstantLoad();
 
         String baseLoad = stimulus.getBaseLoad();
         int vus;

k6-adapter/src/main/java/dq/dqlang/constants/LoadTestConstants.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import dq.dqlang.constants.accuracy.Accuracy;
+import dq.dqlang.constants.loadprofile.LoadProfile;
 import lombok.Getter;
 import lombok.ToString;
 
@@ -13,6 +14,8 @@
 public class LoadTestConstants {
 
     private Accuracy accuracy;
+    @JsonProperty("load_profile")
+    private LoadProfile loadProfile;
     @JsonProperty("response_time")
     private ResponseTime responseTime;
 }

k6-adapter/src/main/java/dq/dqlang/constants/accuracy/Accuracy.java

@@ -1,6 +1,5 @@
 package dq.dqlang.constants.accuracy;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.ToString;
 
@@ -9,10 +8,4 @@
 public class Accuracy {
 
     private Repetition repetition;
-    @JsonProperty("load_peak")
-    private LoadPeak loadPeak;
-    @JsonProperty("load_increase")
-    private LoadIncrease loadIncrease;
-    @JsonProperty("constant_load")
-    private ConstantLoad constantLoad;
 }

k6-adapter/src/main/java/dq/dqlang/constants/accuracy/ConstantLoad.java → k6-adapter/src/main/java/dq/dqlang/constants/loadprofile/ConstantLoad.java

@@ -1,4 +1,4 @@
-package dq.dqlang.constants.accuracy;
+package dq.dqlang.constants.loadprofile;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;

k6-adapter/src/main/java/dq/dqlang/constants/accuracy/LoadIncrease.java → k6-adapter/src/main/java/dq/dqlang/constants/loadprofile/LoadIncrease.java

@@ -1,4 +1,4 @@
-package dq.dqlang.constants.accuracy;
+package dq.dqlang.constants.loadprofile;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;

k6-adapter/src/main/java/dq/dqlang/constants/accuracy/LoadPeak.java → k6-adapter/src/main/java/dq/dqlang/constants/loadprofile/LoadPeak.java

@@ -1,4 +1,4 @@
-package dq.dqlang.constants.accuracy;
+package dq.dqlang.constants.loadprofile;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;

k6-adapter/src/main/java/dq/dqlang/constants/loadprofile/LoadProfile.java

@@ -0,0 +1,17 @@
+package dq.dqlang.constants.loadprofile;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class LoadProfile {
+
+    @JsonProperty("load_peak")
+    private LoadPeak loadPeak;
+    @JsonProperty("load_increase")
+    private LoadIncrease loadIncrease;
+    @JsonProperty("constant_load")
+    private ConstantLoad constantLoad;
+}

k6-adapter/src/main/resources/constant/constants.json

@@ -3,7 +3,9 @@
     "repetition": {
       "min": 1,
       "max": 3
-    },
+    }
+  },
+  "load_profile": {
     "load_peak": {
       "high": 10,
       "very_high": 15,

k6-adapter/src/test/resources/dqlang/constants.json

@@ -1,31 +1,34 @@
 {
   "accuracy": {
     "repetition": {
-      "min": 2,
-      "max": 10
-    },
+      "min": 1,
+      "max": 3
+    }
+  },
+  "load_profile": {
     "load_peak": {
-      "high": 20,
-      "very_high": 40,
-      "extremely_high": 50,
-      "slow": "5m",
-      "fast": "2m",
-      "very_fast": "1m"
+      "high": 10,
+      "very_high": 15,
+      "extremely_high": 30,
+      "slow": "20s",
+      "fast": "15s",
+      "very_fast": "10s",
+      "cool_down_duration": "5s"
     },
     "load_increase": {
       "start_target": 10,
-      "end_target": 100,
-      "stage_duration": "1m",
+      "end_target": 60,
+      "stage_duration": "5s",
       "linear": 1,
       "quadratic": 2,
       "cubic": 3
     },
     "constant_load": {
       "low": 10,
       "medium": 20,
-      "high": 40,
+      "high": 30,
       "min_duration": 1000,
-      "max_duration": 600000
+      "max_duration": 10000
     }
   },
   "response_time": {