-
Notifications
You must be signed in to change notification settings - Fork 6.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the SonarCloud issue in EspressoInlineExpressionParser
- Loading branch information
1 parent
cf2ec23
commit 176eb69
Showing
6 changed files
with
136 additions
and
90 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md
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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| +++ | ||
| title = "行表达式" | ||
| weight = 8 | ||
| weight = 10 | ||
| +++ | ||
|
|
||
| ## 使用 Groovy 语法的行表达式 | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md
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
87 changes: 87 additions & 0 deletions
87
infra/util/src/main/java/org/apache/shardingsphere/infra/util/groovy/GroovyUtils.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,87 @@ | ||
| /* | ||
| * 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.shardingsphere.infra.util.groovy; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * GroovyShell expression common utils. It mainly serves the use of the following classes. | ||
| * - `org.apache.shardingsphere.infra.expr.espresso.EspressoInlineExpressionParser` | ||
| * - `org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser` | ||
| */ | ||
| public class GroovyUtils { | ||
|
|
||
| /** | ||
| * Split GroovyShell expression to a ArrayList. | ||
| * | ||
| * @return result ArrayList of GroovyShell expression with {@code $}. | ||
| */ | ||
| public static List<String> split(final String inlineExpression) { | ||
| List<String> result = new ArrayList<>(); | ||
| StringBuilder segment = new StringBuilder(); | ||
| int bracketsDepth = 0; | ||
| for (int i = 0; i < inlineExpression.length(); i++) { | ||
| char each = inlineExpression.charAt(i); | ||
| switch (each) { | ||
| case ',': | ||
| handleSplitter(bracketsDepth, segment, each, result); | ||
| break; | ||
| case '$': | ||
| bracketsDepth = handleDollarSign(inlineExpression, i, bracketsDepth, segment, each); | ||
| break; | ||
| case '}': | ||
| bracketsDepth = handleClosingBracket(bracketsDepth, segment, each); | ||
| break; | ||
| default: | ||
| segment.append(each); | ||
| break; | ||
| } | ||
| } | ||
| if (segment.length() > 0) { | ||
| result.add(segment.toString().trim()); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| private static void handleSplitter(final int bracketsDepth, final StringBuilder segment, final char each, final List<String> result) { | ||
| if (bracketsDepth > 0) { | ||
| segment.append(each); | ||
| } else { | ||
| result.add(segment.toString().trim()); | ||
| segment.setLength(0); | ||
| } | ||
| } | ||
|
|
||
| private static int handleDollarSign(final String inlineExpression, final int i, final int bracketsDepth, final StringBuilder segment, final char each) { | ||
| int bracketsDepthResult = bracketsDepth; | ||
| if ('{' == inlineExpression.charAt(i + 1)) { | ||
| bracketsDepthResult = bracketsDepthResult + 1; | ||
| } | ||
| if ("->{".equals(inlineExpression.substring(i + 1, i + 4))) { | ||
| bracketsDepthResult = bracketsDepthResult + 1; | ||
| } | ||
| segment.append(each); | ||
| return bracketsDepthResult; | ||
| } | ||
|
|
||
| private static int handleClosingBracket(final int bracketsDepth, final StringBuilder segment, final char each) { | ||
| segment.append(each); | ||
| return bracketsDepth > 0 ? bracketsDepth - 1 : bracketsDepth; | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
infra/util/src/test/java/org/apache/shardingsphere/infra/util/groovy/GroovyUtilsTest.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,43 @@ | ||
| /* | ||
| * 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.shardingsphere.infra.util.groovy; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
|
|
||
| class GroovyUtilsTest { | ||
|
|
||
| @Test | ||
| void assertSplit() { | ||
| assertThat(GroovyUtils.split(" t_order_0, t_order_1 "), is(Arrays.asList("t_order_0", "t_order_1"))); | ||
| assertThat(GroovyUtils.split("t_order_${null}"), is(Collections.singletonList("t_order_${null}"))); | ||
| assertThat(GroovyUtils.split("t_order_${'xx'}"), is(Collections.singletonList("t_order_${'xx'}"))); | ||
| assertThat(GroovyUtils.split("t_order_${[0, 1, 2]},t_order_item_${[0, 2]}"), | ||
| is(Arrays.asList("t_order_${[0, 1, 2]}", "t_order_item_${[0, 2]}"))); | ||
| assertThat(GroovyUtils.split("t_order_${0..2},t_order_item_${0..1}"), is(Arrays.asList("t_order_${0..2}", "t_order_item_${0..1}"))); | ||
| assertThat(GroovyUtils.split("t_${[\"new${1+2}\",'old']}_order_${1..2}"), | ||
| is(Collections.singletonList("t_${[\"new${1+2}\",'old']}_order_${1..2}"))); | ||
| assertThat(GroovyUtils.split("t_$->{[\"new$->{1+2}\",'old']}_order_$->{1..2}"), | ||
| is(Collections.singletonList("t_$->{[\"new$->{1+2}\",'old']}_order_$->{1..2}"))); | ||
| } | ||
| } |