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

[MSHARED-1410] Track used declared dependency usage by referencing classes #126

Merged
merged 1 commit into from
Sep 30, 2024
Merged

[MSHARED-1410] Track used declared dependency usage by referencing classes #126

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions ...in/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
Set<Artifact> usedDeclaredArtifacts = new LinkedHashSet<>(declaredArtifacts);
usedDeclaredArtifacts.retainAll(usedArtifacts.keySet());

Map<Artifact, Set<DependencyUsage>> usedDeclaredArtifactsWithClasses = new LinkedHashMap<>();
for (Artifact a : usedDeclaredArtifacts) {
usedDeclaredArtifactsWithClasses.put(a, usedArtifacts.get(a));
}

Map<Artifact, Set<DependencyUsage>> usedUndeclaredArtifactsWithClasses = new LinkedHashMap<>(usedArtifacts);
Set<Artifact> usedUndeclaredArtifacts =
removeAll(usedUndeclaredArtifactsWithClasses.keySet(), declaredArtifacts);
Expand All @@ -102,7 +107,7 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
Set<Artifact> testArtifactsWithNonTestScope = getTestArtifactsWithNonTestScope(testOnlyArtifacts);

return new ProjectDependencyAnalysis(
usedDeclaredArtifacts, usedUndeclaredArtifactsWithClasses,
usedDeclaredArtifactsWithClasses, usedUndeclaredArtifactsWithClasses,
unusedDeclaredArtifacts, testArtifactsWithNonTestScope);
} catch (IOException exception) {
throw new ProjectDependencyAnalyzerException("Cannot analyze dependencies", exception);
Expand Down Expand Up @@ -150,7 +155,7 @@ private static Set<Artifact> getTestArtifactsWithNonTestScope(Set<Artifact> test
return nonTestScopeArtifacts;
}

private Map<Artifact, Set<String>> buildArtifactClassMap(MavenProject project, ClassesPatterns excludedClasses)
protected Map<Artifact, Set<String>> buildArtifactClassMap(MavenProject project, ClassesPatterns excludedClasses)
slawekjaranowski marked this conversation as resolved.
Show resolved Hide resolved
throws IOException {
Map<Artifact, Set<String>> artifactClassMap = new LinkedHashMap<>();

Expand Down
29 changes: 21 additions & 8 deletions src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
Expand All @@ -38,7 +39,7 @@
public class ProjectDependencyAnalysis {
// fields -----------------------------------------------------------------

private final Set<Artifact> usedDeclaredArtifacts;
private final Map<Artifact, Set<DependencyUsage>> usedDeclaredArtifacts;

private final Map<Artifact, Set<DependencyUsage>> usedUndeclaredArtifacts;

Expand Down Expand Up @@ -81,14 +82,14 @@ public ProjectDependencyAnalysis(
Set<Artifact> unusedDeclaredArtifacts,
Set<Artifact> testArtifactsWithNonTestScope) {
this(
usedDeclaredArtifacts,
mapWithKeys(usedDeclaredArtifacts),
mapWithKeys(usedUndeclaredArtifacts),
unusedDeclaredArtifacts,
testArtifactsWithNonTestScope);
}

public ProjectDependencyAnalysis(
Set<Artifact> usedDeclaredArtifacts,
Map<Artifact, Set<DependencyUsage>> usedDeclaredArtifacts,
Map<Artifact, Set<DependencyUsage>> usedUndeclaredArtifacts,
Set<Artifact> unusedDeclaredArtifacts,
Set<Artifact> testArtifactsWithNonTestScope) {
Expand All @@ -104,6 +105,15 @@ public ProjectDependencyAnalysis(
* @return artifacts both used and declared
*/
public Set<Artifact> getUsedDeclaredArtifacts() {
return safeCopy(usedDeclaredArtifacts.keySet());
}

/**
* Returns artifacts both used and declared.
*
* @return artifacts both used and declared
*/
public Map<Artifact, Set<DependencyUsage>> getUsedDeclaredArtifactsWithUsages() {
return safeCopy(usedDeclaredArtifacts);
}

Expand Down Expand Up @@ -188,7 +198,7 @@ public ProjectDependencyAnalysis forceDeclaredDependenciesUsage(String[] forceUs
Set<String> forced = new HashSet<>(Arrays.asList(forceUsedDependencies));

Set<Artifact> forcedUnusedDeclared = new HashSet<>(unusedDeclaredArtifacts);
Set<Artifact> forcedUsedDeclared = new HashSet<>(usedDeclaredArtifacts);
Set<Artifact> forcedUsedDeclared = new HashSet<>(usedDeclaredArtifacts.keySet());

Iterator<Artifact> iter = forcedUnusedDeclared.iterator();
while (iter.hasNext()) {
Expand All @@ -204,7 +214,7 @@ public ProjectDependencyAnalysis forceDeclaredDependenciesUsage(String[] forceUs
if (!forced.isEmpty()) {
// trying to force dependencies as used-declared which were not declared or already detected as used
Set<String> used = new HashSet<>();
for (Artifact artifact : usedDeclaredArtifacts) {
for (Artifact artifact : usedDeclaredArtifacts.keySet()) {
String id = artifact.getGroupId() + ':' + artifact.getArtifactId();
if (forced.remove(id)) {
used.add(id);
Expand All @@ -225,7 +235,10 @@ public ProjectDependencyAnalysis forceDeclaredDependenciesUsage(String[] forceUs
}

return new ProjectDependencyAnalysis(
forcedUsedDeclared, usedUndeclaredArtifacts, forcedUnusedDeclared, testArtifactsWithNonTestScope);
mapWithKeys(forcedUsedDeclared),
usedUndeclaredArtifacts,
forcedUnusedDeclared,
testArtifactsWithNonTestScope);
}

/**
Expand Down Expand Up @@ -314,7 +327,7 @@ private static Map<Artifact, Set<DependencyUsage>> safeCopy(Map<Artifact, Set<De
return Collections.emptyMap();
}

Map<Artifact, Set<DependencyUsage>> map = new HashMap<>();
Map<Artifact, Set<DependencyUsage>> map = new LinkedHashMap<>();

for (Map.Entry<Artifact, Set<DependencyUsage>> e : origMap.entrySet()) {
map.put(e.getKey(), Collections.unmodifiableSet(new LinkedHashSet<>(e.getValue())));
Expand All @@ -328,7 +341,7 @@ private static Map<Artifact, Set<DependencyUsage>> mapWithKeys(Set<Artifact> key
return Collections.emptyMap();
}

Map<Artifact, Set<DependencyUsage>> map = new HashMap<>();
Map<Artifact, Set<DependencyUsage>> map = new LinkedHashMap<>();

for (Artifact k : keys) {
map.put(k, Collections.<DependencyUsage>emptySet());
Expand Down