fixed a bug where Restart was not parsed properly

Cambio-Project · May 12, 2022 · a397949 · a397949
1 parent aa8c879
commit a397949
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/src/main/java/cambio/simulator/parsing/adapter/scenario/ScenarioDescription.java b/src/main/java/cambio/simulator/parsing/adapter/scenario/ScenarioDescription.java
@@ -168,27 +168,25 @@ private void parseTimedFaultload(Collection<ISelfScheduled> scheduables, String
             throw new ParsingException(String.format("Could not find target service '%s'", artifact));
         }
 
-        if (currentStimulus.startsWith("KILL")) {
-
-            String[] stimuliArray = currentStimulus.split(" ");
+        String[] stimuliArray = currentStimulus.split(" ");
 
-            int instances = Integer.MAX_VALUE;
+        int instances = Integer.MAX_VALUE;
 
-            if (stimuliArray.length == 2) {
-                try {
-                    instances = Integer.parseInt(stimuliArray[1]);
-                } catch (NumberFormatException e) {
-                    service = NameResolver.resolveMicroserviceName(model, stimuliArray[1]);
-                }
-            } else if (stimuliArray.length == 3) {
+        if (stimuliArray.length == 2) {
+            try {
+                instances = Integer.parseInt(stimuliArray[1]);
+            } catch (NumberFormatException e) {
                 service = NameResolver.resolveMicroserviceName(model, stimuliArray[1]);
-                instances = Integer.parseInt(stimuliArray[2]);
-            } else if (stimuliArray.length != 1) {
-                throw new ParsingException("KILL was not defined correctly (KILL [<service_name>] "
-                    + "[<#instances>]@<target_time>)");
             }
+        } else if (stimuliArray.length == 3) {
+            service = NameResolver.resolveMicroserviceName(model, stimuliArray[1]);
+            instances = Integer.parseInt(stimuliArray[2]);
+        } else if (stimuliArray.length != 1) {
+            throw new ParsingException("Command was not defined correctly (KILL/START/RESTART [<service_name>] "
+                + "[<#instances>]@<target_time>)");
+        }
 
-
+        if (currentStimulus.startsWith("KILL")) {
             scheduables.add(
                 new ChaosMonkeyEvent(model, "Chaosmonkey", true, service, instances) {
                     {
@@ -197,9 +195,6 @@ private void parseTimedFaultload(Collection<ISelfScheduled> scheduables, String
                 }
             );
         } else if (currentStimulus.startsWith("RESTART") || currentStimulus.startsWith("START")) {
-            int instances = Integer.parseInt(currentStimulus.replaceAll("(RE)?START", "").trim());
-
-
             scheduables.add(
                 new SummonerMonkeyEvent(model, "Summoner", true, service, instances) {
                     {