Kie issues#1448 - matches() function wrongly behaves - negation syntax translation #6083
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,8 +38,18 @@ | |
| <java.module.name>org.kie.dmn.feel</java.module.name> | ||
| <surefire.forkCount>2</surefire.forkCount> | ||
| <enforcer.skip>true</enforcer.skip> | ||
| <version.net.sf.saxon.Saxon-HE>12.5</version.net.sf.saxon.Saxon-HE> | ||
| </properties> | ||
|
|
||
| <dependencyManagement> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>net.sf.saxon</groupId> | ||
| <artifactId>Saxon-HE</artifactId> | ||
| <version>${version.net.sf.saxon.Saxon-HE}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </dependencyManagement> | ||
| <dependencies> | ||
| <!-- Internal dependencies --> | ||
| <dependency> | ||
|
|
@@ -52,6 +62,10 @@ | |
| </dependency> | ||
|
|
||
| <!-- External dependencies --> | ||
| <dependency> | ||
| <groupId>net.sf.saxon</groupId> | ||
| <artifactId>Saxon-HE</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.antlr</groupId> | ||
| <artifactId>antlr4-runtime</artifactId> | ||
|
|
@@ -135,6 +149,10 @@ | |
| <groupId>com.fasterxml.jackson.core</groupId> | ||
| <artifactId>jackson-databind</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.poi</groupId> | ||
| <artifactId>poi</artifactId> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
|
|
@@ -144,7 +162,7 @@ | |
| <directory>${project.basedir}/src/test/resources</directory> | ||
| </testResource> | ||
| <testResource> | ||
| <directory>${project.basedir}/../</directory> | ||
|
There was a problem hiding this comment. @bncriju I guess this change is not required |
||
| <includes> | ||
| <include>ref-dmn-feel-builtin-functions.adoc</include> | ||
| </includes> | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -19,14 +19,11 @@ | |
| package org.kie.dmn.feel.runtime.functions; | ||
|
|
||
| import java.security.InvalidParameterException; | ||
| import java.util.regex.PatternSyntaxException; | ||
|
|
||
| import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity; | ||
| import org.kie.dmn.feel.runtime.events.InvalidParametersEvent; | ||
| import org.kie.dmn.feel.util.XQueryImplUtil; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
|
|
@@ -39,21 +36,24 @@ private MatchesFunction() { | |
| super( "matches" ); | ||
| } | ||
|
|
||
| public FEELFnResult<Boolean> FEELFnResult(@ParameterName("input") String input, @ParameterName("pattern") String pattern) { | ||
|
There was a problem hiding this comment. @bncriju Wrong method name |
||
| return invoke( input, pattern, null ); | ||
| } | ||
|
|
||
| public FEELFnResult<Boolean> invoke(@ParameterName("input") String input, @ParameterName("pattern") String pattern, @ParameterName("flags") String flags) { | ||
| try { | ||
| return matchFunctionWithFlags(input,pattern,flags); | ||
| } catch (InvalidParameterException t ) { | ||
| return FEELFnResult.ofError( new InvalidParametersEvent( Severity.ERROR, t.getMessage(), "cannot be null or is invalid", t ) ); | ||
| } catch (Throwable t) { | ||
| String errorMessage; | ||
| if (t.getMessage() != null && !t.getMessage().isEmpty()) { | ||
| errorMessage = "Error: " + t.getMessage(); | ||
| } else { | ||
| errorMessage = String.format("Some of the provided parameters might be invalid. Input: '%s', Pattern: '%s', Flags: '%s'", | ||
| input, pattern, flags); | ||
| } | ||
| return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, errorMessage, t)); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -65,37 +65,6 @@ static FEELFnResult<Boolean> matchFunctionWithFlags(String input, String pattern | |
| if ( pattern == null ) { | ||
| throw new InvalidParameterException("pattern"); | ||
| } | ||
| return FEELFnResult.ofResult(XQueryImplUtil.executeMatchesFunction(input, pattern, flags)); | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /** | ||
| * 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.kie.dmn.feel.util; | ||
|
|
||
| import net.sf.saxon.s9api.*; | ||
|
|
||
| public class XQueryImplUtil { | ||
|
|
||
| public static Boolean executeMatchesFunction(String input, String pattern, String flags){ | ||
| flags = flags == null ? "" : flags; | ||
| String xQueryExpression = String.format("matches('%s', '%s', '%s')", input, pattern, flags); | ||
| return evaluateXQueryExpression(xQueryExpression, Boolean.class); | ||
| } | ||
|
|
||
| public static String executeReplaceFunction(String input, String pattern, String replacement, String flags) { | ||
| flags = flags == null ? "" : flags; | ||
| String xQueryExpression = String.format("replace('%s', '%s', '%s', '%s')", input, pattern, replacement, flags); | ||
| return evaluateXQueryExpression(xQueryExpression, String.class); | ||
| } | ||
|
|
||
| static <T> T evaluateXQueryExpression (String expression, Class<T> expectedTypeResult) { | ||
| try { | ||
| Processor processor = new Processor(false); | ||
| XQueryCompiler compiler = processor.newXQueryCompiler(); | ||
| XQueryExecutable executable = compiler.compile(expression); | ||
| XQueryEvaluator queryEvaluator = executable.load(); | ||
| XdmItem resultItem = queryEvaluator.evaluateSingle(); | ||
| return expectedTypeResult.cast((((XdmAtomicValue) resultItem).getValue())); | ||
| } catch (ClassCastException | SaxonApiException e) { | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /** | ||
| * 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.kie.dmn.feel.util; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
|
|
||
| public class XQueryImplUtilTest { | ||
|
|
||
| @Test | ||
| void executeMatchesFunctionTest() { | ||
| String input = "test"; | ||
| String pattern = "^test"; | ||
| String flags = "i"; | ||
| boolean retrieved = XQueryImplUtil.executeMatchesFunction(input, pattern, | ||
| flags); | ||
| boolean expected = true; | ||
| assertThat(retrieved).isNotNull().isEqualTo(expected); | ||
|
There was a problem hiding this comment. One general comment. Do not reuse variables. Either separate the tests or make a parametric test. a test should be quite simple and very easy to read. |
||
|
|
||
| input = "fo\nbar"; | ||
| pattern = "o.b"; | ||
| flags = null; | ||
| retrieved = XQueryImplUtil.executeMatchesFunction(input, pattern, flags); | ||
| expected = false; | ||
| assertThat(retrieved).isNotNull().isEqualTo(expected); | ||
|
|
||
| input = "TEST"; | ||
| pattern = "test"; | ||
| flags = "i"; | ||
| retrieved = XQueryImplUtil.executeMatchesFunction(input, pattern, flags); | ||
| expected = true; | ||
| assertThat(retrieved).isNotNull().isEqualTo(expected); | ||
| } | ||
|
|
||
| @Test | ||
| void executeMatchesFunctionInvokingException(){ | ||
| String input = "test"; | ||
| String pattern = "^test"; | ||
| String flags = "g"; | ||
| assertThatThrownBy(() -> XQueryImplUtil.executeMatchesFunction(input, pattern, | ||
| flags)).isInstanceOf(IllegalStateException.class).hasMessageContaining("Unrecognized flag"); | ||
| } | ||
|
|
||
| @Test | ||
| void executeReplaceFunctionTest() { | ||
| String input = "testString"; | ||
| String pattern = "^test"; | ||
| String replacement = "ttt"; | ||
| String flags = ""; | ||
| String retrieved = XQueryImplUtil.executeReplaceFunction(input, pattern, replacement, | ||
| flags).toString(); | ||
| String expected = "tttString"; | ||
| assertThat(retrieved).isNotNull().isEqualTo(expected); | ||
|
|
||
| input = "fo\nbar"; | ||
| pattern = "o.b"; | ||
| replacement = "ttt"; | ||
| flags = "s"; | ||
| retrieved = XQueryImplUtil.executeReplaceFunction(input, pattern, replacement, flags).toString(); | ||
| expected = "ftttar"; | ||
| assertThat(retrieved).isNotNull().isEqualTo(expected); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bncriju I guess this is not required