Skip to content

Fixing nested configure #16

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

Merged
merged 1 commit into from
Feb 27, 2018
Merged

Fixing nested configure #16

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
1 change: 0 additions & 1 deletion src/main/java/com/yahoo/bullet/parsing/FilterClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public FilterClause() {
operation = null;
}


@Override
public void configure(BulletConfig configuration) {
if (operation == REGEX_LIKE) {
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/yahoo/bullet/parsing/LogicalClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package com.yahoo.bullet.parsing;

import com.google.gson.annotations.Expose;
import com.yahoo.bullet.common.BulletConfig;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -24,6 +25,13 @@ public LogicalClause() {
clauses = null;
}

@Override
public void configure(BulletConfig configuration) {
if (clauses != null) {
clauses.forEach(clause -> clause.configure(configuration));
}
}

@Override
public String toString() {
return "{" + super.toString() + ", " + "clauses: " + clauses + "}";
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/com/yahoo/bullet/parsing/LogicalClauseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
package com.yahoo.bullet.parsing;

import com.yahoo.bullet.common.BulletConfig;
import com.yahoo.bullet.common.BulletError;
import org.testng.Assert;
import org.testng.annotations.Test;
Expand All @@ -16,6 +17,7 @@
import static com.yahoo.bullet.parsing.Clause.Operation.EQUALS;
import static com.yahoo.bullet.parsing.Clause.Operation.NOT;
import static com.yahoo.bullet.parsing.Clause.Operation.OR;
import static com.yahoo.bullet.parsing.Clause.Operation.REGEX_LIKE;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand All @@ -28,6 +30,21 @@ public void testDefaults() {
Assert.assertNull(logicalClause.getClauses());
}

@Test
public void testConfigure() {
LogicalClause logicalClause = new LogicalClause();
logicalClause.setOperation(AND);
FilterClause filterClause = new FilterClause();
filterClause.setField("id");
filterClause.setOperation(REGEX_LIKE);
filterClause.setValues(singletonList("f.*"));
logicalClause.setClauses(singletonList(filterClause));

Assert.assertNull(filterClause.getPatterns());
logicalClause.configure(new BulletConfig());
Assert.assertNotNull(filterClause.getPatterns());
}

@Test
public void testToString() {
LogicalClause logicalClause = new LogicalClause();
Expand Down