@@ -550,13 +550,13 @@ private void renderSectionDependencyFileDetails() {
550550
551551 if (JAR_SUBTYPE .contains (artifact .getType ().toLowerCase ())) {
552552 try {
553- JarData jarDetails = dependencies .getJarDependencyDetails (artifact );
553+ JarData jarData = dependencies .getJarDependencyDetails (artifact );
554554
555- totalentries .addTotal (jarDetails .getNumEntries (), artifact .getScope ());
556- totalclasses .addTotal (jarDetails .getNumClasses (), artifact .getScope ());
557- totalpackages .addTotal (jarDetails .getNumPackages (), artifact .getScope ());
555+ totalentries .addTotal (jarData .getNumEntries (), artifact .getScope ());
556+ totalclasses .addTotal (jarData .getNumClasses (), artifact .getScope ());
557+ totalpackages .addTotal (jarData .getNumPackages (), artifact .getScope ());
558558
559- String jdkRevisionCellValue = jarDetails .getJdkRevision ();
559+ String jdkRevisionCellValue = jarData .getJdkRevision ();
560560 String debugInformationCellValue = null ;
561561 String sealedCellValue = null ;
562562
@@ -574,13 +574,13 @@ private void renderSectionDependencyFileDetails() {
574574 }
575575
576576 debugInformationCellValue = debugInformationCellNo ;
577- if (jarDetails .isDebugPresent ()) {
577+ if (jarData .isDebugPresent ()) {
578578 debugInformationCellValue = debugInformationCellYes ;
579579 totalDebugInformation .incrementTotal (artifact .getScope ());
580580 }
581581
582582 sealedCellValue = sealedCellNo ;
583- if (jarDetails .isSealed ()) {
583+ if (jarData .isSealed ()) {
584584 sealedCellValue = sealedCellYes ;
585585 totalsealed .incrementTotal (artifact .getScope ());
586586 }
@@ -595,60 +595,47 @@ private void renderSectionDependencyFileDetails() {
595595 fileLength = "-" ;
596596 }
597597
598- if (jarDetails .isMultiRelease ()) {
598+ if (jarData .isMultiRelease ()) {
599599 String htmlBullet = "   • " ;
600600 String rootTag = htmlBullet + getI18nString ("file.details.multirelease.root" );
601601 String versionedTag = htmlBullet + getI18nString ("file.details.multirelease.versioned" );
602602
603603 // general jar information row
604604 tableRow (hasSealed , new String [] {
605- name ,
606- fileLength ,
607- String .valueOf (jarDetails .getNumEntries ()),
608- "" ,
609- "" ,
610- "" ,
611- "" ,
612- sealedCellValue
605+ name , fileLength , String .valueOf (jarData .getNumEntries ()), "" , "" , "" , "" , sealedCellValue
613606 });
614607
615- JarVersionedRuntimes versionedRuntimes = jarDetails .getVersionedRuntimes ();
608+ JarVersionedRuntimes versionedRuntimes = jarData .getVersionedRuntimes ();
616609 Collection <JarVersionedRuntime > versionedRuntimeList =
617610 versionedRuntimes .getVersionedRuntimeMap ().values ();
618611
619- // workaround to count the number of root content entries
620- // TODO: rework this when MSHARED-1411 is fixed
621- Integer versionedNumEntries = versionedRuntimeList .stream ()
622- .map (versionedRuntime ->
623- versionedRuntime .getEntries ().size ())
624- .reduce (0 , Integer ::sum );
625- Integer rootContentNumEntries = jarDetails .getNumEntries () - versionedNumEntries ;
626-
627612 // root content information row
628613 tableRow (hasSealed , new String [] {
629614 rootTag ,
630615 "" ,
631- String .valueOf (rootContentNumEntries ),
632- String .valueOf (jarDetails .getNumClasses ()),
633- String .valueOf (jarDetails .getNumPackages ()),
616+ String .valueOf (jarData . getNumRootEntries () ),
617+ String .valueOf (jarData .getNumClasses ()),
618+ String .valueOf (jarData .getNumPackages ()),
634619 jdkRevisionCellValue ,
635620 debugInformationCellValue ,
636621 ""
637622 });
638623
639624 for (JarVersionedRuntime versionedRuntime : versionedRuntimeList ) {
640- JarClasses rtJarClasses = versionedRuntime .getJarClasses ();
625+ JarClasses versionedJarClasses = versionedRuntime .getJarClasses ();
641626
642- debugInformationCellValue =
643- rtJarClasses .isDebugPresent () ? debugInformationCellYes : debugInformationCellNo ;
627+ debugInformationCellValue = versionedJarClasses .isDebugPresent ()
628+ ? debugInformationCellYes
629+ : debugInformationCellNo ;
644630
645631 tableRow (hasSealed , new String [] {
646632 versionedTag ,
647633 "" ,
648- String .valueOf (versionedRuntime .getEntries ().size ()),
649- String .valueOf (rtJarClasses .getClassNames ().size ()),
650- String .valueOf (rtJarClasses .getPackages ().size ()),
651- rtJarClasses .getJdkRevision (),
634+ String .valueOf (versionedRuntime .getNumEntries ()),
635+ String .valueOf (
636+ versionedJarClasses .getClassNames ().size ()),
637+ String .valueOf (versionedJarClasses .getPackages ().size ()),
638+ versionedJarClasses .getJdkRevision (),
652639 debugInformationCellValue ,
653640 ""
654641 });
@@ -657,9 +644,9 @@ private void renderSectionDependencyFileDetails() {
657644 tableRow (hasSealed , new String [] {
658645 name ,
659646 fileLength ,
660- String .valueOf (jarDetails .getNumEntries ()),
661- String .valueOf (jarDetails .getNumClasses ()),
662- String .valueOf (jarDetails .getNumPackages ()),
647+ String .valueOf (jarData .getNumEntries ()),
648+ String .valueOf (jarData .getNumClasses ()),
649+ String .valueOf (jarData .getNumPackages ()),
663650 jdkRevisionCellValue ,
664651 debugInformationCellValue ,
665652 sealedCellValue
0 commit comments