Provide for explicit thin results in queryForPageableResults (spring-cloud#5749)

Preserve existing findAll behaviour.

Author: Corneil du Plessis

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/AggregateTaskExplorer.java

@@ -128,6 +128,15 @@ public interface AggregateTaskExplorer {
 	 */
 	Page<AggregateTaskExecution> findAll(Pageable pageable);
 
+	/**
+	 * Retrieves all the task executions within the pageable constraints sorted by start
+	 * date descending, taskExecution id descending.
+	 *
+	 * @param pageable the constraints for the search
+	 * @param thinResults Indicated if arguments will be populated
+	 * @return page containing the results from the search
+	 */
+	Page<AggregateTaskExecution> findAll(Pageable pageable, boolean thinResults);
 	/**
 	 * Returns the id of the TaskExecution that the requested Spring Batch job execution
 	 * was executed within the context of. Returns null if none were found.

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/DataflowTaskExecutionQueryDao.java

@@ -163,6 +163,15 @@ public interface DataflowTaskExecutionQueryDao {
 
 	Page<AggregateTaskExecution> findAll(Pageable pageable);
 
+	/**
+	 * Retrieves all the task executions within the pageable constraints.
+	 * @param pageable the constraints for the search
+	 * @param thinResults Indicated if arguments will be populated
+	 * @return page containing the results from the search
+	 */
+
+	Page<AggregateTaskExecution> findAll(Pageable pageable, boolean thinResults);
+
 	/**
 	 * Returns a {@link List} of the latest {@link TaskExecution} for 1 or more task
 	 * names.

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/AggregateDataFlowTaskExecutionQueryDao.java

@@ -471,14 +471,14 @@ public Page<AggregateTaskExecution> findRunningTaskExecutions(String taskName, P
 		return queryForPageableResults(pageable, SELECT_CLAUSE, FROM_CLAUSE,
 				RUNNING_TASK_WHERE_CLAUSE,
 				new MapSqlParameterSource("taskName", taskName),
-				getRunningTaskExecutionCountByTaskName(taskName));
+				getRunningTaskExecutionCountByTaskName(taskName), false);
 	}
 
 	@Override
 	public Page<AggregateTaskExecution> findTaskExecutionsByName(String taskName, Pageable pageable) {
 		return queryForPageableResults(pageable, SELECT_CLAUSE, FROM_CLAUSE,
 				TASK_NAME_WHERE_CLAUSE, new MapSqlParameterSource("taskName", taskName),
-				getTaskExecutionCountByTaskName(taskName));
+				getTaskExecutionCountByTaskName(taskName), false);
 	}
 
 	@Override
@@ -490,17 +490,23 @@ public List<String> getTaskNames() {
 	@Override
 	public Page<AggregateTaskExecution> findAll(Pageable pageable) {
 		return queryForPageableResults(pageable, SELECT_CLAUSE, FROM_CLAUSE, null,
-				new MapSqlParameterSource(), getTaskExecutionCount());
+				new MapSqlParameterSource(), getTaskExecutionCount(), false);
 	}
 
+	@Override
+	public Page<AggregateTaskExecution> findAll(Pageable pageable, boolean thinResults) {
+		return queryForPageableResults(pageable, SELECT_CLAUSE, FROM_CLAUSE, null,
+			new MapSqlParameterSource(), getTaskExecutionCount(), thinResults);
+	}
 
 	private Page<AggregateTaskExecution> queryForPageableResults(
 			Pageable pageable,
 			String selectClause,
 			String fromClause,
 			String whereClause,
 			MapSqlParameterSource queryParameters,
-			long totalCount
+			long totalCount,
+			boolean thinResults
 	) {
 		SqlPagingQueryProviderFactoryBean factoryBean = new SqlPagingQueryProviderFactoryBean();
 		factoryBean.setSelectClause(selectClause);
@@ -539,7 +545,7 @@ private Page<AggregateTaskExecution> queryForPageableResults(
 		}
 		String query = pagingQueryProvider.getPageQuery(pageable);
 		List<AggregateTaskExecution> resultList = this.jdbcTemplate.query(query,
-				queryParameters, new CompositeTaskExecutionRowMapper(false));
+				queryParameters, new CompositeTaskExecutionRowMapper(!thinResults));
 		resultList.stream()
 			.collect(Collectors.groupingBy(AggregateTaskExecution::getSchemaTarget))
 			.forEach(this::populateArguments);

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/DefaultAggregateTaskExplorer.java

@@ -230,6 +230,11 @@ public Page<AggregateTaskExecution> findAll(Pageable pageable) {
 		return taskExecutionQueryDao.findAll(pageable);
 	}
 
+	@Override
+	public Page<AggregateTaskExecution> findAll(Pageable pageable, boolean thinResults) {
+		return taskExecutionQueryDao.findAll(pageable, thinResults);
+	}
+
 	@Override
 	public Long getTaskExecutionIdByJobExecutionId(long jobExecutionId, String schemaTarget) {
 		if (!StringUtils.hasText(schemaTarget)) {

spring-cloud-dataflow-rest-client/src/main/java/org/springframework/cloud/dataflow/rest/client/TaskTemplate.java

@@ -265,6 +265,7 @@ public TaskExecutionResource.Page executionList() {
 
 	@Override
 	public PagedModel<TaskExecutionThinResource> thinExecutionList() {
+		Assert.notNull(thinExecutionsLink, "Expected link:" + THIN_EXECUTIONS_RELATION);
 		return restTemplate.getForObject(thinExecutionsLink.getHref(), TaskExecutionThinResource.Page.class);
 	}
 

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionThinController.java

@@ -52,7 +52,7 @@ public TaskExecutionThinController(AggregateTaskExplorer explorer) {
 	@GetMapping(produces = "application/json")
 	@ResponseStatus(HttpStatus.OK)
 	public PagedModel<TaskExecutionThinResource> listTasks(Pageable pageable, PagedResourcesAssembler<AggregateTaskExecution> pagedAssembler) {
-		return pagedAssembler.toModel(explorer.findAll(pageable), resourceAssembler);
+		return pagedAssembler.toModel(explorer.findAll(pageable, true), resourceAssembler);
 	}
 
 	static class TaskExecutionThinResourceAssembler extends RepresentationModelAssemblerSupport<AggregateTaskExecution, TaskExecutionThinResource> {

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java

@@ -126,7 +126,7 @@ public void testExplorerFindAll() {
 		insertTestExecutionDataIntoRepo(template, 1L, "foo");
 		insertTestExecutionDataIntoRepo(template, 0L, "foo");
 
-		List<AggregateTaskExecution> resultList = explorer.findAll(PageRequest.of(0, 10)).getContent();
+		List<AggregateTaskExecution> resultList = explorer.findAll(PageRequest.of(0, 10), true).getContent();
 		assertThat(resultList.size()).isEqualTo(ENTRY_COUNT);
 		Map<String, AggregateTaskExecution> actual = new HashMap<>();
 		for (AggregateTaskExecution taskExecution : resultList) {
@@ -164,7 +164,7 @@ public void testExplorerSort() throws Exception {
 		insertTestExecutionDataIntoRepo(template, 1L, "baz");
 		insertTestExecutionDataIntoRepo(template, 0L, "fee");
 
-		List<AggregateTaskExecution> resultList = explorer.findAll(PageRequest.of(0, 10, Sort.by("SCHEMA_TARGET"))).getContent();
+		List<AggregateTaskExecution> resultList = explorer.findAll(PageRequest.of(0, 10, Sort.by("SCHEMA_TARGET")), true).getContent();
 		assertThat(resultList.size()).isEqualTo(4);
 		List<Long> ids = resultList.stream().map(AggregateTaskExecution::getExecutionId).collect(Collectors.toList());
 		assertThat(ids).containsExactly(0L, 2L, 3L, 1L);

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/AbstractSmokeTest.java

@@ -125,7 +125,7 @@ void taskCreation() {
 		});
 		long expectedNewCount = originalCount + 2;
 		assertThat(taskExplorer.getTaskExecutionCount()).isEqualTo(expectedNewCount);
-		List<AggregateTaskExecution> taskExecutions = taskExplorer.findAll(Pageable.ofSize(100)).getContent();
+		List<AggregateTaskExecution> taskExecutions = taskExplorer.findAll(Pageable.ofSize(100), true).getContent();
 		assertThat(taskExecutions)
 				.hasSize((int)expectedNewCount)
 				.allSatisfy((taskExecution) -> assertThat(taskExecution.getExecutionId()).isNotEqualTo(0L));