Skip to content
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

Jump to bottom

Fix source of sonar scan failure #1075

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Fix source of sonar scan failure #1075

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
39 changes: 24 additions & 15 deletions ...om/synopsys/integration/detectable/detectables/yarn/ExternalIdDependencyGraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class ExternalIdDependencyGraphBuilder extends LazyExternalIdDependencyGraphBuilder {

public LazyDependencyInfo checkAndHandleMissingExternalId(LazyBuilderMissingExternalIdHandler lazyBuilderHandler, LazyId lazyId) throws MissingExternalIdException {
LazyDependencyInfo lazyDependencyInfo = this.infoForId(lazyId);
LazyDependencyInfo lazyDependencyInfo = this.infoForIdCopy(lazyId);
if (lazyDependencyInfo.getExternalId() == null) {
ExternalId handledExternalId = lazyBuilderHandler.handleMissingExternalId(lazyId, lazyDependencyInfo);
if (handledExternalId == null || lazyId == null) {
Expand All @@ -36,7 +36,12 @@ public Set<LazyId> getRootLazyIds() {

private final Map<LazyId, LazyDependencyInfo> dependencyInfo = new HashMap<>();

private LazyDependencyInfo infoForId(LazyId id) {
/**
* This method exactly duplicates the same method (minus -Copy suffix in method signature) from the parent class.
* @param id
* @return
*/
private LazyDependencyInfo infoForIdCopy(LazyId id) {
LazyDependencyInfo info = dependencyInfo.get(id);
if (info.getAliasId() != null) {
info = dependencyInfo.get(info.getAliasId());
Expand All @@ -60,7 +65,7 @@ public BasicDependencyGraph build(LazyBuilderMissingExternalIdHandler lazyBuilde
BasicDependencyGraph mutableDependencyGraph = new BasicDependencyGraph();

for (LazyId lazyId : dependencyInfo.keySet()) {
LazyDependencyInfo lazyDependencyInfo = infoForId(lazyId);
LazyDependencyInfo lazyDependencyInfo = infoForIdCopy(lazyId);
if (lazyDependencyInfo.getExternalId() == null) {
ExternalId handledExternalId = lazyBuilderHandler.handleMissingExternalId(lazyId, lazyDependencyInfo);
if (handledExternalId == null || lazyId == null) {
Expand All @@ -72,11 +77,11 @@ public BasicDependencyGraph build(LazyBuilderMissingExternalIdHandler lazyBuilde
}

for (LazyId lazyId : dependencyInfo.keySet()) {
LazyDependencyInfo lazyDependencyInfo = infoForId(lazyId);
LazyDependencyInfo lazyDependencyInfo = infoForIdCopy(lazyId);
Dependency dependency = new Dependency(lazyDependencyInfo.getName(), lazyDependencyInfo.getVersion(), lazyDependencyInfo.getExternalId(), null);

for (LazyId child : lazyDependencyInfo.getChildren()) {
LazyDependencyInfo childInfo = infoForId(child);
LazyDependencyInfo childInfo = infoForIdCopy(child);
mutableDependencyGraph.addParentWithChild(dependency,
new Dependency(childInfo.getName(), childInfo.getVersion(), childInfo.getExternalId(), null));
}
Expand All @@ -89,21 +94,25 @@ public BasicDependencyGraph build(LazyBuilderMissingExternalIdHandler lazyBuilde
return mutableDependencyGraph;
}

private void ensureDependencyInfoExists(LazyId lazyId) {
/**
* This method exactly duplicates the same method (minus -Copy suffix in method signature) from the parent class.
* @param lazyId
*/
private void ensureDependencyInfoExistsCopy(LazyId lazyId) {
dependencyInfo.computeIfAbsent(lazyId, key -> new LazyDependencyInfo());
}

@Override
public void setDependencyAsAlias(LazyId realLazyId, LazyId fakeLazyId) {
ensureDependencyInfoExists(realLazyId);
ensureDependencyInfoExists(fakeLazyId);
ensureDependencyInfoExistsCopy(realLazyId);
ensureDependencyInfoExistsCopy(fakeLazyId);
LazyDependencyInfo info = dependencyInfo.get(fakeLazyId);
info.setAliasId(realLazyId);
}

@Override
public void setDependencyInfo(LazyId id, String name, String version, ExternalId externalId) {
ensureDependencyInfoExists(id);
ensureDependencyInfoExistsCopy(id);
LazyDependencyInfo info = dependencyInfo.get(id);
info.setName(name);
info.setVersion(version);
Expand All @@ -112,29 +121,29 @@ public void setDependencyInfo(LazyId id, String name, String version, ExternalId

@Override
public void setDependencyName(LazyId id, String name) {
ensureDependencyInfoExists(id);
ensureDependencyInfoExistsCopy(id);
LazyDependencyInfo info = dependencyInfo.get(id);
info.setName(name);
}

@Override
public void setDependencyVersion(LazyId id, String version) {
ensureDependencyInfoExists(id);
ensureDependencyInfoExistsCopy(id);
LazyDependencyInfo info = dependencyInfo.get(id);
info.setVersion(version);
}

@Override
public void setDependencyExternalId(LazyId id, ExternalId externalId) {
ensureDependencyInfoExists(id);
ensureDependencyInfoExistsCopy(id);
LazyDependencyInfo info = dependencyInfo.get(id);
info.setExternalId(externalId);
}

@Override
public void addParentWithChild(LazyId parent, LazyId child) {
ensureDependencyInfoExists(child);
ensureDependencyInfoExists(parent);
ensureDependencyInfoExistsCopy(child);
ensureDependencyInfoExistsCopy(parent);
dependencyInfo.get(parent).getChildren().add(child);

}
Expand Down Expand Up @@ -188,7 +197,7 @@ public void addChildWithParents(LazyId child, LazyId... parents) {

@Override
public void addChildToRoot(LazyId child) {
ensureDependencyInfoExists(child);
ensureDependencyInfoExistsCopy(child);
rootLazyIds.add(child);
}

Expand Down