diff --git a/pom.xml b/pom.xml index dc790e48d7..6de9d97a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,6 @@ spring-cloud-dataflow-configuration-metadata spring-cloud-dataflow-core-dsl spring-cloud-dataflow-core - spring-cloud-dataflow-aggregate-task spring-cloud-dataflow-server-core spring-cloud-dataflow-rest-resource spring-cloud-dataflow-audit diff --git a/spring-cloud-dataflow-aggregate-task/README.adoc b/spring-cloud-dataflow-aggregate-task/README.adoc deleted file mode 100644 index 54ea33b3a3..0000000000 --- a/spring-cloud-dataflow-aggregate-task/README.adoc +++ /dev/null @@ -1,10 +0,0 @@ -= Spring Cloud Dataflow Aggregate Task Module - -Spring Cloud Task and Spring Batch utilize a series of database tables to support storing data about Boot Application executions as well as Job executions. -For each major release of these projects, their database schemas adjust to meet the needs for the latest release. -SCDF supports applications that may use the current release of these projects as well as a previous release. -The `spring-cloud-dataflow-aggregate-task` module provides support for dataflow to query and mutate data in each of the schema versions. - -== Tests - -The tests for this module are located in the `spring-cloud-dataflow-server` module \ No newline at end of file diff --git a/spring-cloud-dataflow-aggregate-task/pom.xml b/spring-cloud-dataflow-aggregate-task/pom.xml deleted file mode 100644 index 7b0686990e..0000000000 --- a/spring-cloud-dataflow-aggregate-task/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dataflow-parent - 3.0.0-SNAPSHOT - ../spring-cloud-dataflow-parent - - spring-cloud-dataflow-aggregate-task - spring-cloud-dataflow-aggregate-task - Spring Cloud Data Flow Aggregate Task - - jar - - true - 3.4.1 - - - - org.springframework - spring-core - - - org.springframework - spring-context - compile - - - org.springframework.cloud - spring-cloud-task-batch - - - org.springframework.cloud - spring-cloud-dataflow-core - ${project.version} - - - org.springframework.cloud - spring-cloud-dataflow-registry - ${project.version} - - - org.slf4j - slf4j-api - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework.boot - spring-boot-starter-test - - - com.h2database - h2 - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0 - - 1 - 1 - false - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - source - - jar - - package - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - javadoc - - jar - - package - - - - - - diff --git a/spring-cloud-dataflow-aggregate-task/src/test/resources/logback-test.xml b/spring-cloud-dataflow-aggregate-task/src/test/resources/logback-test.xml deleted file mode 100644 index fe13492971..0000000000 --- a/spring-cloud-dataflow-aggregate-task/src/test/resources/logback-test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/spring-cloud-dataflow-autoconfigure/src/test/java/org/springframework/cloud/dataflow/autoconfigure/local/AbstractSchedulerPerPlatformTest.java b/spring-cloud-dataflow-autoconfigure/src/test/java/org/springframework/cloud/dataflow/autoconfigure/local/AbstractSchedulerPerPlatformTest.java index aaf9ed380d..f6835c22ce 100644 --- a/spring-cloud-dataflow-autoconfigure/src/test/java/org/springframework/cloud/dataflow/autoconfigure/local/AbstractSchedulerPerPlatformTest.java +++ b/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.composite.task.DataflowTaskExecutionQueryDao; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; -import org.springframework.cloud.dataflow.composite.task.TaskDeploymentReader; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.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; diff --git a/spring-cloud-dataflow-server-core/pom.xml b/spring-cloud-dataflow-server-core/pom.xml index a3f452f809..b570df2472 100644 --- a/spring-cloud-dataflow-server-core/pom.xml +++ b/spring-cloud-dataflow-server-core/pom.xml @@ -50,11 +50,6 @@ org.hibernate.orm hibernate-micrometer - - org.springframework.cloud - spring-cloud-dataflow-aggregate-task - ${dataflow.version} - org.springframework.cloud spring-cloud-dataflow-common-flyway diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowControllerAutoConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowControllerAutoConfiguration.java index fabeabf522..7075769167 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowControllerAutoConfiguration.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowControllerAutoConfiguration.java @@ -100,7 +100,7 @@ import org.springframework.cloud.dataflow.server.job.LauncherRepository; import org.springframework.cloud.dataflow.server.repository.StreamDefinitionRepository; import org.springframework.cloud.dataflow.server.repository.TaskDefinitionRepository; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.server.service.LauncherService; import org.springframework.cloud.dataflow.server.service.SchedulerService; import org.springframework.cloud.dataflow.server.service.SpringSecurityAuditorAware; @@ -131,7 +131,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.core.env.PropertyResolver; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.hateoas.mediatype.MessageResolver; @@ -269,7 +268,7 @@ public static class TaskEnabledConfiguration { @Bean public TaskExecutionController taskExecutionController( - CompositeTaskExplorer explorer, + DataflowTaskExplorer explorer, TaskExecutionService taskExecutionService, TaskDefinitionRepository taskDefinitionRepository, TaskExecutionInfoService taskExecutionInfoService, @@ -295,14 +294,14 @@ public TaskPlatformController taskLauncherController(LauncherService launcherSer public TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider( TaskExecutionService taskExecutionService, TaskJobService taskJobService, - CompositeTaskExplorer taskExplorer + DataflowTaskExplorer taskExplorer ) { return new DefaultTaskDefinitionAssemblerProvider(taskExecutionService, taskJobService, taskExplorer); } @Bean public TaskDefinitionController taskDefinitionController( - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository repository, TaskSaveService taskSaveService, TaskDeleteService taskDeleteService, diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java index dbb7bf1649..5e3b3c72f5 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.batch.BatchProperties; import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskConfiguration; +import org.springframework.cloud.dataflow.server.task.DataflowTaskConfiguration; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.completion.CompletionConfiguration; import org.springframework.cloud.dataflow.registry.repository.AppRegistrationRepositoryCustom; @@ -65,7 +65,7 @@ FeaturesConfiguration.class, WebConfiguration.class, H2ServerConfiguration.class, - CompositeTaskConfiguration.class, + DataflowTaskConfiguration.class, DataFlowTaskConfiguration.class }) @EnableConfigurationProperties({ BatchProperties.class, CommonApplicationProperties.class }) diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowTaskConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowTaskConfiguration.java index 14c023363b..854afd9efc 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowTaskConfiguration.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowTaskConfiguration.java @@ -23,8 +23,8 @@ import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory; import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; -import org.springframework.cloud.dataflow.composite.task.TaskDeploymentReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDeploymentReader; import org.springframework.cloud.dataflow.core.database.support.MultiSchemaIncrementerFactory; import org.springframework.cloud.dataflow.server.batch.AllInOneExecutionContextSerializer; import org.springframework.cloud.dataflow.server.batch.JdbcSearchableJobExecutionDao; diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/features/TaskConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/features/TaskConfiguration.java index 8ed30ef6a6..a2bae4aed2 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/features/TaskConfiguration.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/features/TaskConfiguration.java @@ -26,12 +26,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskConfiguration; -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.composite.task.impl.DefaultDataFlowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskConfiguration; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDeploymentReader; +import org.springframework.cloud.dataflow.server.task.impl.DefaultDataFlowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.configuration.metadata.ApplicationConfigurationMetadataResolver; import org.springframework.cloud.dataflow.core.TaskPlatform; @@ -103,7 +103,7 @@ @EnableTransactionManagement @Import({ TaskConfiguration.TaskDeleteServiceConfig.class, - CompositeTaskConfiguration.class, + DataflowTaskConfiguration.class, DataFlowTaskConfiguration.class }) public class TaskConfiguration { @@ -171,7 +171,7 @@ public TaskPlatform localTaskPlatform( @Bean public TaskExecutionInfoService taskDefinitionRetriever( AppRegistryService registry, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskConfigurationProperties taskConfigurationProperties, LauncherRepository launcherRepository, @@ -234,7 +234,7 @@ public TaskExecutionService taskService( TaskDefinitionRepository taskDefinitionRepository, TaskExecutionCreationService taskExecutionRepositoryService, TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, DataflowTaskExecutionDao dataflowTaskExecutionDao, DataflowTaskExecutionMetadataDao dataflowTaskExecutionMetadataDao, DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao, @@ -269,7 +269,7 @@ public static class TaskJobServiceConfig { @Bean public TaskJobService taskJobExecutionRepository( JobService service, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskExecutionService taskExecutionService, LauncherRepository launcherRepository) { @@ -287,7 +287,7 @@ public TaskJobService taskJobExecutionRepository( public static class TaskDeleteServiceConfig { @Bean public TaskDeleteService deleteTaskService( - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, LauncherRepository launcherRepository, TaskDefinitionRepository taskDefinitionRepository, TaskDeploymentRepository taskDeploymentRepository, diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskDefinitionController.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskDefinitionController.java index 7635e4b415..eb455ca5ee 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskDefinitionController.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskDefinitionController.java @@ -34,7 +34,7 @@ import org.springframework.cloud.dataflow.server.repository.NoSuchTaskDefinitionException; import org.springframework.cloud.dataflow.server.repository.TaskDefinitionRepository; import org.springframework.cloud.dataflow.server.repository.TaskQueryParamException; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.server.service.TaskDeleteService; import org.springframework.cloud.dataflow.server.service.TaskSaveService; import org.springframework.cloud.dataflow.server.service.impl.TaskServiceUtils; @@ -78,7 +78,7 @@ public class TaskDefinitionController { private final TaskDeleteService taskDeleteService; - private final CompositeTaskExplorer explorer; + private final DataflowTaskExplorer explorer; private final TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider; @@ -95,9 +95,9 @@ public class TaskDefinitionController { * @param taskDeleteService handles Task deletion related operations. * @param taskDefinitionAssemblerProvider the task definition assembler provider to use. */ - public TaskDefinitionController(CompositeTaskExplorer taskExplorer, TaskDefinitionRepository repository, - TaskSaveService taskSaveService, TaskDeleteService taskDeleteService, - TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider) { + public TaskDefinitionController(DataflowTaskExplorer taskExplorer, TaskDefinitionRepository repository, + TaskSaveService taskSaveService, TaskDeleteService taskDeleteService, + TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider) { Assert.notNull(taskExplorer, "taskExplorer must not be null"); Assert.notNull(repository, "repository must not be null"); Assert.notNull(taskSaveService, "taskSaveService must not be null"); diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionController.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionController.java index 941cfcae72..28e4dc679e 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionController.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionController.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; import org.springframework.batch.core.launch.NoSuchJobExecutionException; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.LaunchResponse; import org.springframework.cloud.dataflow.core.PlatformTaskExecutionInformation; import org.springframework.cloud.dataflow.core.TaskDefinition; @@ -102,7 +102,7 @@ public class TaskExecutionController { private final TaskDeleteService taskDeleteService; - private final CompositeTaskExplorer explorer; + private final DataflowTaskExplorer explorer; private final TaskJobService taskJobService; @@ -131,7 +131,7 @@ public class TaskExecutionController { * @param taskDeleteService the task deletion service * @param taskJobService the task job service */ - public TaskExecutionController(CompositeTaskExplorer explorer, + public TaskExecutionController(DataflowTaskExplorer explorer, TaskExecutionService taskExecutionService, TaskDefinitionRepository taskDefinitionRepository, TaskExecutionInfoService taskExecutionInfoService, diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssembler.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssembler.java index 2e01ebf4b4..d7927cbb5e 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssembler.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssembler.java @@ -32,7 +32,7 @@ import org.springframework.cloud.dataflow.rest.util.TaskSanitizer; import org.springframework.cloud.dataflow.server.controller.TaskDefinitionController; import org.springframework.cloud.dataflow.server.controller.support.TaskExecutionAwareTaskDefinition; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.server.service.TaskExecutionService; import org.springframework.cloud.dataflow.server.service.TaskJobService; import org.springframework.cloud.dataflow.server.service.impl.TaskServiceUtils; @@ -57,7 +57,7 @@ public class DefaultTaskDefinitionAssembler ex private final TaskJobService taskJobService; - private final CompositeTaskExplorer taskExplorer; + private final DataflowTaskExplorer taskExplorer; private final TaskSanitizer taskSanitizer = new TaskSanitizer(); @@ -71,7 +71,7 @@ public DefaultTaskDefinitionAssembler( boolean enableManifest, Class classType, TaskJobService taskJobService, - CompositeTaskExplorer taskExplorer) { + DataflowTaskExplorer taskExplorer) { super(TaskDefinitionController.class, classType); this.taskExecutionService = taskExecutionService; this.enableManifest = enableManifest; diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssemblerProvider.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssemblerProvider.java index 0860cb8338..62fd044e04 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssemblerProvider.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssemblerProvider.java @@ -16,7 +16,7 @@ package org.springframework.cloud.dataflow.server.controller.assembler; import org.springframework.cloud.dataflow.rest.resource.TaskDefinitionResource; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.server.service.TaskExecutionService; import org.springframework.cloud.dataflow.server.service.TaskJobService; import org.springframework.util.Assert; @@ -31,14 +31,14 @@ public class DefaultTaskDefinitionAssemblerProvider implements TaskDefinitionAss private final TaskExecutionService taskExecutionService; - private final CompositeTaskExplorer taskExplorer; + private final DataflowTaskExplorer taskExplorer; private final TaskJobService taskJobService; public DefaultTaskDefinitionAssemblerProvider( TaskExecutionService taskExecutionService, TaskJobService taskJobService, - CompositeTaskExplorer taskExplorer + DataflowTaskExplorer taskExplorer ) { Assert.notNull(taskExecutionService, "taskExecutionService required"); Assert.notNull(taskJobService, "taskJobService required"); diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDefinitionReader.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDefinitionReader.java index d78f781d5f..b8f2b6010b 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDefinitionReader.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDefinitionReader.java @@ -15,7 +15,7 @@ */ package org.springframework.cloud.dataflow.server.repository; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.core.TaskDefinition; /** diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDeploymentReader.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDeploymentReader.java index 3b479c5a0f..5477bae49d 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDeploymentReader.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/DefaultTaskDeploymentReader.java @@ -15,7 +15,7 @@ */ package org.springframework.cloud.dataflow.server.repository; -import org.springframework.cloud.dataflow.composite.task.TaskDeploymentReader; +import org.springframework.cloud.dataflow.server.task.TaskDeploymentReader; import org.springframework.cloud.dataflow.core.TaskDeployment; /** diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteService.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteService.java index c43a9c0fbe..1cd18a97e2 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteService.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteService.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.core.AuditActionType; import org.springframework.cloud.dataflow.core.AuditOperationType; @@ -93,7 +93,7 @@ public class DefaultTaskDeleteService implements TaskDeleteService { /** * Used to read TaskExecutions. */ - private final CompositeTaskExplorer taskExplorer; + private final DataflowTaskExplorer taskExplorer; private final LauncherRepository launcherRepository; @@ -118,7 +118,7 @@ public class DefaultTaskDeleteService implements TaskDeleteService { private final DataSource dataSource; public DefaultTaskDeleteService( - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, LauncherRepository launcherRepository, TaskDefinitionRepository taskDefinitionRepository, TaskDeploymentRepository taskDeploymentRepository, diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionInfoService.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionInfoService.java index 3f4f953836..039d7108d9 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionInfoService.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionInfoService.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.AllPlatformsTaskExecutionInformation; import org.springframework.cloud.dataflow.core.AppRegistration; import org.springframework.cloud.dataflow.core.ApplicationType; @@ -80,7 +80,7 @@ public class DefaultTaskExecutionInfoService implements TaskExecutionInfoService /** * Used to read TaskExecutions. */ - private final CompositeTaskExplorer taskExplorer; + private final DataflowTaskExplorer taskExplorer; private final TaskDefinitionRepository taskDefinitionRepository; @@ -108,7 +108,7 @@ public class DefaultTaskExecutionInfoService implements TaskExecutionInfoService public DefaultTaskExecutionInfoService( DataSourceProperties dataSourceProperties, AppRegistryService appRegistryService, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskConfigurationProperties taskConfigurationProperties, LauncherRepository launcherRepository, @@ -140,7 +140,7 @@ public DefaultTaskExecutionInfoService( public DefaultTaskExecutionInfoService( DataSourceProperties dataSourceProperties, AppRegistryService appRegistryService, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskConfigurationProperties taskConfigurationProperties, LauncherRepository launcherRepository, diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionService.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionService.java index 699a5ca872..13b5b1991d 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionService.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionService.java @@ -37,8 +37,8 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.core.AuditActionType; import org.springframework.cloud.dataflow.core.AuditOperationType; @@ -134,7 +134,7 @@ public class DefaultTaskExecutionService implements TaskExecutionService { private final TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator; - private final CompositeTaskExplorer taskExplorer; + private final DataflowTaskExplorer taskExplorer; private final DataflowTaskExecutionDao dataflowTaskExecutionDao; @@ -197,7 +197,7 @@ public DefaultTaskExecutionService( TaskDefinitionRepository taskDefinitionRepository, TaskExecutionCreationService taskExecutionRepositoryService, TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, DataflowTaskExecutionDao dataflowTaskExecutionDao, DataflowTaskExecutionMetadataDao dataflowTaskExecutionMetadataDao, DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao, @@ -255,7 +255,7 @@ public DefaultTaskExecutionService( TaskDefinitionRepository taskDefinitionRepository, TaskExecutionCreationService taskExecutionRepositoryService, TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, DataflowTaskExecutionDao dataflowTaskExecutionDao, DataflowTaskExecutionMetadataDao dataflowTaskExecutionMetadataDao, DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao, diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java index 8fc2c4703c..4b618e4004 100644 --- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java @@ -36,7 +36,7 @@ import org.springframework.batch.core.launch.NoSuchJobException; import org.springframework.batch.core.launch.NoSuchJobExecutionException; import org.springframework.batch.core.launch.NoSuchJobInstanceException; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.Launcher; import org.springframework.cloud.dataflow.core.TaskDefinition; import org.springframework.cloud.dataflow.core.TaskManifest; @@ -76,7 +76,7 @@ public class DefaultTaskJobService implements TaskJobService { private final TaskExecutionService taskExecutionService; - private final CompositeTaskExplorer taskExplorer; + private final DataflowTaskExplorer taskExplorer; private final JobService jobService; @@ -87,7 +87,7 @@ public class DefaultTaskJobService implements TaskJobService { public DefaultTaskJobService( JobService jobService, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskExecutionService taskExecutionService, LauncherRepository launcherRepository) { diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskConfiguration.java similarity index 83% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskConfiguration.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskConfiguration.java index 18a252f7ee..6a6972ae9e 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskConfiguration.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.dataflow.composite.task; +package org.springframework.cloud.dataflow.server.task; import javax.sql.DataSource; -import org.springframework.cloud.dataflow.composite.task.impl.DefaultCompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.impl.DefaultDataflowTaskExplorer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; @@ -28,10 +28,10 @@ * @author Corneil du Plessis */ @Configuration -public class CompositeTaskConfiguration { +public class DataflowTaskConfiguration { @Bean - public CompositeTaskExplorer aggregateTaskExplorer( + public DataflowTaskExplorer aggregateTaskExplorer( DataSource dataSource, DataflowTaskExecutionQueryDao taskExecutionQueryDao, TaskDefinitionReader taskDefinitionReader, @@ -41,7 +41,7 @@ public CompositeTaskExplorer aggregateTaskExplorer( Assert.notNull(taskExecutionQueryDao, "taskExecutionQueryDao required"); Assert.notNull(taskDefinitionReader, "taskDefinitionReader required"); Assert.notNull(taskDeploymentReader, "taskDeploymentReader required"); - return new DefaultCompositeTaskExplorer(dataSource, + return new DefaultDataflowTaskExplorer(dataSource, taskExecutionQueryDao, taskDefinitionReader, taskDeploymentReader); diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/DataflowTaskExecutionQueryDao.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskExecutionQueryDao.java similarity index 99% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/DataflowTaskExecutionQueryDao.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskExecutionQueryDao.java index 4c63721363..4e36367e50 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/DataflowTaskExecutionQueryDao.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/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.composite.task; +package org.springframework.cloud.dataflow.server.task; import java.util.Collection; import java.util.Date; diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskExplorer.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskExplorer.java similarity index 98% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskExplorer.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskExplorer.java index 4f0cef5ddb..22e68c7a60 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/CompositeTaskExplorer.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/DataflowTaskExplorer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.dataflow.composite.task; +package org.springframework.cloud.dataflow.server.task; import java.util.Collection; import java.util.Date; @@ -29,7 +29,7 @@ * * @author Corneil du Plessis */ -public interface CompositeTaskExplorer { +public interface DataflowTaskExplorer { /** * find a task execution given an execution id and schema target. * diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDefinitionReader.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/TaskDefinitionReader.java similarity index 73% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDefinitionReader.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/TaskDefinitionReader.java index 52edf81eb8..884420c981 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDefinitionReader.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/TaskDefinitionReader.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.dataflow.composite.task; +package org.springframework.cloud.dataflow.server.task; import org.springframework.cloud.dataflow.core.TaskDefinition; diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDeploymentReader.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/TaskDeploymentReader.java similarity index 84% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDeploymentReader.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/TaskDeploymentReader.java index fc3776376d..9ce0845bd8 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/TaskDeploymentReader.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/TaskDeploymentReader.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.dataflow.composite.task; +package org.springframework.cloud.dataflow.server.task; import java.util.List; diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultDataFlowTaskExecutionQueryDao.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/impl/DefaultDataFlowTaskExecutionQueryDao.java similarity index 99% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultDataFlowTaskExecutionQueryDao.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/impl/DefaultDataFlowTaskExecutionQueryDao.java index 580103402a..596074817d 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultDataFlowTaskExecutionQueryDao.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/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.composite.task.impl; +package org.springframework.cloud.dataflow.server.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.composite.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.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; diff --git a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultCompositeTaskExplorer.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/impl/DefaultDataflowTaskExplorer.java similarity index 90% rename from spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultCompositeTaskExplorer.java rename to spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/impl/DefaultDataflowTaskExplorer.java index 6a6995ff63..6431dfa1f2 100644 --- a/spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/composite/task/impl/DefaultCompositeTaskExplorer.java +++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/task/impl/DefaultDataflowTaskExplorer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.dataflow.composite.task.impl; +package org.springframework.cloud.dataflow.server.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.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.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDeploymentReader; import org.springframework.cloud.dataflow.core.TaskDefinition; import org.springframework.cloud.dataflow.core.TaskDeployment; import org.springframework.cloud.task.repository.TaskExecution; @@ -41,12 +41,12 @@ import org.springframework.util.Assert; /** - * Implements CompositeTaskExplorer. This class will be responsible for retrieving task execution data for all schema targets. + * Implements DataflowTaskExplorer. This class will be responsible for retrieving task execution data for all schema targets. * * @author Corneil du Plessis */ -public class DefaultCompositeTaskExplorer implements CompositeTaskExplorer { - private final static Logger logger = LoggerFactory.getLogger(DefaultCompositeTaskExplorer.class); +public class DefaultDataflowTaskExplorer implements DataflowTaskExplorer { + private final static Logger logger = LoggerFactory.getLogger(DefaultDataflowTaskExplorer.class); private final TaskExplorer taskExplorer; @@ -56,7 +56,7 @@ public class DefaultCompositeTaskExplorer implements CompositeTaskExplorer { private final TaskDeploymentReader taskDeploymentReader; - public DefaultCompositeTaskExplorer( + public DefaultDataflowTaskExplorer( DataSource dataSource, DataflowTaskExecutionQueryDao taskExecutionQueryDao, TaskDefinitionReader taskDefinitionReader, diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/JobDependencies.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/JobDependencies.java index 8584920eda..80d33b495b 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/JobDependencies.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/JobDependencies.java @@ -41,10 +41,10 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskConfiguration; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao; -import org.springframework.cloud.dataflow.composite.task.impl.DefaultDataFlowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskConfiguration; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.impl.DefaultDataFlowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.repository.AuditRecordRepository; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.audit.service.DefaultAuditRecordService; @@ -134,7 +134,7 @@ @Configuration @EnableSpringDataWebSupport @Import({ - CompositeTaskConfiguration.class, + DataflowTaskConfiguration.class, DataFlowTaskConfiguration.class }) @ImportAutoConfiguration({ @@ -247,7 +247,7 @@ public JobInstanceController jobInstanceController(TaskJobService repository) { @Bean public TaskExecutionController taskExecutionController( - CompositeTaskExplorer explorer, + DataflowTaskExplorer explorer, TaskExecutionService taskExecutionService, TaskDefinitionRepository taskDefinitionRepository, TaskExecutionInfoService taskExecutionInfoService, @@ -288,7 +288,7 @@ public TaskLogsController taskLogsController(TaskExecutionService taskExecutionS @Bean public TaskJobService taskJobExecutionRepository( JobService jobService, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskExecutionService taskExecutionService, LauncherRepository launcherRepository @@ -303,7 +303,7 @@ public TaskJobService taskJobExecutionRepository( @Bean public TaskDeleteService deleteTaskService( - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, LauncherRepository launcherRepository, TaskDefinitionRepository taskDefinitionRepository, TaskDeploymentRepository taskDeploymentRepository, @@ -362,7 +362,7 @@ public TaskExecutionService taskService( TaskDeploymentRepository taskDeploymentRepository, TaskExecutionCreationService taskExecutionRepositoryService, TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, DataflowTaskExecutionDao dataflowTaskExecutionDao, DataflowTaskExecutionMetadataDao dataflowTaskExecutionMetadataDao, DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao, @@ -394,7 +394,7 @@ public TaskExecutionService taskService( @Bean public TaskExecutionInfoService taskDefinitionRetriever( AppRegistryService registry, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskConfigurationProperties taskConfigurationProperties, LauncherRepository launcherRepository, diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TaskServiceDependencies.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TaskServiceDependencies.java index 3ab9855fd3..fb0d3d4eeb 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TaskServiceDependencies.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TaskServiceDependencies.java @@ -39,10 +39,10 @@ import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskConfiguration; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao; -import org.springframework.cloud.dataflow.composite.task.impl.DefaultDataFlowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskConfiguration; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.impl.DefaultDataFlowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.repository.AuditRecordRepository; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.audit.service.DefaultAuditRecordService; @@ -125,7 +125,7 @@ @EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL) @Import({ CompletionConfiguration.class, - CompositeTaskConfiguration.class, + DataflowTaskConfiguration.class, DataFlowTaskConfiguration.class }) @ImportAutoConfiguration({ @@ -255,7 +255,7 @@ public SchedulerServiceProperties schedulerServiceProperties() { @Bean public TaskDeleteService deleteTaskService( - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, LauncherRepository launcherRepository, TaskDefinitionRepository taskDefinitionRepository, TaskDeploymentRepository taskDeploymentRepository, @@ -313,7 +313,7 @@ public TaskExecutionService defaultTaskService( TaskDeploymentRepository taskDeploymentRepository, TaskExecutionCreationService taskExecutionRepositoryService, TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, DataflowTaskExecutionDao dataflowTaskExecutionDao, DataflowTaskExecutionMetadataDao dataflowTaskExecutionMetadataDao, DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao, @@ -358,7 +358,7 @@ public DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao( @ConditionalOnMissingBean public TaskExecutionInfoService taskDefinitionRetriever( AppRegistryService registry, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskConfigurationProperties taskConfigurationProperties, LauncherRepository launcherRepository, diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TestDependencies.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TestDependencies.java index 6b7b227b75..a10e674a6c 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TestDependencies.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TestDependencies.java @@ -52,10 +52,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; import org.springframework.cloud.common.security.support.SecurityStateBean; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskConfiguration; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao; -import org.springframework.cloud.dataflow.composite.task.impl.DefaultDataFlowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskConfiguration; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.impl.DefaultDataFlowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.repository.AuditRecordRepository; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.audit.service.DefaultAuditRecordService; @@ -202,7 +202,7 @@ @EnableSpringDataWebSupport @Import({ CompletionConfiguration.class, - CompositeTaskConfiguration.class, + DataflowTaskConfiguration.class, DataFlowTaskConfiguration.class, ContainerRegistryAutoConfiguration.class, TaskConfiguration.TaskJobServiceConfig.class @@ -547,13 +547,13 @@ public RuntimeAppInstanceController appInstanceController(StreamDeployer streamD public TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider( TaskExecutionService taskExecutionService, TaskJobService taskJobService, - CompositeTaskExplorer taskExplorer) { + DataflowTaskExplorer taskExplorer) { return new DefaultTaskDefinitionAssemblerProvider(taskExecutionService, taskJobService, taskExplorer); } @Bean public TaskDefinitionController taskDefinitionController( - CompositeTaskExplorer explorer, TaskDefinitionRepository repository, + DataflowTaskExplorer explorer, TaskDefinitionRepository repository, TaskSaveService taskSaveService, TaskDeleteService taskDeleteService, TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider ) { @@ -567,7 +567,7 @@ public TaskDefinitionController taskDefinitionController( @Bean public TaskExecutionController taskExecutionController( - CompositeTaskExplorer explorer, + DataflowTaskExplorer explorer, ApplicationConfigurationMetadataResolver metadataResolver, AppRegistryService appRegistry, LauncherRepository launcherRepository, @@ -641,7 +641,7 @@ public Launcher launcher() { @Bean public TaskDeleteService deleteTaskService( - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, LauncherRepository launcherRepository, TaskDefinitionRepository taskDefinitionRepository, TaskDeploymentRepository taskDeploymentRepository, @@ -701,7 +701,7 @@ public TaskExecutionService taskService( TaskDeploymentRepository taskDeploymentRepository, TaskExecutionCreationService taskExecutionRepositoryService, TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, DataflowTaskExecutionDao dataflowTaskExecutionDao, DataflowTaskExecutionMetadataDao dataflowTaskExecutionMetadataDao, DataflowTaskExecutionQueryDao dataflowTaskExecutionQueryDao, @@ -734,7 +734,7 @@ public TaskExecutionService taskService( @Bean public TaskExecutionInfoService taskDefinitionRetriever( AppRegistryService registry, - CompositeTaskExplorer taskExplorer, + DataflowTaskExplorer taskExplorer, TaskDefinitionRepository taskDefinitionRepository, TaskConfigurationProperties taskConfigurationProperties, LauncherRepository launcherRepository, diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java index 0cf8c6fed3..3af6171ff8 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java @@ -37,7 +37,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.server.config.apps.CommonApplicationProperties; import org.springframework.cloud.dataflow.server.configuration.JobDependencies; import org.springframework.cloud.task.batch.listener.TaskBatchDao; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java index 174df9a40b..e5f36e4910 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionThinControllerTests.java @@ -34,7 +34,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.rest.job.support.TimeUtils; import org.springframework.cloud.dataflow.server.config.apps.CommonApplicationProperties; import org.springframework.cloud.dataflow.server.configuration.JobDependencies; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionUtils.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionUtils.java index 0989dac2cf..97596b896f 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionUtils.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobExecutionUtils.java @@ -34,7 +34,7 @@ import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.JobRestartException; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.rest.support.jackson.ISO8601DateFormatWithMilliSeconds; import org.springframework.cloud.dataflow.rest.support.jackson.Jackson2DataflowModule; import org.springframework.cloud.task.batch.listener.TaskBatchDao; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java index 05bdb2a777..0e5bc0fd3b 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java @@ -38,7 +38,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.server.config.apps.CommonApplicationProperties; import org.springframework.cloud.dataflow.server.configuration.JobDependencies; import org.springframework.cloud.task.batch.listener.TaskBatchDao; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java index 7c14505bfe..1b8c1c0d85 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionControllerTests.java @@ -38,7 +38,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.rest.support.jackson.ISO8601DateFormatWithMilliSeconds; import org.springframework.cloud.dataflow.rest.support.jackson.Jackson2DataflowModule; import org.springframework.cloud.dataflow.server.config.apps.CommonApplicationProperties; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskControllerTests.java index c9101e860d..65b93d6f22 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskControllerTests.java @@ -42,7 +42,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.ApplicationType; import org.springframework.cloud.dataflow.core.Launcher; import org.springframework.cloud.dataflow.core.TaskDefinition; @@ -127,7 +127,7 @@ public class TaskControllerTests { private LauncherRepository launcherRepository; @Autowired - private CompositeTaskExplorer taskExplorer; + private DataflowTaskExplorer taskExplorer; @Autowired private TaskSaveService taskSaveService; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java index 1f0231032a..a475b9f38a 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerCleanupAsyncTests.java @@ -35,7 +35,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.core.Launcher; import org.springframework.cloud.dataflow.core.TaskDefinition; import org.springframework.cloud.dataflow.core.TaskDeployment; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java index 06af9c6d2c..a27e18906d 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java @@ -45,7 +45,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.ApplicationType; import org.springframework.cloud.dataflow.core.Launcher; import org.springframework.cloud.dataflow.core.TaskDefinition; @@ -147,7 +147,7 @@ public class TaskExecutionControllerTests { private WebApplicationContext wac; @Autowired - private CompositeTaskExplorer taskExplorer; + private DataflowTaskExplorer taskExplorer; @Autowired private TaskExecutionService taskExecutionService; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java index d7e9634bd6..472e988508 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/repository/TaskExecutionExplorerTests.java @@ -35,7 +35,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.AppRegistration; import org.springframework.cloud.dataflow.core.ApplicationType; import org.springframework.cloud.dataflow.core.TaskDefinition; @@ -70,7 +70,7 @@ public class TaskExecutionExplorerTests { private DataSource dataSource; @Autowired - private CompositeTaskExplorer explorer; + private DataflowTaskExplorer explorer; private JdbcTemplate template; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteServiceTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteServiceTests.java index b779db92d6..7adf0a4123 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteServiceTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskDeleteServiceTests.java @@ -39,8 +39,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.core.Launcher; import org.springframework.cloud.dataflow.core.TaskDefinition; import org.springframework.cloud.dataflow.server.batch.JdbcSearchableJobExecutionDao; @@ -97,7 +97,7 @@ public abstract class DefaultTaskDeleteServiceTests { TaskDefinitionRepository taskDefinitionRepository; @Autowired - CompositeTaskExplorer taskExplorer; + DataflowTaskExplorer taskExplorer; @Autowired TaskDeleteService taskDeleteService; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTests.java index 01133f72c4..087de67959 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTests.java @@ -45,8 +45,8 @@ import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.core.AppRegistration; import org.springframework.cloud.dataflow.core.ApplicationType; @@ -160,7 +160,7 @@ public abstract class DefaultTaskExecutionServiceTests { TaskExecutionService taskExecutionService; @Autowired - CompositeTaskExplorer taskExplorer; + DataflowTaskExplorer taskExplorer; @Autowired LauncherRepository launcherRepository; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTransactionTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTransactionTests.java index 9557f39286..223444d1ed 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTransactionTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionServiceTransactionTests.java @@ -33,8 +33,8 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.common.security.core.support.OAuth2TokenUtilsService; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; -import org.springframework.cloud.dataflow.composite.task.DataflowTaskExecutionQueryDao; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExecutionQueryDao; import org.springframework.cloud.dataflow.audit.service.AuditRecordService; import org.springframework.cloud.dataflow.core.AppRegistration; import org.springframework.cloud.dataflow.core.ApplicationType; @@ -121,7 +121,7 @@ public class DefaultTaskExecutionServiceTransactionTests { TaskAppDeploymentRequestCreator taskAppDeploymentRequestCreator; @Autowired - CompositeTaskExplorer taskExplorer; + DataflowTaskExplorer taskExplorer; @Autowired TaskConfigurationProperties taskConfigurationProperties; diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobServiceTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobServiceTests.java index 0aeaf5e578..f122af78aa 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobServiceTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobServiceTests.java @@ -45,7 +45,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.dataflow.composite.task.TaskDefinitionReader; +import org.springframework.cloud.dataflow.server.task.TaskDefinitionReader; import org.springframework.cloud.dataflow.core.AppRegistration; import org.springframework.cloud.dataflow.core.ApplicationType; import org.springframework.cloud.dataflow.core.Launcher; diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/AbstractSmokeTest.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/AbstractSmokeTest.java index d416649426..dd7c31e80a 100644 --- a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/AbstractSmokeTest.java +++ b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/AbstractSmokeTest.java @@ -36,7 +36,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; -import org.springframework.cloud.dataflow.composite.task.CompositeTaskExplorer; +import org.springframework.cloud.dataflow.server.task.DataflowTaskExplorer; import org.springframework.cloud.dataflow.core.StreamDefinition; import org.springframework.cloud.dataflow.rest.job.TaskJobExecution; import org.springframework.cloud.dataflow.server.controller.support.TaskExecutionControllerDeleteAction; @@ -72,7 +72,7 @@ public abstract class AbstractSmokeTest { private TaskRepository taskRepository; @Autowired - private CompositeTaskExplorer taskExplorer; + private DataflowTaskExplorer taskExplorer; @Autowired private StreamDefinitionRepository streamDefinitionRepository;