Skip to content

Automated cherry pick of #75: filter notmatch #78

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
Nov 17, 2021
Merged

Automated cherry pick of #75: filter notmatch #78

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
2 changes: 2 additions & 0 deletions ...me/src/main/java/cloud/erda/analyzer/runtime/expression/filters/FilterOperatorDefine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,7 @@ public class FilterOperatorDefine {

public static final String NotMatch = "notMatch";

public static final String All = "all";

public static final String Default = False;
}
2 changes: 2 additions & 0 deletions ...e/src/main/java/cloud/erda/analyzer/runtime/expression/filters/FilterOperatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public static FilterOperator create(ExpressionFilter filter, ExpressionMetadata
return LikeFilterOperator.instance;
case FilterOperatorDefine.Any:
return AnyFilterOperator.instance;
case FilterOperatorDefine.All:
return AnyFilterOperator.instance;
case FilterOperatorDefine.Null:
return NullFilterOperator.instance;
case FilterOperatorDefine.In:
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/cloud/erda/analyzer/runtime/expression/filters/NotMatchFilterOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public boolean invoke(ExpressionFilter filter, Object value) {
return false;
}
String regex = String.valueOf(filter.getValue()).replace("*", ".*").replace("?", ".?");
return String.valueOf(value).matches(regex);
return !String.valueOf(value).matches(regex);
}

public static final FilterOperator INSTANCE = new MatchFilterOperator();
Expand Down