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

Improvements to backend methods

Browse source 
- Removed redundant if-clause in `excludeProjectsThatAreChildren()` and
adjusted if-clauses in the case of only showing root projects in
`ProjectQueryManager.java`

- Added logger errors in `ProjectResource.java`

Signed-off-by: RBickert <rbt@mm-software.com>
This commit is contained in:
rbt-mm 2022-10-04 09:59:42 +02:00 • committed by RBickert
parent 538bdb1116
commit 2610187937
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,10 +86,10 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
}
var filterBuilder = new ProjectQueryFilterBuilder()
.excludeInactive(excludeInactive)
.excludeProjectsThatAreChildren(onlyRoot);
.excludeInactive(excludeInactive);
if (onlyRoot){
filterBuilder.excludeProjectsThatAreChildren();
pm.getFetchPlan().addGroup(Project.FetchGroup.ALL.name());
}
@ -172,10 +172,10 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
final var filterBuilder = new ProjectQueryFilterBuilder()
.excludeInactive(excludeInactive)
.withName(name)
.excludeProjectsThatAreChildren(onlyRoot);
.withName(name);
if (onlyRoot){
filterBuilder.excludeProjectsThatAreChildren();
pm.getFetchPlan().addGroup(Project.FetchGroup.ALL.name());
}
@ -221,10 +221,10 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
final var filterBuilder = new ProjectQueryFilterBuilder()
.excludeInactive(excludeInactive)
.withTeam(team)
.excludeProjectsThatAreChildren(onlyRoot);
.withTeam(team);
if (onlyRoot){
filterBuilder.excludeProjectsThatAreChildren();
pm.getFetchPlan().addGroup(Project.FetchGroup.ALL.name());
}
@ -249,10 +249,10 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
var filterBuilder = new ProjectQueryFilterBuilder()
.excludeInactive(excludeInactive)
.withTag(tag)
.excludeProjectsThatAreChildren(onlyRoot);
.withTag(tag);
if (onlyRoot){
filterBuilder.excludeProjectsThatAreChildren();
pm.getFetchPlan().addGroup(Project.FetchGroup.ALL.name());
}
@ -290,10 +290,10 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
final var filterBuilder = new ProjectQueryFilterBuilder()
.excludeInactive(excludeInactive)
.withClassifier(classifier)
.excludeProjectsThatAreChildren(onlyRoot);
.withClassifier(classifier);
if (onlyRoot){
filterBuilder.excludeProjectsThatAreChildren();
pm.getFetchPlan().addGroup(Project.FetchGroup.ALL.name());
}
@ -416,9 +416,8 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
if (parent != null ) {
if (!Boolean.TRUE.equals(parent.isActive())){
throw new IllegalArgumentException("An inactive Parent cannot be selected as parent");
}else {
project.setParent(parent);
}
project.setParent(parent);
}
project.setPurl(purl);
project.setActive(active);
@ -473,6 +472,7 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
} else {
project.setActive(active);
}
project.setActive(active);
final List<Tag> resolvedTags = resolveTags(tags);
bind(project, resolvedTags);
@ -507,6 +507,7 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
} else {
project.setActive(transientProject.isActive());
}
project.setActive(transientProject.isActive());
if (transientProject.getParent() != null && transientProject.getParent().getUuid() != null) {
if (project.getUuid().equals(transientProject.getParent().getUuid())){
@ -520,6 +521,7 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
} else {
project.setParent(parent);
}
project.setParent(parent);
}else {
project.setParent(null);
}