Stowage/dependency-track
2
0
Fork 0
mirror of https://github.com/DependencyTrack/dependency-track.git synced 2025-10-19 16:03:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: extract common part from if on filter field

Browse source 
Signed-off-by: Pinto Spindler, Stephan <25225092+s-spindler@users.noreply.github.com>
This commit is contained in:
Pinto Spindler, Stephan 2022-07-15 22:51:33 +02:00
parent 325be1728e
commit 4f5a8fe3f1
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java
View file

@ -97,8 +97,6 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
}
params.put("name", filterString);
params.put("tag", tag);
preprocessACLs(query, queryFilter, params, false);
result = execute(query, params);
} else {
if (excludeInactive) {
queryFilter = "(name.toLowerCase().matches(:name) && (active == true || active == null))";
@ -106,16 +104,14 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
queryFilter = "(name.toLowerCase().matches(:name))";
}
params.put("name", filterString);
preprocessACLs(query, queryFilter, params, false);
result = execute(query, params);
}
} else {
if (excludeInactive) {
queryFilter = " (active == true || active == null) ";
}
preprocessACLs(query, queryFilter, params, false);
result = execute(query, params);
}
preprocessACLs(query, queryFilter, params, false);
result = execute(query, params);
if (includeMetrics) {
// Populate each Project object in the paginated result with transitive related
// data to minimize the number of round trips a client needs to make, process, and render.