WINDUP-1895: Fix performance with extremely large #s of packages

model/src/main/java/org/jboss/windup/web/services/model/Package.java

@@ -46,11 +46,11 @@ public class Package implements Serializable
     private Package parent;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "parent")
-    private Set<Package> childs;
+    private Set<Package> children;
 
     public Package()
     {
-        this.childs = new HashSet<>();
+        this.children = new HashSet<>();
     }
 
     /**
@@ -61,7 +61,7 @@ public Package()
     public Package(String name)
     {
         this.name = name;
-        this.childs = new HashSet<>();
+        this.children = new HashSet<>();
     }
 
     /**
@@ -74,7 +74,7 @@ public Package(String partialName, String fullName)
     {
         this.name = partialName;
         this.fullName = fullName;
-        this.childs = new HashSet<>();
+        this.children = new HashSet<>();
     }
 
     public Long getId()
@@ -163,9 +163,9 @@ public void setParent(Package parent)
         this.parent = parent;
     }
 
-    public Collection<Package> getChilds()
+    public Collection<Package> getChildren()
     {
-        return childs;
+        return children;
     }
 
     /**
@@ -175,7 +175,7 @@ public Collection<Package> getChilds()
      */
     public void addChild(Package child)
     {
-        this.childs.add(child);
+        this.children.add(child);
     }
 
     /**
@@ -185,7 +185,7 @@ public void addChild(Package child)
      */
     public void removeChild(Package child)
     {
-        this.childs.remove(child);
+        this.children.remove(child);
     }
 
 

ui/src/main/webapp/css/windup-web.css

@@ -1,161 +1,161 @@
 .nav-pf-vertical {
-    width: 240px;
+  width: 240px;
 }
 
 .nav-pf-vertical .list-group-item > a {
-    width: 240px;
+  width: 240px;
 }
 
 .form-errors {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .layout-pf.layout-pf-fixed body {
-    padding-top: unset;
+  padding-top: unset;
 }
 
 .container-fluid {
-    padding-top: 60px;
+  padding-top: 60px;
 }
 
 .wizard-content .container-fluid {
-    padding-top: 0px;
+  padding-top: 0px;
 }
 
 table.datatable, table.dataTable {
-    height: unset;
+  height: unset;
 }
 
 .pointer {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 
 .page-header-no-border {
-    border: 0 none;
-    margin-bottom: 0;
+  border: 0 none;
+  margin-bottom: 0;
 }
 .page-header h1 {
-    margin: 15px;
+  margin: 15px;
 }
 .page-header h1 span.slash {
-    color: #555;
+  color: #555;
 }
 .page-header h1 {
-    padding-left: 12pt;
+  padding-left: 12pt;
 }
 .page-header h1 div.main {
-    border-bottom: 1px solid #add8e6;
-    color: #005387;
-    margin: 0 6em 0.5ex 0;
-    width: auto;
+  border-bottom: 1px solid #add8e6;
+  color: #005387;
+  margin: 0 6em 0.5ex 0;
+  width: auto;
 }
 
 .page-header div.desc, div.tooltipLikeMessage {
-    background: beige none repeat scroll 0 0;
-    border: 1px solid #888;
-    color: black;
-    display: inline-block;
-    font-size: 12pt;
-    font-weight: normal;
-    padding: 1ex 1em;
+  background: beige none repeat scroll 0 0;
+  border: 1px solid #888;
+  color: black;
+  display: inline-block;
+  font-size: 12pt;
+  font-weight: normal;
+  padding: 1ex 1em;
 }
 .page-header div.desc {
-    margin: 0 15px 15px 30px;
+  margin: 0 15px 15px 30px;
 }
 div.tooltipLikeMessage {
-    margin: 15px 0 0;
+  margin: 15px 0 0;
 }
 .page-header div.desc::before, div.tooltipLikeMessage::before {
-    color: gray;
-    content: "";
-    cursor: help;
-    display: inline-block;
-    font-family: "Glyphicons Halflings";
-    font-size: 12pt;
-    font-style: normal;
-    font-weight: normal;
-    line-height: 1;
-    padding: 0.3ex 0.3em;
-    position: relative;
-    top: 1px;
-    vertical-align: top;
+  color: gray;
+  content: "";
+  cursor: help;
+  display: inline-block;
+  font-family: "Glyphicons Halflings";
+  font-size: 12pt;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  padding: 0.3ex 0.3em;
+  position: relative;
+  top: 1px;
+  vertical-align: top;
 }
 
 .windupPieGraph div.legend td.legendLabel {
-    padding-left: 0.6ex;
+  padding-left: 0.6ex;
 }
 
 .clickable {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .label-info {
-    background-color: #696969;
+  background-color: #696969;
 }
 
 .label-danger {
-    background-color: #f04124;
+  background-color: #f04124;
 }
 
 .welcome-help-text {
-    padding-top: 15px;
+  padding-top: 15px;
 }
 
 th {
-    font-size: 12px;
+  font-size: 12px;
 }
 
 td {
-    font-size: 12px;
+  font-size: 12px;
 }
 
 .external-link::before {
-    content: '\F2D2';
-    font: normal normal normal 14px/1 FontAwesome;
-    font-size: 12px;
-    padding-right: 3px;
+  content: '\F2D2';
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: 12px;
+  padding-right: 3px;
 }
 
 .container-fluid .wu-frame {
-    background: #e8e8e8;
-    margin-left: 20px !important;
-    margin-right: 20px !important;
-    margin-bottom: 2px !important;
+  background: #e8e8e8;
+  margin-left: 20px !important;
+  margin-right: 20px !important;
+  margin-bottom: 2px !important;
 
-    padding-top: 0; /* override */
+  padding-top: 0; /* override */
 }
 
 form .wizard-form {
-    padding-left: 10px;
-    padding-right: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
 }
 
 label.required:before {
-    content: '*';
-    position: relative;
-    left: -2ex;
-    float: left;
-    width: 0;
+  content: '*';
+  position: relative;
+  left: -2ex;
+  float: left;
+  width: 0;
 }
 
 .btn {
-    text-transform: capitalize;
+  text-transform: capitalize;
 }
 
 fieldset.fields-section-pf {
-    border-color: #adaaaa;
+  border-color: #adaaaa;
 }
 
 .form-horizontal .form-group {
-    margin-left: 10px;
-    margin-right: 10px;
+  margin-left: 10px;
+  margin-right: 10px;
 }
 
 .wu-horizontal-nav-content {
-/*    margin-top: 122px; */
-    padding-top: 122px;
-    margin-top: 0;
+  /*    margin-top: 122px; */
+  padding-top: 122px;
+  margin-top: 0;
 }
 
 /*
@@ -164,38 +164,42 @@ fieldset.fields-section-pf {
 }
 */
 @media (max-width: 767px) {
-    .wu-horizontal-nav-content, .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
-        margin-left: 0;
-        margin-top: initial;
-    }
+  .wu-horizontal-nav-content, .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
+    margin-left: 0;
+    margin-top: initial;
+  }
 
-    .container-fluid {
-        padding-top: initial;
-    }
+  .container-fluid {
+    padding-top: initial;
+  }
 }
 
 @media (min-width: 768px) and (max-width: 1599px) {
-    .nav-pf-vertical .list-group-item > a {
-        width: 240px;
-    }
+  .nav-pf-vertical .list-group-item > a {
+    width: 240px;
+  }
 
-    .wu-horizontal-nav-content, .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
-        margin-left: 240px;
-    }
+  .wu-horizontal-nav-content, .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
+    margin-left: 240px;
+  }
 }
 
 @media (min-width: 1599px) {
-    .wu-horizontal-nav-content, .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
-        margin-left: 240px;
-    }
+  .wu-horizontal-nav-content, .layout-pf.layout-pf-fixed .container-pf-nav-pf-vertical {
+    margin-left: 240px;
+  }
 }
 
 /* Pushes notifications area a bit down from the horizontal navigation bar. */
 .notifications-row {
-    padding-top: 24px;
+  padding-top: 24px;
 }
 
 .alert {
-    margin-top: 20px;
-    margin-bottom: 0px;
+  margin-top: 20px;
+  margin-bottom: 0px;
 }
