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

Sonar cloud fixes for 9.5 #1077

Merged
merged 5 commits into from
Mar 21, 2024
Merged

Sonar cloud fixes for 9.5 #1077

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
640a917
Fix sonar cloud complaint about using static access for parent class
shantyk Mar 21, 2024
5ef3911
Attempt at refactoring to reduce method complexity complaint by sonar
shantyk Mar 21, 2024
066eedf
Update method name as per Dev's suggestion
shantyk Mar 21, 2024
bcc98a1
Attempt at reducing method complexity from 22 to 17
shantyk Mar 21, 2024
711a730
Reduce method complexity from 17 to less than 15 to resolve sonar clo…
shantyk Mar 21, 2024
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
4 changes: 4 additions & 0 deletions .../com/synopsys/integration/detectable/detectables/maven/cli/MavenCodeLocationPackager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@ private void populateGraphDependencies(ExcludedIncludedWildcardFilter scopeFilte
dependencyParentStack.push(dependency);
}
}
shadedDependenciesStuff(dependency);
}

private void shadedDependenciesStuff(ScopedDependency dependency) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simply moved the last chunk of code that was added in the commit form yesterday @devmehtasynopsys, this does resolve the complaint. If you're okay with this and don't believe this will cause any issues I don't see, please suggest a more appropriate method name (I lack context for these changes).

Sonar issue: https://sonarcloud.io/project/issues?impactSeverities=HIGH&resolved=false&severities=CRITICAL&id=com.synopsys.integration%3Asynopsys-detect&open=AY5erg-0_RLhWwYvLB2A

Copy link
Contributor

@devmehtabd devmehtabd Mar 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this would be okay to do and it won't cause any issues. The appropriate method name for this would addShadedDependenciesToGraph, as we are adding them to the graph.

if(!shadedDependenciesConverted.isEmpty() && shadedDependenciesConverted.containsKey(dependency.getExternalId())) {
for(Dependency childDependency: shadedDependenciesConverted.get(dependency.getExternalId())) {
currentGraph.addParentWithChild(dependency, childDependency);
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/com/synopsys/integration/detectable/detectables/yarn/YarnTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private DependencyGraph buildGraphForProject(
if (shouldInclude(entryName, entry.getVersion())) {
LazyId id = generateComponentDependencyId(entryName, entry.getVersion());
graphBuilder.setDependencyInfo(id, entryName, entry.getVersion(), generateComponentExternalId(entryName, entry.getVersion()));
ExternalIdDependencyGraphBuilder.LazyDependencyInfo parentInfo = graphBuilder.checkAndHandleMissingExternalId(lazyBuilderHandler, id);
LazyExternalIdDependencyGraphBuilder.LazyDependencyInfo parentInfo = graphBuilder.checkAndHandleMissingExternalId(lazyBuilderHandler, id);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related sonar cloud failure: https://sonarcloud.io/project/issues?open=AY3s6h72MlpV5xQqWqXG&id=com.synopsys.integration%3Asynopsys-detect

Dependency parent = new Dependency(parentInfo.getName(), parentInfo.getVersion(), parentInfo.getExternalId(), null);
mutableDependencyGraph.addDirectDependency(parent);
collectYarnDependencies(lazyBuilderHandler, graphBuilder, mutableDependencyGraph, yarnLockResult, entry, resolvedEntryIdVersionMap, parent);
Expand Down