Skip to content

feat-support multiple params with comma after -p #1389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
liumengkai wants to merge 1 commit into from
Closed

feat-support multiple params with comma after -p #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConstantValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public class ConstantValue {
public static final String SINGLE_QUOTE_MARK_SYMBOL = "'";
public static final String DOUBLE_QUOTE_MARK_SYMBOL = "\"";
public static final String COMMA_SYMBOL = ",";
public static final String PARAMS_SEP = "-M";
public static final String EMPTY_STR = "";
public static final String SEMICOLON_SYMBOL = ";";

public static final String SINGLE_SLASH_SYMBOL = "/";
Expand Down
24 changes: 20 additions & 4 deletions chunjun-core/src/main/java/com/dtstack/chunjun/util/JobUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,29 @@ public static String JsonValueReplace(String json, Map<String, String> parameter
return json;
}

/** 将命令行中的修改命令转化为HashMap保存 */
/**
* @param command
* @return HashMap
* @description: convert params after '-p' in shell to hashmap
*/
public static HashMap<String, String> CommandTransform(String command) {
HashMap<String, String> parameter = new HashMap<>();
String[] split = StringUtils.split(command, ConstantValue.COMMA_SYMBOL);
for (String item : split) {
String[] temp = item.split(ConstantValue.EQUAL_SYMBOL);
parameter.put(temp[0].trim(), temp[1].trim());
for (int i = 0; i < split.length; i++) {
String[] params = split[i].split(ConstantValue.EQUAL_SYMBOL);
if (params[0].trim().startsWith(ConstantValue.PARAMS_SEP)) {
StringBuilder sb = new StringBuilder();
sb.append(params[1]);
while (i + 1 < split.length && !split[i + 1].contains(ConstantValue.EQUAL_SYMBOL)) {
sb.append(ConstantValue.COMMA_SYMBOL + split[i + 1]);
i++;
}
String key =
params[0].trim().replace(ConstantValue.PARAMS_SEP, ConstantValue.EMPTY_STR);
parameter.put(key, sb.toString());
} else {
parameter.put(params[0].trim(), params[1].trim());
}
}
return parameter;
}
Expand Down