+
+
+@import '~angular-tree-component/dist/angular-tree-component.css';
+

ui/src/main/webapp/package.json

@@ -40,6 +40,7 @@
     "@angular/router": "^4.1.2",
     "@swimlane/ngx-charts": "^5.2.0",
     "angular-router-loader": "^0.6.0",
+    "angular-tree-component": "^7.1.0",
     "angular2-moment": "^1.3.3",
     "bootstrap": "3.3.7",
     "bootstrap-datepicker": "1.6.4",

ui/src/main/webapp/src/app/analysis-context/analysis-context-form.component.html

@@ -104,8 +104,8 @@ <h2 *ngIf="!project" i18n>Loading...</h2>
                             <ng-container i18n>Identifying packages...</ng-container>
                         </p>
                     </div>
-                    <wu-js-tree-wrapper style="max-height: 240px;" [treeNodes]="packageTree" [(selectedNodes)]="analysisContext.excludePackages">
-                    </wu-js-tree-wrapper>
+                    <!-- wu-js-tree-wrapper style="max-height: 240px;" [treeNodes]="packageTree" [(selectedNodes)]="analysisContext.excludePackages">
+                    </wu-js-tree-wrapper -->
                 </div>
                 <p class="help-block" i18n="exclude packages description">All classes in the selected packages will be ignored during analysis.</p>
             </div>

ui/src/main/webapp/src/app/analysis-context/analysis-context-form.component.ts

@@ -263,6 +263,7 @@ export class AnalysisContextFormComponent extends FormComponent
         */
 
         forkJoin(registeredPackagesObservables).subscribe((packageMetadataArray: PackageMetadata[]) => {
+            console.log("package metadata array: ", packageMetadataArray);
             let arrayOfRoots = [].concat(...packageMetadataArray.map((singlePackageMetadata) => singlePackageMetadata.packageTree));
             let mergedRoots = this._packageRegistryService.mergePackageRoots(arrayOfRoots);
             mergedRoots.forEach(singleRoot => this._packageRegistryService.putHierarchy(singleRoot));

ui/src/main/webapp/src/app/analysis-context/analysis-context.service.ts

@@ -33,7 +33,14 @@ export class AnalysisContextService extends AbstractService {
      * @returns {Observable<AnalysisContext>}
      */
     saveAsDefault(analysisContext: AnalysisContext, project: MigrationProject): Observable<AnalysisContext> {
-        let body = JSON.stringify(analysisContext);
+        let body = JSON.stringify(analysisContext, (key, value) => {
+            // This works around the cases where we store the parent as part of the value.
+            // It would be a circular reference without this.
+            if (key == "parent")
+                return undefined;
+
+            return value;
+        });
         let url = Constants.REST_BASE + this.CREATE_URL.replace('{projectId}', project.id.toString());
 
         return this._http.put(url, body, this.JSON_OPTIONS)