Skip to content

Commit

Permalink
improve list of dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@evernat
evernat committed Sep 11, 2019
1 parent 64c67b9 commit 373b2a1
Showing 1 changed file with 57 additions and 18 deletions.
75 changes: 57 additions & 18 deletions javamelody-core/src/main/java/net/bull/javamelody/internal/model/MavenArtifact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ public final class MavenArtifact implements Serializable {
private String version;
private MavenArtifact parent;
private final Map<String, String> licenseUrlsByName = new LinkedHashMap<String, String>();
private Map<String, String> properties;
private final List<MavenArtifact> dependencies = new ArrayList<MavenArtifact>();
private final List<MavenArtifact> managedDependencies = new ArrayList<MavenArtifact>();
private boolean updated;

private MavenArtifact() {
Expand All @@ -102,10 +104,26 @@ private void parsePomXml(InputStream pomXml) throws IOException {
final Document doc = dBuilder.parse(pomXml);
final Node projectNode = doc.getElementsByTagName("project").item(0);
final NodeList childNodes = projectNode.getChildNodes();
properties = new HashMap<String, String>();
for (int i = 0; i < childNodes.getLength(); i++) {
final Node node = childNodes.item(i);
parseNode(node);
}
properties.put("project.groupId", groupId);
properties.put("pom.groupId", groupId);
properties.put("groupId", groupId);
properties.put("project.version", version);
properties.put("pom.version", version);
properties.put("version", version);
for (final MavenArtifact dependency : dependencies) {
dependency.groupId = replaceProperty(dependency.groupId, properties);
dependency.version = replaceProperty(dependency.version, properties);
}
for (final MavenArtifact dependency : managedDependencies) {
dependency.groupId = replaceProperty(dependency.groupId, properties);
dependency.version = replaceProperty(dependency.version, properties);
}
properties = null;
} catch (final ParserConfigurationException e) {
throw new IOException(e.getMessage(), e);
} catch (final SAXException e) {
Expand All @@ -117,7 +135,6 @@ private void parsePomXml(InputStream pomXml) throws IOException {
// CHECKSTYLE:OFF
private void parseNode(Node node) {
// CHECKSTYLE:ON
final Map<String, String> properties = new HashMap<String, String>();
final String nodeName = node.getNodeName();
if ("name".equals(nodeName)) {
this.name = node.getTextContent();
Expand All @@ -138,18 +155,15 @@ private void parseNode(Node node) {
} else if ("licenses".equals(nodeName)) {
parseLicensesNode(node);
} else if ("dependencies".equals(nodeName)) {
parseDependenciesNode(node);
// note: dependencyManagement is currently ignored
}
properties.put("project.groupId", groupId);
properties.put("pom.groupId", groupId);
properties.put("groupId", groupId);
properties.put("project.version", version);
properties.put("pom.version", version);
properties.put("version", version);
for (final MavenArtifact dependency : dependencies) {
dependency.groupId = replaceProperty(dependency.groupId, properties);
dependency.version = replaceProperty(dependency.version, properties);
this.dependencies.addAll(parseDependenciesNode(node));
} else if ("dependencyManagement".equals(nodeName)) {
final NodeList childNodes = node.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
final Node childNode = childNodes.item(i);
if ("dependencies".equals(childNode.getNodeName())) {
this.managedDependencies.addAll(parseDependenciesNode(childNode));
}
}
}
}

Expand Down Expand Up @@ -182,16 +196,16 @@ private void parseParentNode(Node node) {
}

private Map<String, String> parsePropertiesNode(Node propertiesNode) {
final Map<String, String> properties = new HashMap<String, String>();
final Map<String, String> props = new HashMap<String, String>();
final NodeList propertiesNodes = propertiesNode.getChildNodes();
for (int j = 0; j < propertiesNodes.getLength(); j++) {
final Node propertyNode = propertiesNodes.item(j);
final String nodeName = propertyNode.getNodeName();
if (nodeName != null) {
properties.put(nodeName, propertyNode.getTextContent());
props.put(nodeName, propertyNode.getTextContent());
}
}
return properties;
return props;
}

private void parseLicensesNode(Node licensesNode) {
Expand Down Expand Up @@ -225,8 +239,9 @@ private void parseLicensesNode(Node licensesNode) {
}

// CHECKSTYLE:OFF
private void parseDependenciesNode(Node dependenciesNode) {
private List<MavenArtifact> parseDependenciesNode(Node dependenciesNode) {
// CHECKSTYLE:ON
final List<MavenArtifact> deps = new ArrayList<MavenArtifact>();
final NodeList dependencyNodes = dependenciesNode.getChildNodes();
for (int j = 0; j < dependencyNodes.getLength(); j++) {
final Node dependencyNode = dependencyNodes.item(j);
Expand All @@ -252,10 +267,11 @@ private void parseDependenciesNode(Node dependenciesNode) {
}
if ((scope == null || "compile".equals(scope))
&& (optional == null || !"true".equals(optional))) {
dependencies.add(dependency);
deps.add(dependency);
}
}
}
return deps;
}

private void update() throws IOException {
Expand Down Expand Up @@ -318,6 +334,20 @@ public Map<String, String> getLicenseUrlsByName() throws IOException {
// List<MavenArtifact> getDependencies() {
// return dependencies;
// }
//
// List<MavenArtifact> getManagedDependencies() {
// return managedDependencies;
// }

private List<MavenArtifact> getAllManagedDependencies() throws IOException {
update();
final List<MavenArtifact> allManagedDependencies = new ArrayList<MavenArtifact>();
allManagedDependencies.addAll(managedDependencies);
if (parent != null) {
allManagedDependencies.addAll(parent.getAllManagedDependencies());
}
return allManagedDependencies;
}

List<MavenArtifact> getAllDependencies() throws IOException {
return getAllDependencies(1);
Expand All @@ -331,7 +361,16 @@ private List<MavenArtifact> getAllDependencies(int level) throws IOException {
// update dependencies if needed
update();
final List<MavenArtifact> transitiveDependencies = new ArrayList<MavenArtifact>();
final List<MavenArtifact> allManagedDependencies = getAllManagedDependencies();
for (final MavenArtifact dependency : dependencies) {
if (dependency.version == null) {
for (final MavenArtifact managedDependency : allManagedDependencies) {
if (dependency.isSame(managedDependency)) {
dependency.version = managedDependency.version;
break;
}
}
}
transitiveDependencies.addAll(dependency.getAllDependencies(level + 1));
}
if (parent != null) {
Expand Down

0 comments on commit 373b2a1

Please sign in to comment.