archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 09:04:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8241187: ToolBox::grep should allow for negative filtering

Browse source 
Reviewed-by: vromero
This commit is contained in:
Guoxiong Li 2021-05-12 01:01:29 +00:00 • committed by Jonathan Gibbons
parent cc03734b99
commit ed32e02c05
2 changed files with 104 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
test/langtools/tools/lib/toolbox/ToolBox.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -164,24 +164,50 @@ public class ToolBox {
}
/**
* Filters a list of strings according to the given regular expression.
* Filters a list of strings according to the given regular expression,
* returning the strings that match the regular expression.
* @param regex the regular expression
* @param lines the strings to be filtered
* @return the strings matching the regular expression
*/
public List<String> grep(String regex, List<String> lines) {
return grep(Pattern.compile(regex), lines);
return grep(Pattern.compile(regex), lines, true);
}
/**
* Filters a list of strings according to the given regular expression.
* Filters a list of strings according to the given regular expression,
* returning the strings that match the regular expression.
* @param pattern the regular expression
* @param lines the strings to be filtered
* @return the strings matching the regular expression
*/
public List<String> grep(Pattern pattern, List<String> lines) {
return grep(pattern, lines, true);
}
/**
* Filters a list of strings according to the given regular expression,
* returning either the strings that match or the strings that do not match.
* @param regex the regular expression
* @param lines the strings to be filtered
* @param match if true, return the lines that match; otherwise if false, return the lines that do not match.
* @return the strings matching(or not matching) the regular expression
*/
public List<String> grep(String regex, List<String> lines, boolean match) {
return grep(Pattern.compile(regex), lines, match);
}
/**
* Filters a list of strings according to the given regular expression,
* returning either the strings that match or the strings that do not match.
* @param pattern the regular expression
* @param lines the strings to be filtered
* @param match if true, return the lines that match; otherwise if false, return the lines that do not match.
* @return the strings matching(or not matching) the regular expression
*/
public List<String> grep(Pattern pattern, List<String> lines, boolean match) {
return lines.stream()
.filter(s -> pattern.matcher(s).find())
.filter(s -> pattern.matcher(s).find() == match)
.collect(Collectors.toList());
}