From 50fe7afca3089550750e172980f3ff1d5b5ae51d Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 27 May 2020 16:14:58 +0200
Subject: [PATCH] Simplify body splitting logic in CommandUtils.splitArgs
---
src/main/java/de/prob2/jupyter/CommandUtils.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/prob2/jupyter/CommandUtils.java b/src/main/java/de/prob2/jupyter/CommandUtils.java
index 0d341be..4e66d06 100644
--- a/src/main/java/de/prob2/jupyter/CommandUtils.java
+++ b/src/main/java/de/prob2/jupyter/CommandUtils.java
@@ -91,15 +91,13 @@ public final class CommandUtils {
public static @NotNull SplitResult splitArgs(final @NotNull Parameters parameters, final @NotNull String argString) {
final SplitArguments splitArgs = new SplitArguments(Collections.emptyMap());
- String remainingArgs;
+ String remainingArgs = argString;
if (parameters.getBodyParam().isPresent()) {
final String[] argsAndBody = argString.split("\n", 2);
- remainingArgs = argsAndBody[0];
if (argsAndBody.length > 1) {
+ remainingArgs = argsAndBody[0];
splitArgs.add(parameters.getBodyParam().get(), argsAndBody[1]);
}
- } else {
- remainingArgs = argString;
}
for (int i = 0; i < parameters.getPositionalParameters().size();) {
--
GitLab