michael-o commented on code in PR #70:
URL:
https://github.com/apache/maven-project-info-reports-plugin/pull/70#discussion_r1635907183
##########
src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java:
##########
@@ -591,16 +595,75 @@ private void renderSectionDependencyFileDetails() {
fileLength = "-";
}
- tableRow(hasSealed, new String[] {
- name,
- fileLength,
- String.valueOf(jarDetails.getNumEntries()),
- String.valueOf(jarDetails.getNumClasses()),
- String.valueOf(jarDetails.getNumPackages()),
- jdkRevisionCellValue,
- debugInformationCellValue,
- sealedCellValue
- });
+ if (jarDetails.isMultiRelease()) {
+ String htmlBullet = "   • ";
+ String rootTag = htmlBullet +
getI18nString("file.details.multirelease.root");
+ String versionedTag = htmlBullet +
getI18nString("file.details.multirelease.versioned");
+
+ // general jar information row
+ tableRow(hasSealed, new String[] {
+ name,
+ fileLength,
+ String.valueOf(jarDetails.getNumEntries()),
+ "",
+ "",
+ "",
+ "",
+ sealedCellValue
+ });
+
+ JarVersionedRuntimes versionedRuntimes =
jarDetails.getVersionedRuntimes();
+ Collection<JarVersionedRuntime> versionedRuntimeList =
+
versionedRuntimes.getVersionedRuntimeMap().values();
+
+ // workaround to count the number of root content
entries
Review Comment:
Please add the ticket ref for MSHARED here.
##########
src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java:
##########
@@ -591,16 +595,75 @@ private void renderSectionDependencyFileDetails() {
fileLength = "-";
}
- tableRow(hasSealed, new String[] {
- name,
- fileLength,
- String.valueOf(jarDetails.getNumEntries()),
- String.valueOf(jarDetails.getNumClasses()),
- String.valueOf(jarDetails.getNumPackages()),
- jdkRevisionCellValue,
- debugInformationCellValue,
- sealedCellValue
- });
+ if (jarDetails.isMultiRelease()) {
+ String htmlBullet = "   • ";
+ String rootTag = htmlBullet +
getI18nString("file.details.multirelease.root");
+ String versionedTag = htmlBullet +
getI18nString("file.details.multirelease.versioned");
+
+ // general jar information row
+ tableRow(hasSealed, new String[] {
+ name,
+ fileLength,
+ String.valueOf(jarDetails.getNumEntries()),
+ "",
+ "",
+ "",
+ "",
+ sealedCellValue
+ });
+
+ JarVersionedRuntimes versionedRuntimes =
jarDetails.getVersionedRuntimes();
+ Collection<JarVersionedRuntime> versionedRuntimeList =
+
versionedRuntimes.getVersionedRuntimeMap().values();
+
+ // workaround to count the number of root content
entries
+ Integer versionedNumEntries =
versionedRuntimeList.stream()
+ .map(versionedRuntime ->
+ versionedRuntime.getEntries().size())
+ .reduce(0, Integer::sum);
+ Integer rootContentNumEntries =
jarDetails.getNumEntries() - versionedNumEntries;
+
+ // root content information row
+ tableRow(hasSealed, new String[] {
+ rootTag,
+ "",
+ rootContentNumEntries.toString(),
Review Comment:
Make is `String#valueOf()` for consistency reasons
##########
src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java:
##########
@@ -591,16 +595,75 @@ private void renderSectionDependencyFileDetails() {
fileLength = "-";
}
- tableRow(hasSealed, new String[] {
- name,
- fileLength,
- String.valueOf(jarDetails.getNumEntries()),
- String.valueOf(jarDetails.getNumClasses()),
- String.valueOf(jarDetails.getNumPackages()),
- jdkRevisionCellValue,
- debugInformationCellValue,
- sealedCellValue
- });
+ if (jarDetails.isMultiRelease()) {
+ String htmlBullet = "   • ";
+ String rootTag = htmlBullet +
getI18nString("file.details.multirelease.root");
+ String versionedTag = htmlBullet +
getI18nString("file.details.multirelease.versioned");
+
+ // general jar information row
+ tableRow(hasSealed, new String[] {
+ name,
+ fileLength,
+ String.valueOf(jarDetails.getNumEntries()),
+ "",
+ "",
+ "",
+ "",
+ sealedCellValue
+ });
+
+ JarVersionedRuntimes versionedRuntimes =
jarDetails.getVersionedRuntimes();
+ Collection<JarVersionedRuntime> versionedRuntimeList =
+
versionedRuntimes.getVersionedRuntimeMap().values();
+
+ // workaround to count the number of root content
entries
+ Integer versionedNumEntries =
versionedRuntimeList.stream()
+ .map(versionedRuntime ->
+ versionedRuntime.getEntries().size())
+ .reduce(0, Integer::sum);
+ Integer rootContentNumEntries =
jarDetails.getNumEntries() - versionedNumEntries;
+
+ // root content information row
+ tableRow(hasSealed, new String[] {
+ rootTag,
+ "",
+ rootContentNumEntries.toString(),
+ String.valueOf(jarDetails.getNumClasses()),
+ String.valueOf(jarDetails.getNumPackages()),
Review Comment:
Shouldn't this value be reduced as well?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]