Skip to content

Commit 95a827c

Browse files
committed
[Fix][Common] Problems with comma-separated logic in variable values during variable substitution.(#9151)
1 parent 879b1e2 commit 95a827c

File tree

2 files changed

+55
-2
lines changed

2 files changed

+55
-2
lines changed

Diff for: seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/command/ParameterSplitter.java

+14-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,21 @@ public List<String> split(String value) {
5050
}
5151

5252
if (currentToken.length() > 0) {
53-
result.add(currentToken.toString().trim());
53+
String token = processToken(currentToken.toString().trim());
54+
result.add(token);
5455
}
5556

5657
return result;
5758
}
58-
}
59+
60+
private String processToken(String token) {
61+
int eqIdx = token.indexOf('=');
62+
if (eqIdx <= 0 || eqIdx == token.length() - 1) {
63+
return token;
64+
}
65+
String key = token.substring(0, eqIdx);
66+
String val = token.substring(eqIdx + 1).trim();
67+
val = val.replaceAll("^\"|\"$", "");
68+
return String.format("%s=%s", key, val);
69+
}
70+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.seatunnel.core.starter.utils;
19+
20+
import org.apache.seatunnel.common.utils.PlaceholderUtils;
21+
import org.apache.seatunnel.core.starter.command.ParameterSplitter;
22+
import org.junit.jupiter.api.Assertions;
23+
import org.junit.jupiter.api.Test;
24+
25+
import java.util.*;
26+
27+
import static org.junit.jupiter.api.Assertions.assertEquals;
28+
29+
public class ParameterSplitterTest {
30+
31+
@Test
32+
public void testSplit() {
33+
String value = "columns=\"c_id,c_area_code,c_date\"";
34+
35+
ParameterSplitter parameterSplitter = new ParameterSplitter();
36+
List<String> result = parameterSplitter.split(value);
37+
38+
assertEquals(1, result.size());
39+
assertEquals("columns=c_id,c_area_code,c_date", result.get(0));
40+
}
41+
}

0 commit comments

Comments
 (0)