Skip to content

Do not emit a leading boolean operator for the first enabled filter rule (fixes #76) #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iacsha wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not emit a leading boolean operator for the first enabled filter rule (fixes #76) #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,23 @@ protected static void appendFilterScript(StringBuilder builder, Filter filter) t
builder.append("function doFilter() { phase[0] = 'filter'; return (");

// call each of the above functions in a big boolean expression
boolean firstRule = true;
for (ListIterator<Rule> iter = enabledElements.listIterator(); iter.hasNext();) {
Rule rule = iter.next();
String operator = "";

if (Objects.equals(rule.getOperator(), Rule.Operator.AND)) {
operator = " && ";
} else if (Objects.equals(rule.getOperator(), Rule.Operator.OR)) {
operator = " || ";
// The first enabled rule has nothing to combine with, so its operator is never
// emitted. Otherwise a disabled first step leaves the next enabled rule's AND/OR
// as a leading operator, producing invalid JavaScript (e.g. "return ( && ...)")
// that fails to compile on deploy. See OpenIntegrationEngine/engine#76.
if (!firstRule) {
if (Objects.equals(rule.getOperator(), Rule.Operator.AND)) {
operator = " && ";
} else if (Objects.equals(rule.getOperator(), Rule.Operator.OR)) {
operator = " || ";
}
}
firstRule = false;

builder.append(operator + "(filterRule" + iter.nextIndex() + "() == true)");
}
Expand Down
25 changes: 25 additions & 0 deletions server/src/test/java/com/mirth/connect/server/builders/JavaScriptBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
package com.mirth.connect.server.builders;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -225,4 +227,27 @@ public void testNestedIteratorsOuterDisabled() throws ScriptBuilderException {

assertEquals(scriptEmpty, scriptInnerDisabled);
}

@Test
public void testFilterDisabledFirstRuleNoLeadingOperator() throws ScriptBuilderException {
// A disabled first step followed by an enabled rule whose operator is AND must not emit
// the AND as a leading operator in doFilter(); that would be invalid JavaScript and the
// channel would fail to deploy. See OpenIntegrationEngine/engine#76.
Filter filter = new Filter();
Rule disabledFirst = new RuleBuilderRule();
disabledFirst.setEnabled(false);
Rule enabledWithAnd = new RuleBuilderRule();
enabledWithAnd.setOperator(Rule.Operator.AND);
Rule enabledWithAnd2 = new RuleBuilderRule();
enabledWithAnd2.setOperator(Rule.Operator.AND);
filter.setElements(new ArrayList<>(Arrays.asList(disabledFirst, enabledWithAnd, enabledWithAnd2)));

StringBuilder builder = new StringBuilder();
JavaScriptBuilder.appendFilterScript(builder, filter);
String script = builder.toString();

assertFalse("doFilter() must not start with a leading operator: " + script,
script.contains("return ( &&") || script.contains("return ( ||"));
assertTrue(script.contains("return ((filterRule1() == true)"));
}
}
Loading