Skip to content

Commit be6840c

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

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

Diff for: seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/PlaceholderUtils.java

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package org.apache.seatunnel.common.utils;
1919

20+
import org.apache.commons.lang3.StringUtils;
21+
2022
import java.util.regex.Matcher;
2123
import java.util.regex.Pattern;
2224

@@ -28,6 +30,10 @@ public static String replacePlaceholders(String input, String placeholderName, S
2830

2931
public static String replacePlaceholders(
3032
String input, String placeholderName, String value, String defaultValue) {
33+
if (StringUtils.isNotBlank(value)) {
34+
value = value.replaceAll("\"(.*?)\"", "$1");
35+
}
36+
3137
String placeholderRegex = "\\$\\{" + Pattern.quote(placeholderName) + "(:[^}]*)?\\}";
3238
Pattern pattern = Pattern.compile(placeholderRegex);
3339
Matcher matcher = pattern.matcher(input);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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.common.utils;
19+
20+
import org.junit.jupiter.api.Test;
21+
22+
import lombok.extern.slf4j.Slf4j;
23+
24+
import static org.junit.jupiter.api.Assertions.assertEquals;
25+
26+
@Slf4j
27+
public class PlaceholderUtilsTest {
28+
29+
@Test
30+
public void testReplacePlaceholders() {
31+
String input = "select ${columns} from table";
32+
String placeholderName = "columns";
33+
String value = "\"c_id,c_area_code,c_date\"";
34+
35+
String result = PlaceholderUtils.replacePlaceholders(input, placeholderName, value, null);
36+
assertEquals("select c_id,c_area_code,c_date from table", result);
37+
}
38+
}

0 commit comments

Comments
 (0)