From 22620985bc3d1c17aafdae7383b95c3870856cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Pa=C3=9F?=
 <22845248+mpass99@users.noreply.github.com>
Date: Sun, 19 Jun 2022 21:09:21 +0200
Subject: [PATCH] Java11Exec: Reduce complexity of parseCommand method.

---
 .../main/java/poseidon/SimpleMakefile.java    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java b/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
index 64065d0..6b94097 100644
--- a/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
+++ b/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
@@ -88,6 +88,23 @@ class SimpleMakefile {
         return concatCommands(rules.get(rule));
     }
 
+    // updateCommand injects the passed make assignments and before and after statements to the command.
+    private String updateCommand(Matcher makeCommandMatcher, String command) {
+        String assignments = makeCommandMatcher.group("assignments");
+        if (assignments != null) {
+            command = injectAssignments(command, assignments);
+        }
+
+        if (makeCommandMatcher.group("before") != null) {
+            command = makeCommandMatcher.group("before") + command;
+        }
+        if (makeCommandMatcher.group("after") != null) {
+            command = command + makeCommandMatcher.group("after");
+        }
+
+        return command;
+    }
+
     // getAssignmentPart returns the key or value of the passed assignment depending on the flag firstPart.
     private String getAssignmentPart(String assignment, boolean firstPart) {
         String[] parts = assignment.split("=");
@@ -130,16 +147,6 @@ class SimpleMakefile {
         }
 
         String command = getCommand(ruleArgument);
-        String assignments = makeCommandMatcher.group("assignments");
-        command = injectAssignments(command, (assignments != null) ? assignments : "");
-
-        if (makeCommandMatcher.group("before") != null) {
-            command = makeCommandMatcher.group("before") + command;
-        }
-        if (makeCommandMatcher.group("after") != null) {
-            command = command + makeCommandMatcher.group("after");
-        }
-
-        return  command;
+        return updateCommand(makeCommandMatcher, command);
     }
 }