Update DAOs to no longer use aggregate

Update tests to remove Schema Version checks

* Update tests so that they no longer use aggregate views
* Update SimpleJobService MariaDB and PostgresDB to match was is in 2.11 tests
This was to resolve the sporadic connection pool problems

Remove AggregateJobQueryDao

* remove unused tests
* Update SimpleServiceFactory to remove use to the aggregate code

Rename AggregateTaskconfigruation/AggreageTaskExplorer to an accurate name

Rename aggregate package to composite

Remove uses of AppBootSchema and spring-cloud-dataflow-schema-core module

Re-enable more tests

Remove or update tests that are Boot3 specific

Author: cppwfs

pom.xml

@@ -58,9 +58,7 @@
 		<module>spring-cloud-dataflow-container-registry</module>
 		<module>spring-cloud-dataflow-configuration-metadata</module>
 		<module>spring-cloud-dataflow-core-dsl</module>
-		<module>spring-cloud-dataflow-schema-core</module>
 		<module>spring-cloud-dataflow-core</module>
-		<module>spring-cloud-dataflow-schema</module>
 		<module>spring-cloud-dataflow-aggregate-task</module>
 		<module>spring-cloud-dataflow-server-core</module>
 		<module>spring-cloud-dataflow-rest-resource</module>

spring-cloud-dataflow-aggregate-task/pom.xml

@@ -40,11 +40,6 @@
 			<artifactId>spring-cloud-dataflow-registry</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-dataflow-schema</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/AggregateTaskConfiguration.java renamed to spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskConfiguration.java

@@ -13,16 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.dataflow.aggregate.task;
+package org.springframework.cloud.dataflow.composite.task;
 
 import javax.sql.DataSource;
 
-import org.springframework.cloud.dataflow.aggregate.task.impl.DefaultAggregateTaskExplorer;
-import org.springframework.cloud.dataflow.schema.service.SchemaService;
-import org.springframework.cloud.dataflow.schema.service.SchemaServiceConfiguration;
+import org.springframework.cloud.dataflow.composite.task.impl.DefaultCompositeTaskExplorer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.util.Assert;
 
 /**
@@ -31,23 +28,20 @@
  * @author Corneil du Plessis
  */
 @Configuration
