#1059 - Removing last remaining occurrences of manual server-side pagination. Changed remaining executeResultList to use executeList instead.

stevespringett · stevespringett · commit bd0a343ed4b2 · 2021-08-20T23:01:08.000-05:00
diff --git a/src/main/java/org/dependencytrack/persistence/ComponentQueryManager.java b/src/main/java/org/dependencytrack/persistence/ComponentQueryManager.java
@@ -104,7 +104,7 @@ public PaginatedResult getComponents() {
     public List<Component> getAllComponents() {
         final Query<Component> query = pm.newQuery(Component.class);
         query.setOrdering("id asc");
-        return query.executeResultList(Component.class);
+        return query.executeList();
     }
 
     /**
diff --git a/src/main/java/org/dependencytrack/persistence/PolicyQueryManager.java b/src/main/java/org/dependencytrack/persistence/PolicyQueryManager.java
@@ -82,7 +82,7 @@ public List<Policy> getAllPolicies() {
         if (orderBy == null) {
             query.setOrdering("name asc");
         }
-        return query.executeResultList(Policy.class);
+        return query.executeList();
     }
 
     /**
@@ -190,7 +190,7 @@ public List<PolicyViolation> getAllPolicyViolations() {
         if (orderBy == null) {
             query.setOrdering("timestamp desc, project.name, project.version, component.name, component.version");
         }
-        return query.executeResultList(PolicyViolation.class);
+        return query.executeList();
     }
 
     /**
diff --git a/src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java b/src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java
@@ -157,7 +157,7 @@ public List<Project> getAllProjects(boolean excludeInactive) {
             query.setFilter("active == true || active == null");
         }
         query.setOrdering("name asc");
-        return query.executeResultList(Project.class);
+        return query.executeList();
     }
 
     /**
diff --git a/src/main/java/org/dependencytrack/persistence/RepositoryQueryManager.java b/src/main/java/org/dependencytrack/persistence/RepositoryQueryManager.java
@@ -74,7 +74,7 @@ public PaginatedResult getRepositories() {
     public List<Repository> getAllRepositories() {
         final Query<Repository> query = pm.newQuery(Repository.class);
         query.setOrdering("type asc, identifier asc");
-        return query.executeResultList(Repository.class);
+        return query.executeList();
     }
 
     /**
diff --git a/src/main/java/org/dependencytrack/persistence/ServiceComponentQueryManager.java b/src/main/java/org/dependencytrack/persistence/ServiceComponentQueryManager.java
@@ -114,7 +114,7 @@ public ServiceComponent createServiceComponent(ServiceComponent service, boolean
     public List<ServiceComponent> getAllServiceComponents() {
         final Query<ServiceComponent> query = pm.newQuery(ServiceComponent.class);
         query.setOrdering("id asc");
-        return query.executeResultList(ServiceComponent.class);
+        return query.executeList();
     }
 
     /**
diff --git a/src/main/java/org/dependencytrack/search/ComponentIndexer.java b/src/main/java/org/dependencytrack/search/ComponentIndexer.java
@@ -21,10 +21,6 @@
 import alpine.logging.Logger;
 import alpine.notification.Notification;
 import alpine.notification.NotificationLevel;
-import alpine.persistence.PaginatedResult;
-import alpine.resources.AlpineRequest;
-import alpine.resources.OrderDirection;
-import alpine.resources.Pagination;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.Term;
@@ -119,30 +115,15 @@ public void remove(final Component component) {
     public void reindex() {
         LOGGER.info("Starting reindex task. This may take some time.");
         super.reindex();
-        final AlpineRequest alpineRequest = new AlpineRequest(
-                null,
-                new Pagination(Pagination.Strategy.OFFSET, 0, 100),
-                null,
-                "id",
-                OrderDirection.ASCENDING
-        );
-        try (final QueryManager qm = new QueryManager(alpineRequest)) {
-            final PaginatedResult result = qm.getProjects(false, true);
-            long count = 0;
-            boolean shouldContinue = true;
-            while (count < result.getTotal() && shouldContinue) {
-                for (final Project project: result.getList(Project.class)) {
-                    final List<Component> components = qm.getAllComponents(project);
-                    LOGGER.info("Indexing " + components.size() + " components in project: " + project.getUuid());
-                    for (final Component component: components) {
-                        add(component);
-                    }
-                    LOGGER.info("Completed indexing of " + components.size() + " components in project: " + project.getUuid());
+        try (final QueryManager qm = new QueryManager()) {
+            final List<Project> projects = qm.getAllProjects(true);
+            for (final Project project : projects) {
+                final List<Component> components = qm.getAllComponents(project);
+                LOGGER.info("Indexing " + components.size() + " components in project: " + project.getUuid());
+                for (final Component component: components) {
+                    add(component);
                 }
-                int lastResult = result.getObjects().size();
-                count += lastResult;
-                shouldContinue = lastResult > 0;
-                qm.advancePagination();
+                LOGGER.info("Completed indexing of " + components.size() + " components in project: " + project.getUuid());
             }
             commit();
         }
diff --git a/src/main/java/org/dependencytrack/tasks/VulnerabilityAnalysisTask.java b/src/main/java/org/dependencytrack/tasks/VulnerabilityAnalysisTask.java
@@ -21,10 +21,6 @@
 import alpine.event.framework.Event;
 import alpine.event.framework.Subscriber;
 import alpine.logging.Logger;
-import alpine.persistence.PaginatedResult;
-import alpine.resources.AlpineRequest;
-import alpine.resources.OrderDirection;
-import alpine.resources.Pagination;
 import org.apache.commons.collections4.CollectionUtils;
 import org.dependencytrack.event.InternalAnalysisEvent;
 import org.dependencytrack.event.MetricsUpdateEvent;
@@ -75,28 +71,13 @@ public void inform(final Event e) {
                 performPolicyEvaluation(event.getProject(), components);
             } else {
                 LOGGER.info("Analyzing portfolio");
-                final AlpineRequest alpineRequest = new AlpineRequest(
-                        null,
-                        new Pagination(Pagination.Strategy.OFFSET, 0, 100),
-                        null,
-                        "id",
-                        OrderDirection.ASCENDING
-                );
-                try (final QueryManager qm = new QueryManager(alpineRequest)) {
-                    final PaginatedResult result = qm.getProjects(false, true);
-                    long count = 0;
-                    boolean shouldContinue = true;
-                    while (count < result.getTotal() && shouldContinue) {
-                        for (final Project project: result.getList(Project.class)) {
-                            final List<Component> components = qm.getAllComponents(project);
-                            LOGGER.info("Analyzing " + components.size() + " components in project: " + project.getUuid());
-                            analyzeComponents(qm, components);
-                            LOGGER.info("Completed analysis of " + components.size() + " components in project: " + project.getUuid());
-                        }
-                        int lastResult = result.getObjects().size();
-                        count += lastResult;
-                        shouldContinue = lastResult > 0;
-                        qm.advancePagination();
+                try (final QueryManager qm = new QueryManager()) {
+                    final List<Project> projects = qm.getAllProjects(true);
+                    for (final Project project: projects) {
+                        final List<Component> components = qm.getAllComponents(project);
+                        LOGGER.info("Analyzing " + components.size() + " components in project: " + project.getUuid());
+                        analyzeComponents(qm, components);
+                        LOGGER.info("Completed analysis of " + components.size() + " components in project: " + project.getUuid());
                     }
                 }
                 LOGGER.info("Portfolio analysis complete");
diff --git a/src/main/java/org/dependencytrack/tasks/repositories/RepositoryMetaAnalyzerTask.java b/src/main/java/org/dependencytrack/tasks/repositories/RepositoryMetaAnalyzerTask.java
@@ -21,10 +21,6 @@
 import alpine.event.framework.Event;
 import alpine.event.framework.Subscriber;
 import alpine.logging.Logger;
-import alpine.persistence.PaginatedResult;
-import alpine.resources.AlpineRequest;
-import alpine.resources.OrderDirection;
-import alpine.resources.Pagination;
 import org.apache.commons.lang3.StringUtils;
 import org.dependencytrack.event.RepositoryMetaEvent;
 import org.dependencytrack.model.Component;
@@ -53,30 +49,15 @@ public void inform(final Event e) {
                     analyze(qm, qm.getObjectById(Component.class, event.getComponent().getId()));
                 }
             } else {
-                final AlpineRequest alpineRequest = new AlpineRequest(
-                        null,
-                        new Pagination(Pagination.Strategy.OFFSET, 0, 100),
-                        null,
-                        "id",
-                        OrderDirection.ASCENDING
-                );
-                try (final QueryManager qm = new QueryManager(alpineRequest)) {
-                    final PaginatedResult result = qm.getProjects(false, true);
-                    long count = 0;
-                    boolean shouldContinue = true;
-                    while (count < result.getTotal() && shouldContinue) {
-                        for (final Project project: result.getList(Project.class)) {
-                            final List<Component> components = qm.getAllComponents(project);
-                            LOGGER.info("Performing component repository metadata analysis against " + components.size() + " components in project: " + project.getUuid());
-                            for (final Component component: components) {
-                                analyze(qm, component);
-                            }
-                            LOGGER.info("Completed component repository metadata analysis against " + components.size() + " components in project: " + project.getUuid());
+                try (final QueryManager qm = new QueryManager()) {
+                    final List<Project> projects = qm.getAllProjects(true);
+                    for (final Project project: projects) {
+                        final List<Component> components = qm.getAllComponents(project);
+                        LOGGER.info("Performing component repository metadata analysis against " + components.size() + " components in project: " + project.getUuid());
+                        for (final Component component: components) {
+                            analyze(qm, component);
                         }
-                        int lastResult = result.getObjects().size();
-                        count += lastResult;
-                        shouldContinue = lastResult > 0;
-                        qm.advancePagination();
+                        LOGGER.info("Completed component repository metadata analysis against " + components.size() + " components in project: " + project.getUuid());
                     }
                 }
                 LOGGER.info("Portfolio component repository metadata analysis complete");

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public PaginatedResult getComponents() {`
`104`	`104`	`public List<Component> getAllComponents() {`
`105`	`105`	`final Query<Component> query = pm.newQuery(Component.class);`
`106`	`106`	`query.setOrdering("id asc");`
`107`		`- return query.executeResultList(Component.class);`
	`107`	`+ return query.executeList();`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public List<Policy> getAllPolicies() {`
`82`	`82`	`if (orderBy == null) {`
`83`	`83`	`query.setOrdering("name asc");`
`84`	`84`	`}`
`85`		`- return query.executeResultList(Policy.class);`
	`85`	`+ return query.executeList();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
`@@ -190,7 +190,7 @@ public List<PolicyViolation> getAllPolicyViolations() {`
`190`	`190`	`if (orderBy == null) {`
`191`	`191`	`query.setOrdering("timestamp desc, project.name, project.version, component.name, component.version");`
`192`	`192`	`}`
`193`		`- return query.executeResultList(PolicyViolation.class);`
	`193`	`+ return query.executeList();`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public List<Project> getAllProjects(boolean excludeInactive) {`
`157`	`157`	`query.setFilter("active == true \|\| active == null");`
`158`	`158`	`}`
`159`	`159`	`query.setOrdering("name asc");`
`160`		`- return query.executeResultList(Project.class);`
	`160`	`+ return query.executeList();`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public PaginatedResult getRepositories() {`
`74`	`74`	`public List<Repository> getAllRepositories() {`
`75`	`75`	`final Query<Repository> query = pm.newQuery(Repository.class);`
`76`	`76`	`query.setOrdering("type asc, identifier asc");`
`77`		`- return query.executeResultList(Repository.class);`
	`77`	`+ return query.executeList();`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public ServiceComponent createServiceComponent(ServiceComponent service, boolean`
`114`	`114`	`public List<ServiceComponent> getAllServiceComponents() {`
`115`	`115`	`final Query<ServiceComponent> query = pm.newQuery(ServiceComponent.class);`
`116`	`116`	`query.setOrdering("id asc");`
`117`		`- return query.executeResultList(ServiceComponent.class);`
	`117`	`+ return query.executeList();`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/**`