-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Bug][Seatunnel-web] Escape seatunnel-web placeholders
1. An option to escape placeholders in the configuration has been provided.
2. If a placeholder is escaped by adding a backslash (e.g., \${valueParam:defaultValue}), it is passed to the Seatunnel engine as-is without value being replaced in Seatunnel-web.
3. laceholders configured as default values in connectors are escaped before being displayed in the UI.- Loading branch information
1 parent
2515e2b
commit bb35af1
Showing
5 changed files
with
151 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
...nnel-dynamicform/src/main/java/org/apache/seatunnel/app/dynamicforms/PlaceholderUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.seatunnel.app.dynamicforms; | ||
|
|
||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| public class PlaceholderUtil { | ||
|
|
||
| private static final Pattern placeholderPattern = | ||
| Pattern.compile("(?<!\\\\)\\$\\{(\\w+)(?::(.*?))?\\}"); | ||
|
|
||
| /** | ||
| * To replace ${paramName:defaultValue} or ${paramName} with \${paramName:defaultValue} and | ||
| * \${paramName} respectively. | ||
| * | ||
| * @param input the input string | ||
| * @return the input string with placeholders escaped | ||
| */ | ||
| public static String escapePlaceholders(String input) { | ||
| Matcher matcher = placeholderPattern.matcher(input); | ||
| StringBuffer result = new StringBuffer(); | ||
|
|
||
| while (matcher.find()) { | ||
| String placeholder = matcher.group(); | ||
| matcher.appendReplacement(result, Matcher.quoteReplacement("\\" + placeholder)); | ||
| } | ||
|
|
||
| matcher.appendTail(result); | ||
| return result.toString(); | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
...-dynamicform/src/test/java/org/apache/seatunnel/app/dynamicforms/PlaceholderUtilTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.seatunnel.app.dynamicforms; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| public class PlaceholderUtilTest { | ||
|
|
||
| @Test | ||
| public void testEscapePlaceholders() { | ||
| String input = "This is a test string with ${paramName:defaultValue} and ${paramName}."; | ||
| String expectedOutput = | ||
| "This is a test string with \\${paramName:defaultValue} and \\${paramName}."; | ||
| String actualOutput = PlaceholderUtil.escapePlaceholders(input); | ||
| assertEquals(expectedOutput, actualOutput); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEscapePlaceholdersWithNoPlaceholders() { | ||
| String input = "This is a test string with no placeholders."; | ||
| String expectedOutput = "This is a test string with no placeholders."; | ||
| String actualOutput = PlaceholderUtil.escapePlaceholders(input); | ||
| assertEquals(expectedOutput, actualOutput); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEscapePlaceholdersWithEscapedPlaceholders() { | ||
| String input = "This is a test string with \\${paramName:defaultValue} and \\${paramName}."; | ||
| String expectedOutput = | ||
| "This is a test string with \\${paramName:defaultValue} and \\${paramName}."; | ||
| String actualOutput = PlaceholderUtil.escapePlaceholders(input); | ||
| assertEquals(expectedOutput, actualOutput); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEscapePlaceholdersWithMixedPlaceholders() { | ||
| String input = | ||
| "This is a test string with ${paramName:defaultValue}, \\${paramName}, and ${anotherParam}."; | ||
| String expectedOutput = | ||
| "This is a test string with \\${paramName:defaultValue}, \\${paramName}, and \\${anotherParam}."; | ||
| String actualOutput = PlaceholderUtil.escapePlaceholders(input); | ||
| assertEquals(expectedOutput, actualOutput); | ||
| } | ||
| } |