htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java11Exec: Reduce complexity of parseCommand method.

Browse Source
This commit is contained in:
Maximilian Paß
2022-06-19 21:09:21 +02:00
parent ed5205236f
commit 22620985bc
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
View File

@ -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);
}
}