-@Import(SchemaServiceConfiguration.class)
-public class AggregateTaskConfiguration {
+public class CompositeTaskConfiguration {
 
 	@Bean
-	public AggregateTaskExplorer aggregateTaskExplorer(
+	public CompositeTaskExplorer aggregateTaskExplorer(
 			DataSource dataSource,
 			DataflowTaskExecutionQueryDao taskExecutionQueryDao,
-			SchemaService schemaService,
 			TaskDefinitionReader taskDefinitionReader,
 			TaskDeploymentReader taskDeploymentReader
 	) {
 		Assert.notNull(dataSource, "dataSource required");
 		Assert.notNull(taskExecutionQueryDao, "taskExecutionQueryDao required");
-		Assert.notNull(schemaService, "schemaService required");
 		Assert.notNull(taskDefinitionReader, "taskDefinitionReader required");
 		Assert.notNull(taskDeploymentReader, "taskDeploymentReader required");
-		return new DefaultAggregateTaskExplorer(dataSource,
+		return new DefaultCompositeTaskExplorer(dataSource,
 				taskExecutionQueryDao,
 				taskDefinitionReader,
 				taskDeploymentReader);

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/AggregateTaskExplorer.java renamed to spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskExplorer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.dataflow.aggregate.task;
+package org.springframework.cloud.dataflow.composite.task;
 
 import java.util.Collection;
 import java.util.Date;
@@ -29,7 +29,7 @@
  *
  * @author Corneil du Plessis
  */
-public interface AggregateTaskExplorer {
+public interface CompositeTaskExplorer {
 	/**
 	 * find a task execution given an execution id and schema target.
 	 *

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.dataflow.aggregate.task;
+package org.springframework.cloud.dataflow.composite.task;
 
 import java.util.Collection;
 import java.util.Date;

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/TaskDefinitionReader.java renamed to spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDefinitionReader.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.dataflow.aggregate.task;
+package org.springframework.cloud.dataflow.composite.task;
 
 import org.springframework.cloud.dataflow.core.TaskDefinition;
 

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/TaskDeploymentReader.java renamed to spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDeploymentReader.java

@@ -1,4 +1,4 @@
-package org.springframework.cloud.dataflow.aggregate.task;
+package org.springframework.cloud.dataflow.composite.task;
 
 import java.util.List;
 

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/DefaultAggregateTaskExplorer.java renamed to spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultCompositeTaskExplorer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.dataflow.aggregate.task.impl;
+package org.springframework.cloud.dataflow.composite.task.impl;
 
 import javax.sql.DataSource;
 import java.util.ArrayList;
@@ -25,10 +25,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.springframework.cloud.dataflow.aggregate.task.AggregateTaskExplorer;
-import org.springframework.cloud.dataflow.aggregate.task.DataflowTaskExecutionQueryDao;
-import org.springframework.cloud.dataflow.aggregate.task.TaskDefinitionReader;
-import org.springframework.cloud.dataflow.aggregate.task.TaskDeploymentReader;
+import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer;
+import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao;
+import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader;
+import org.springframework.cloud.dataflow.composite.task.TaskDeploymentReader;
 import org.springframework.cloud.dataflow.core.TaskDefinition;
 import org.springframework.cloud.dataflow.core.TaskDeployment;
 import org.springframework.cloud.task.repository.TaskExecution;
@@ -45,8 +45,8 @@
  *
  * @author Corneil du Plessis
  */
-public class DefaultAggregateTaskExplorer implements AggregateTaskExplorer {
-	private final static Logger logger = LoggerFactory.getLogger(DefaultAggregateTaskExplorer.class);
+public class DefaultCompositeTaskExplorer implements CompositeTaskExplorer {
+	private final static Logger logger = LoggerFactory.getLogger(DefaultCompositeTaskExplorer.class);
 
 	private final TaskExplorer taskExplorer;
 
@@ -56,7 +56,7 @@ public class DefaultAggregateTaskExplorer implements AggregateTaskExplorer {
 
 	private final TaskDeploymentReader taskDeploymentReader;
 
-	public DefaultAggregateTaskExplorer(
+	public DefaultCompositeTaskExplorer(
 			DataSource dataSource,
 			DataflowTaskExecutionQueryDao taskExecutionQueryDao,
 			TaskDefinitionReader taskDefinitionReader,

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/AggregateDataFlowTaskExecutionQueryDao.java renamed to spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultDataFlowTaskExecutionQueryDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.dataflow.aggregate.task.impl;
+package org.springframework.cloud.dataflow.composite.task.impl;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -35,7 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.batch.item.database.Order;
-import org.springframework.cloud.dataflow.aggregate.task.DataflowTaskExecutionQueryDao;
+import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao;
 import org.springframework.cloud.task.repository.TaskExecution;
 import org.springframework.cloud.task.repository.database.PagingQueryProvider;
 import org.springframework.cloud.task.repository.database.support.SqlPagingQueryProviderFactoryBean;
@@ -55,13 +55,13 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Provide aggregate data for Boot 3 and Boot <=2 TaskExecutions.
+ * Implementation of the {@link DataflowTaskExecutionQueryDao}.
  *
  * @author Corneil du Plessis
  */
 
-public class AggregateDataFlowTaskExecutionQueryDao implements DataflowTaskExecutionQueryDao {
-	private final static Logger logger = LoggerFactory.getLogger(AggregateDataFlowTaskExecutionQueryDao.class);
+public class DefaultDataFlowTaskExecutionQueryDao implements DataflowTaskExecutionQueryDao {
+	private final static Logger logger = LoggerFactory.getLogger(DefaultDataFlowTaskExecutionQueryDao.class);
 
 	/**
 	 * SELECT clause for task execution.
@@ -74,7 +74,7 @@ public class AggregateDataFlowTaskExecutionQueryDao implements DataflowTaskExecu
 	/**
 	 * FROM clause for task execution.
 	 */
-	public static final String FROM_CLAUSE = "AGGREGATE_TASK_EXECUTION";
+	public static final String FROM_CLAUSE = "TASK_EXECUTION";
 
 	private static final String FIND_TASK_ARGUMENTS = "SELECT TASK_EXECUTION_ID, "
 			+ "TASK_PARAM from TASK_EXECUTION_PARAMS where TASK_EXECUTION_ID = :taskExecutionId";
@@ -87,7 +87,7 @@ public class AggregateDataFlowTaskExecutionQueryDao implements DataflowTaskExecu
 
 	private final static String GET_CHILD_EXECUTION_BY_ID = GET_EXECUTIONS +
 			" where PARENT_EXECUTION_ID = :taskExecutionId" +
-			" and (SELECT COUNT(*) FROM AGGREGATE_TASK_EXECUTION_PARAMS P " +
+			" and (SELECT COUNT(*) FROM TASK_EXECUTION_PARAMS P " +
 			"           WHERE P.TASK_EXECUTION_ID=TASK_EXECUTION_ID " +
 			"             AND P.SCHEMA_TARGET=SCHEMA_TARGET" +
 			"             AND P.TASK_PARAM = :schemaTarget) > 0";
@@ -122,40 +122,35 @@ public class AggregateDataFlowTaskExecutionQueryDao implements DataflowTaskExecu
 	private static final String TASK_EXECUTION_COUNT_BY_NAME = "SELECT COUNT(*) FROM "
 			+ "TASK_EXECUTION where TASK_NAME = :taskName";
 
-	private static final String TASK_EXECUTION_COUNT_BY_NAME_AND_BEFORE_END_TIME = "SELECT COUNT(*) FROM "
-			+ "AGGREGATE_TASK_EXECUTION where TASK_NAME = :taskName AND END_TIME < :endTime";
-
 	private static final String COMPLETED_TASK_EXECUTION_COUNT = "SELECT COUNT(*) FROM "
 			+ "TASK_EXECUTION WHERE END_TIME IS NOT NULL";
 
 	private static final String COMPLETED_TASK_EXECUTION_COUNT_AND_BEFORE_END_TIME = "SELECT COUNT(*) FROM "
 			+ "TASK_EXECUTION WHERE END_TIME IS NOT NULL AND END_TIME < :endTime";
 
 	private static final String COMPLETED_TASK_EXECUTION_COUNT_BY_NAME = "SELECT COUNT(*) FROM "
-			+ "AGGREGATE_TASK_EXECUTION where TASK_NAME = :taskName AND END_TIME IS NOT NULL ";
+			+ "TASK_EXECUTION where TASK_NAME = :taskName AND END_TIME IS NOT NULL ";
 
 	private static final String COMPLETED_TASK_EXECUTION_COUNT_BY_NAME_AND_BEFORE_END_TIME = "SELECT COUNT(*) FROM "
 			+ "TASK_EXECUTION where TASK_NAME = :taskName AND END_TIME IS NOT NULL AND END_TIME < :endTime ";
 
 
 	private static final String RUNNING_TASK_EXECUTION_COUNT_BY_NAME = "SELECT COUNT(*) FROM "
-			+ "AGGREGATE_TASK_EXECUTION where TASK_NAME = :taskName AND END_TIME IS NULL ";
+			+ "TASK_EXECUTION where TASK_NAME = :taskName AND END_TIME IS NULL ";
 
 	private static final String RUNNING_TASK_EXECUTION_COUNT = "SELECT COUNT(*) FROM "
-			+ "AGGREGATE_TASK_EXECUTION where END_TIME IS NULL ";
+			+ "TASK_EXECUTION where END_TIME IS NULL ";
 
 	private static final String LAST_TASK_EXECUTIONS_BY_TASK_NAMES = "select TE2.* from ("
 			+ "select MAX(TE.TASK_EXECUTION_ID) as TASK_EXECUTION_ID, TE.TASK_NAME, TE.START_TIME from ("
 			+ "select TASK_NAME, MAX(START_TIME) as START_TIME"
-			+ "      FROM AGGREGATE_TASK_EXECUTION where TASK_NAME in (:taskNames)"
+			+ "      FROM TASK_EXECUTION where TASK_NAME in (:taskNames)"
 			+ "      GROUP BY TASK_NAME) TE_MAX"
-			+ " inner join AGGREGATE_TASK_EXECUTION TE ON TE.TASK_NAME = TE_MAX.TASK_NAME AND TE.START_TIME = TE_MAX.START_TIME"
+			+ " inner join TASK_EXECUTION TE ON TE.TASK_NAME = TE_MAX.TASK_NAME AND TE.START_TIME = TE_MAX.START_TIME"
 			+ " group by TE.TASK_NAME, TE.START_TIME" + ") TE1"
-			+ " inner join AGGREGATE_TASK_EXECUTION TE2 ON TE1.TASK_EXECUTION_ID = TE2.TASK_EXECUTION_ID AND TE1.SCHEMA_TARGET = TE2.SCHEMA_TARGET"
+			+ " inner join TASK_EXECUTION TE2 ON TE1.TASK_EXECUTION_ID = TE2.TASK_EXECUTION_ID AND TE1.SCHEMA_TARGET = TE2.SCHEMA_TARGET"
 			+ " order by TE2.START_TIME DESC, TE2.TASK_EXECUTION_ID DESC";
 
-	private static final String FIND_TASK_NAMES = "SELECT distinct TASK_NAME from AGGREGATE_TASK_EXECUTION order by TASK_NAME";
-
 	private static final Set<String> validSortColumns = new HashSet<>(10);
 
 	static {
@@ -179,11 +174,11 @@ public class AggregateDataFlowTaskExecutionQueryDao implements DataflowTaskExecu
 	private final LinkedHashMap<String, Order> orderMap;
 
 	/**
-	 * Initializes the AggregateDataFlowJobExecutionDao.
+	 * Initializes the DefaultDataFlowJobExecutionDao.
 	 *
 	 * @param dataSource used by the dao to execute queries and update the tables.
 	 */
-	public AggregateDataFlowTaskExecutionQueryDao(DataSource dataSource) {
+	public DefaultDataFlowTaskExecutionQueryDao(DataSource dataSource) {
 		Assert.notNull(dataSource, "The dataSource must not be null.");
 		this.jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
 		this.dataSource = dataSource;

spring-cloud-dataflow-autoconfigure/src/test/java/org/springframework/cloud/dataflow/autoconfigure/local/AbstractSchedulerPerPlatformTest.java

@@ -29,9 +29,9 @@
 import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.cloud.dataflow.aggregate.task.DataflowTaskExecutionQueryDao;
-import org.springframework.cloud.dataflow.aggregate.task.TaskDefinitionReader;
-import org.springframework.cloud.dataflow.aggregate.task.TaskDeploymentReader;
+import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao;
+import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader;
+import org.springframework.cloud.dataflow.composite.task.TaskDeploymentReader;
 import org.springframework.cloud.dataflow.registry.service.AppRegistryService;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration;

spring-cloud-dataflow-build/pom.xml

@@ -482,11 +482,11 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<parameters>true</parameters>
-				</configuration>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                    <parameters>true</parameters>
+                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppRegistration.java

@@ -21,13 +21,10 @@
 import java.util.Objects;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 
-import org.springframework.cloud.dataflow.schema.AppBootSchemaVersion;
 import org.springframework.util.Assert;
 
 /**
@@ -78,12 +75,6 @@ public class AppRegistration extends AbstractEntity implements Comparable<AppReg
 	 */
 	private Boolean defaultVersion = false;
 
-	/**
-	 * Boot version to identify Task / Batch Schema.
-	 */
-	@Enumerated(EnumType.STRING)
-	private AppBootSchemaVersion bootVersion;
-
 	@Transient
 	private HashSet<String> versions;
 
@@ -134,21 +125,6 @@ public AppRegistration(String name, ApplicationType type, String version, URI ur
 		this.metadataUri = metadataUri;
 	}
 
-	/**
-	 * Construct an {@code AppRegistration} object.
-	 *
-	 * @param name app name
-	 * @param type app type
-	 * @param version app version
-	 * @param uri URI for the app resource
-	 * @param metadataUri URI for the app metadata resource
-	 * @param bootVersion The bootVersion of the application.
-	 */
-	public AppRegistration(String name, ApplicationType type, String version, URI uri, URI metadataUri, AppBootSchemaVersion bootVersion) {
-		this(name,type,version,uri,metadataUri);
-		this.bootVersion = bootVersion;
-	}
-
 	/**
 	 * @return the name of the app
 	 */
@@ -201,14 +177,6 @@ public void setMetadataUri(URI metadataUri) {
 		this.metadataUri = metadataUri;
 	}
 
-	public AppBootSchemaVersion getBootVersion() {
-		return bootVersion == null ? AppBootSchemaVersion.defaultVersion() : bootVersion;
-	}
-
-	public void setBootVersion(AppBootSchemaVersion bootVersion) {
-		this.bootVersion = bootVersion;
-	}
-
 	public Boolean isDefaultVersion() {
 		return this.defaultVersion;
 	}
@@ -229,8 +197,7 @@ public void setVersions(HashSet<String> versions) {
 	public String toString() {
 		return "AppRegistration{" + "name='" + this.getName() + '\'' + ", type='" + this.getType()
 				+ '\'' + ", version='" + this.getVersion() + '\'' + ", uri=" + this.getUri()
-				+ ", metadataUri=" + this.getMetadataUri() +
-				", bootVersion='" + this.getBootVersion().getBootVersion() + '}';
+				+ ", metadataUri=" + this.getMetadataUri() + '}';
 	}
 
 	@Override