From b147f4da97ea702dca6a4a46b65226267ca45dde Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Thu, 30 Jan 2025 12:28:42 -0500 Subject: [PATCH] Rename package for deployer module The deployer module package was overloaded with another module, which break standard Java conventions. --- .../AppBrokerAutoConfiguration.java | 4 +- ...udFoundryAppDeployerAutoConfiguration.java | 6 +-- ...undryAppDeployerAutoConfigurationTest.java | 6 +-- .../appbroker/deployer/BackingService.java | 1 + .../appbroker/deployer/DeployerClient.java | 16 +++++++ .../targets/SpacePerServiceInstance.java | 2 +- .../manager/BackingAppManagementService.java | 6 +-- .../appbroker/manager/ManagementClient.java | 5 +++ ...ploymentDeleteServiceInstanceWorkflow.java | 2 +- ...ploymentUpdateServiceInstanceWorkflow.java | 2 +- .../deployer/DeployerClientTest.java | 11 +++++ .../BackingAppManagementServiceTest.java | 10 ++--- ...ementServiceWithServiceInstanceIdTest.java | 6 +-- .../manager/ManagementClientTest.java | 5 +++ ...mentDeleteServiceInstanceWorkflowTest.java | 2 +- .../cloudfoundry/CloudFoundryAppDeployer.java | 42 +++++++++---------- .../cloudfoundry/CloudFoundryAppManager.java | 10 ++--- .../CloudFoundryDeploymentProperties.java | 2 +- .../CloudFoundryOAuth2Client.java | 10 ++--- .../CloudFoundryOperationsUtils.java | 2 +- ...loudFoundryAppDeployerDeleteSpaceTest.java | 4 +- .../CloudFoundryAppDeployerTest.java | 28 +++++++------ ...undryAppDeployerUpdateApplicationTest.java | 6 +-- .../CloudFoundryAppManagerTest.java | 8 ++-- .../CloudFoundryOAuth2ClientTest.java | 4 +- .../CloudFoundryOperationsUtilsTest.java | 2 +- .../deployer/{ => deployer}/AppDeployer.java | 2 +- .../CreateServiceInstanceRequest.java | 2 +- .../CreateServiceInstanceResponse.java | 2 +- .../DeleteBackingSpaceRequest.java | 2 +- .../DeleteBackingSpaceResponse.java | 2 +- .../DeleteServiceInstanceRequest.java | 2 +- .../DeleteServiceInstanceResponse.java | 2 +- .../DeployApplicationRequest.java | 2 +- .../DeployApplicationResponse.java | 2 +- .../{ => deployer}/DeploymentProperties.java | 2 +- .../{ => deployer}/GetApplicationRequest.java | 2 +- .../GetApplicationResponse.java | 2 +- .../GetServiceInstanceRequest.java | 2 +- .../GetServiceInstanceResponse.java | 2 +- .../UndeployApplicationRequest.java | 2 +- .../UndeployApplicationResponse.java | 2 +- .../UpdateApplicationRequest.java | 2 +- .../UpdateApplicationResponse.java | 2 +- .../UpdateServiceInstanceRequest.java | 2 +- .../UpdateServiceInstanceResponse.java | 2 +- .../{ => deployer}/util/ByteSizeUtils.java | 2 +- .../{ => deployer}/manager/AppManager.java | 2 +- .../manager/RestageApplicationRequest.java | 2 +- .../manager/RestartApplicationRequest.java | 2 +- .../manager/StartApplicationRequest.java | 2 +- .../manager/StopApplicationRequest.java | 2 +- .../oauth2/CreateOAuth2ClientRequest.java | 2 +- .../oauth2/CreateOAuth2ClientResponse.java | 2 +- .../oauth2/DeleteOAuth2ClientRequest.java | 2 +- .../oauth2/DeleteOAuth2ClientResponse.java | 2 +- .../{ => deployer}/oauth2/OAuth2Client.java | 2 +- .../GetServiceInstanceRequestTest.java | 2 +- .../RestageApplicationRequestTest.java | 2 +- .../RestartApplicationRequestTest.java | 2 +- .../manager/StartApplicationRequestTest.java | 2 +- .../manager/StopApplicationRequestTest.java | 2 +- .../integration/ApplicationTest.java | 2 +- ...InstanceWithCustomTargetComponentTest.java | 2 +- 64 files changed, 159 insertions(+), 119 deletions(-) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/AppDeployer.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/CreateServiceInstanceRequest.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/CreateServiceInstanceResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeleteBackingSpaceRequest.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeleteBackingSpaceResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeleteServiceInstanceRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeleteServiceInstanceResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeployApplicationRequest.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeployApplicationResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/DeploymentProperties.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/GetApplicationRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/GetApplicationResponse.java (97%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/GetServiceInstanceRequest.java (97%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/GetServiceInstanceResponse.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/UndeployApplicationRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/UndeployApplicationResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/UpdateApplicationRequest.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/UpdateApplicationResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/UpdateServiceInstanceRequest.java (97%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/UpdateServiceInstanceResponse.java (95%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/util/ByteSizeUtils.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/manager/AppManager.java (94%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/manager/RestageApplicationRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/manager/RestartApplicationRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/manager/StartApplicationRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/manager/StopApplicationRequest.java (96%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/oauth2/CreateOAuth2ClientRequest.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/oauth2/CreateOAuth2ClientResponse.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/oauth2/DeleteOAuth2ClientRequest.java (97%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/oauth2/DeleteOAuth2ClientResponse.java (98%) rename spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/{ => deployer}/oauth2/OAuth2Client.java (93%) rename spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/{ => deployer}/GetServiceInstanceRequestTest.java (97%) rename spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/{ => deployer}/manager/RestageApplicationRequestTest.java (97%) rename spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/{ => deployer}/manager/RestartApplicationRequestTest.java (97%) rename spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/{ => deployer}/manager/StartApplicationRequestTest.java (97%) rename spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/{ => deployer}/manager/StopApplicationRequestTest.java (97%) diff --git a/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java b/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java index c056f3a..a6d217b 100644 --- a/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java +++ b/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java @@ -26,7 +26,6 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.BackingAppDeploymentService; import org.springframework.cloud.appbroker.deployer.BackingApplication; import org.springframework.cloud.appbroker.deployer.BackingService; @@ -37,6 +36,8 @@ import org.springframework.cloud.appbroker.deployer.DefaultBackingAppDeploymentS import org.springframework.cloud.appbroker.deployer.DefaultBackingServicesProvisionService; import org.springframework.cloud.appbroker.deployer.DefaultBackingSpaceManagementService; import org.springframework.cloud.appbroker.deployer.DeployerClient; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.manager.AppManager; import org.springframework.cloud.appbroker.extensions.parameters.BackingApplicationsParametersTransformationService; import org.springframework.cloud.appbroker.extensions.parameters.BackingServicesParametersTransformationService; import org.springframework.cloud.appbroker.extensions.parameters.EnvironmentMappingParametersTransformerFactory; @@ -47,7 +48,6 @@ import org.springframework.cloud.appbroker.extensions.targets.ServiceInstanceGui import org.springframework.cloud.appbroker.extensions.targets.SpacePerServiceInstance; import org.springframework.cloud.appbroker.extensions.targets.TargetFactory; import org.springframework.cloud.appbroker.extensions.targets.TargetService; -import org.springframework.cloud.appbroker.manager.AppManager; import org.springframework.cloud.appbroker.manager.BackingAppManagementService; import org.springframework.cloud.appbroker.manager.ManagementClient; import org.springframework.cloud.appbroker.service.CreateServiceInstanceAppBindingWorkflow; diff --git a/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfiguration.java b/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfiguration.java index a427f29..90ed32a 100644 --- a/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfiguration.java +++ b/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfiguration.java @@ -43,15 +43,15 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryAppDeployer; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryAppManager; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryDeploymentProperties; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryOAuth2Client; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryOperationsUtils; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryTargetProperties; -import org.springframework.cloud.appbroker.manager.AppManager; -import org.springframework.cloud.appbroker.oauth2.OAuth2Client; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.manager.AppManager; +import org.springframework.cloud.appbroker.deployer.oauth2.OAuth2Client; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ResourceLoader; diff --git a/spring-cloud-app-broker-autoconfigure/src/test/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfigurationTest.java b/spring-cloud-app-broker-autoconfigure/src/test/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfigurationTest.java index efa59c5..1ab130a 100644 --- a/spring-cloud-app-broker-autoconfigure/src/test/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfigurationTest.java +++ b/spring-cloud-app-broker-autoconfigure/src/test/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfigurationTest.java @@ -29,12 +29,12 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryDeploymentProperties; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryOperationsUtils; import org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryTargetProperties; -import org.springframework.cloud.appbroker.manager.AppManager; -import org.springframework.cloud.appbroker.oauth2.OAuth2Client; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.manager.AppManager; +import org.springframework.cloud.appbroker.deployer.oauth2.OAuth2Client; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingService.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingService.java index 09c6386..ca7edbe 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingService.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingService.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.util.CollectionUtils; public class BackingService { diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/DeployerClient.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/DeployerClient.java index cfaacaa..508592a 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/DeployerClient.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/DeployerClient.java @@ -22,6 +22,22 @@ import reactor.core.publisher.Mono; import reactor.util.Logger; import reactor.util.Loggers; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.CreateServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.CreateServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteBackingSpaceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteBackingSpaceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UndeployApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UndeployApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateServiceInstanceResponse; + public class DeployerClient { private static final Logger LOG = Loggers.getLogger(DeployerClient.class); diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/SpacePerServiceInstance.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/SpacePerServiceInstance.java index e792db6..eb6b99e 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/SpacePerServiceInstance.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/SpacePerServiceInstance.java @@ -18,7 +18,7 @@ package org.springframework.cloud.appbroker.extensions.targets; import java.util.Map; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; public class SpacePerServiceInstance extends TargetFactory { diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/BackingAppManagementService.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/BackingAppManagementService.java index acdfcdc..b320d99 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/BackingAppManagementService.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/BackingAppManagementService.java @@ -24,14 +24,14 @@ import reactor.core.scheduler.Schedulers; import reactor.util.Logger; import reactor.util.Loggers; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.BackingApplication; import org.springframework.cloud.appbroker.deployer.BackingApplications; import org.springframework.cloud.appbroker.deployer.BrokeredService; import org.springframework.cloud.appbroker.deployer.BrokeredServices; -import org.springframework.cloud.appbroker.deployer.GetApplicationRequest; -import org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest; import org.springframework.cloud.appbroker.deployer.ServicesSpec; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest; import org.springframework.cloud.appbroker.extensions.targets.TargetService; public class BackingAppManagementService { diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/ManagementClient.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/ManagementClient.java index f0fde97..6eef67d 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/ManagementClient.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/ManagementClient.java @@ -21,6 +21,11 @@ import reactor.util.Logger; import reactor.util.Loggers; import org.springframework.cloud.appbroker.deployer.BackingApplication; +import org.springframework.cloud.appbroker.deployer.manager.AppManager; +import org.springframework.cloud.appbroker.deployer.manager.RestageApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.RestartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StopApplicationRequest; public class ManagementClient { diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflow.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflow.java index 8d04d3e..7bf2f3c 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflow.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflow.java @@ -31,7 +31,7 @@ import org.springframework.cloud.appbroker.deployer.BackingService; import org.springframework.cloud.appbroker.deployer.BackingServicesProvisionService; import org.springframework.cloud.appbroker.deployer.BackingSpaceManagementService; import org.springframework.cloud.appbroker.deployer.BrokeredServices; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.cloud.appbroker.extensions.targets.TargetService; import org.springframework.cloud.appbroker.manager.BackingAppManagementService; import org.springframework.cloud.appbroker.service.DeleteServiceInstanceWorkflow; diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentUpdateServiceInstanceWorkflow.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentUpdateServiceInstanceWorkflow.java index fe6e6f9..642a492 100644 --- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentUpdateServiceInstanceWorkflow.java +++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentUpdateServiceInstanceWorkflow.java @@ -35,7 +35,7 @@ import org.springframework.cloud.appbroker.deployer.BackingApplication; import org.springframework.cloud.appbroker.deployer.BackingService; import org.springframework.cloud.appbroker.deployer.BackingServicesProvisionService; import org.springframework.cloud.appbroker.deployer.BrokeredServices; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.cloud.appbroker.extensions.parameters.BackingApplicationsParametersTransformationService; import org.springframework.cloud.appbroker.extensions.parameters.BackingServicesParametersTransformationService; import org.springframework.cloud.appbroker.extensions.targets.TargetService; diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/deployer/DeployerClientTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/deployer/DeployerClientTest.java index 206bbaf..fb5bcf6 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/deployer/DeployerClientTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/deployer/DeployerClientTest.java @@ -31,6 +31,17 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.CreateServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteBackingSpaceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UndeployApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateServiceInstanceResponse; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.BDDMockito.given; diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceTest.java index 0137d8c..01c7036 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceTest.java @@ -26,16 +26,16 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.BackingApplication; import org.springframework.cloud.appbroker.deployer.BackingApplications; import org.springframework.cloud.appbroker.deployer.BrokeredService; import org.springframework.cloud.appbroker.deployer.BrokeredServices; -import org.springframework.cloud.appbroker.deployer.GetApplicationRequest; -import org.springframework.cloud.appbroker.deployer.GetApplicationResponse; -import org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.GetServiceInstanceResponse; import org.springframework.cloud.appbroker.deployer.ServicesSpec; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceResponse; import org.springframework.cloud.appbroker.extensions.targets.TargetService; import static org.mockito.ArgumentMatchers.any; diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceWithServiceInstanceIdTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceWithServiceInstanceIdTest.java index e1daea8..6f8fa7c 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceWithServiceInstanceIdTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceWithServiceInstanceIdTest.java @@ -24,14 +24,14 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.BackingApplication; import org.springframework.cloud.appbroker.deployer.BackingApplications; import org.springframework.cloud.appbroker.deployer.BrokeredService; import org.springframework.cloud.appbroker.deployer.BrokeredServices; -import org.springframework.cloud.appbroker.deployer.GetApplicationRequest; -import org.springframework.cloud.appbroker.deployer.GetApplicationResponse; import org.springframework.cloud.appbroker.deployer.ServicesSpec; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationResponse; import org.springframework.cloud.appbroker.extensions.targets.TargetService; import static org.mockito.ArgumentMatchers.any; diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/ManagementClientTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/ManagementClientTest.java index dac0077..fc91a2d 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/ManagementClientTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/ManagementClientTest.java @@ -27,6 +27,11 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import org.springframework.cloud.appbroker.deployer.BackingApplication; +import org.springframework.cloud.appbroker.deployer.manager.AppManager; +import org.springframework.cloud.appbroker.deployer.manager.RestageApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.RestartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StopApplicationRequest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; diff --git a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflowTest.java b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflowTest.java index e6bdfdf..2193743 100644 --- a/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflowTest.java +++ b/spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflowTest.java @@ -38,9 +38,9 @@ import org.springframework.cloud.appbroker.deployer.BackingServicesProvisionServ import org.springframework.cloud.appbroker.deployer.BackingSpaceManagementService; import org.springframework.cloud.appbroker.deployer.BrokeredService; import org.springframework.cloud.appbroker.deployer.BrokeredServices; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; import org.springframework.cloud.appbroker.deployer.ServicesSpec; import org.springframework.cloud.appbroker.deployer.TargetSpec; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.cloud.appbroker.extensions.targets.TargetService; import org.springframework.cloud.appbroker.manager.BackingAppManagementService; import org.springframework.cloud.appbroker.service.DeleteServiceInstanceWorkflow; diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java index a836c73..8893449 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java @@ -110,27 +110,27 @@ import reactor.core.Exceptions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import org.springframework.cloud.appbroker.deployer.AppDeployer; -import org.springframework.cloud.appbroker.deployer.CreateServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.CreateServiceInstanceResponse; -import org.springframework.cloud.appbroker.deployer.DeleteBackingSpaceRequest; -import org.springframework.cloud.appbroker.deployer.DeleteBackingSpaceResponse; -import org.springframework.cloud.appbroker.deployer.DeleteServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.DeleteServiceInstanceResponse; -import org.springframework.cloud.appbroker.deployer.DeployApplicationRequest; -import org.springframework.cloud.appbroker.deployer.DeployApplicationResponse; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; -import org.springframework.cloud.appbroker.deployer.GetApplicationRequest; -import org.springframework.cloud.appbroker.deployer.GetApplicationResponse; -import org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.GetServiceInstanceResponse; -import org.springframework.cloud.appbroker.deployer.UndeployApplicationRequest; -import org.springframework.cloud.appbroker.deployer.UndeployApplicationResponse; -import org.springframework.cloud.appbroker.deployer.UpdateApplicationRequest; -import org.springframework.cloud.appbroker.deployer.UpdateApplicationResponse; -import org.springframework.cloud.appbroker.deployer.UpdateServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.UpdateServiceInstanceResponse; -import org.springframework.cloud.appbroker.deployer.util.ByteSizeUtils; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.CreateServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.CreateServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteBackingSpaceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteBackingSpaceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UndeployApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UndeployApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationResponse; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateServiceInstanceResponse; +import org.springframework.cloud.appbroker.deployer.deployer.util.ByteSizeUtils; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManager.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManager.java index 81a4702..f52d28c 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManager.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManager.java @@ -20,11 +20,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; -import org.springframework.cloud.appbroker.manager.AppManager; -import org.springframework.cloud.appbroker.manager.RestageApplicationRequest; -import org.springframework.cloud.appbroker.manager.RestartApplicationRequest; -import org.springframework.cloud.appbroker.manager.StartApplicationRequest; -import org.springframework.cloud.appbroker.manager.StopApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.AppManager; +import org.springframework.cloud.appbroker.deployer.manager.RestageApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.RestartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StopApplicationRequest; public class CloudFoundryAppManager implements AppManager { diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryDeploymentProperties.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryDeploymentProperties.java index 0024bf5..77761f6 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryDeploymentProperties.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryDeploymentProperties.java @@ -22,7 +22,7 @@ import java.util.Set; import org.cloudfoundry.operations.applications.ApplicationHealthCheck; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; /** * Holds configuration properties for specifying what resources and services an app deployed to a Cloud Foundry runtime diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2Client.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2Client.java index 823604d..1b368aa 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2Client.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2Client.java @@ -27,11 +27,11 @@ import org.cloudfoundry.uaa.clients.DeleteClientResponse; import org.cloudfoundry.uaa.tokens.GrantType; import reactor.core.publisher.Mono; -import org.springframework.cloud.appbroker.oauth2.CreateOAuth2ClientRequest; -import org.springframework.cloud.appbroker.oauth2.CreateOAuth2ClientResponse; -import org.springframework.cloud.appbroker.oauth2.DeleteOAuth2ClientRequest; -import org.springframework.cloud.appbroker.oauth2.DeleteOAuth2ClientResponse; -import org.springframework.cloud.appbroker.oauth2.OAuth2Client; +import org.springframework.cloud.appbroker.deployer.oauth2.CreateOAuth2ClientRequest; +import org.springframework.cloud.appbroker.deployer.oauth2.CreateOAuth2ClientResponse; +import org.springframework.cloud.appbroker.deployer.oauth2.DeleteOAuth2ClientRequest; +import org.springframework.cloud.appbroker.deployer.oauth2.DeleteOAuth2ClientResponse; +import org.springframework.cloud.appbroker.deployer.oauth2.OAuth2Client; import org.springframework.util.CollectionUtils; public class CloudFoundryOAuth2Client implements OAuth2Client { diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtils.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtils.java index 26bd485..72e3bdf 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtils.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtils.java @@ -22,7 +22,7 @@ import org.cloudfoundry.operations.CloudFoundryOperations; import org.cloudfoundry.operations.DefaultCloudFoundryOperations; import reactor.core.publisher.Mono; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.util.CollectionUtils; public class CloudFoundryOperationsUtils { diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerDeleteSpaceTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerDeleteSpaceTest.java index c6a9b96..5790321 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerDeleteSpaceTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerDeleteSpaceTest.java @@ -36,8 +36,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.deployer.AppDeployer; -import org.springframework.cloud.appbroker.deployer.DeleteBackingSpaceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteBackingSpaceRequest; import org.springframework.core.io.ResourceLoader; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java index 623a0b5..ce38c72 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java @@ -66,14 +66,14 @@ import org.mockito.quality.Strictness; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.deployer.AppDeployer; -import org.springframework.cloud.appbroker.deployer.CreateServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.DeleteServiceInstanceRequest; -import org.springframework.cloud.appbroker.deployer.DeployApplicationRequest; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; -import org.springframework.cloud.appbroker.deployer.GetApplicationRequest; -import org.springframework.cloud.appbroker.deployer.UpdateApplicationRequest; -import org.springframework.cloud.appbroker.deployer.UpdateServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.CreateServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeleteServiceInstanceRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeployApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.GetApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateServiceInstanceRequest; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.ResourceLoader; import org.springframework.util.CollectionUtils; @@ -88,8 +88,8 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; -import static org.springframework.cloud.appbroker.deployer.DeploymentProperties.TARGET_PROPERTY_KEY; import static org.springframework.cloud.appbroker.deployer.cloudfoundry.CloudFoundryDeploymentProperties.DEFAULT_API_POLLING_TIMEOUT_SECONDS; +import static org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties.TARGET_PROPERTY_KEY; @SuppressWarnings("UnassignedFluxMonoInstance") @ExtendWith(MockitoExtension.class) @@ -871,8 +871,8 @@ class CloudFoundryAppDeployerTest { .build()) .build())); - org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest request = - org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest + org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest request = + org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest .builder() .serviceInstanceId("foo-service-instance-id") .properties(emptyMap()) @@ -913,7 +913,8 @@ class CloudFoundryAppDeployerTest { .type(ServiceInstanceType.MANAGED) .build())); - org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest request = org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest + org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest request = + org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest .builder() .name("my-foo-service") .build(); @@ -945,7 +946,8 @@ class CloudFoundryAppDeployerTest { .type(ServiceInstanceType.MANAGED) .build())); - org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest request = org.springframework.cloud.appbroker.deployer.GetServiceInstanceRequest + org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest request = + org.springframework.cloud.appbroker.deployer.deployer.GetServiceInstanceRequest .builder() .name("my-foo-service") .properties(singletonMap(TARGET_PROPERTY_KEY, "foo-space")) diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java index c629e73..61e4528 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java @@ -83,8 +83,8 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.deployer.AppDeployer; -import org.springframework.cloud.appbroker.deployer.UpdateApplicationRequest; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; +import org.springframework.cloud.appbroker.deployer.deployer.UpdateApplicationRequest; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.ResourceLoader; @@ -97,7 +97,7 @@ import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.times; -import static org.springframework.cloud.appbroker.deployer.DeploymentProperties.TARGET_PROPERTY_KEY; +import static org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties.TARGET_PROPERTY_KEY; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManagerTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManagerTest.java index 78c9b11..0fa1010 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManagerTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManagerTest.java @@ -26,10 +26,10 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.manager.RestageApplicationRequest; -import org.springframework.cloud.appbroker.manager.RestartApplicationRequest; -import org.springframework.cloud.appbroker.manager.StartApplicationRequest; -import org.springframework.cloud.appbroker.manager.StopApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.RestageApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.RestartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StartApplicationRequest; +import org.springframework.cloud.appbroker.deployer.manager.StopApplicationRequest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2ClientTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2ClientTest.java index 0930bac..e80aa8c 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2ClientTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2ClientTest.java @@ -33,8 +33,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.oauth2.CreateOAuth2ClientRequest; -import org.springframework.cloud.appbroker.oauth2.DeleteOAuth2ClientRequest; +import org.springframework.cloud.appbroker.deployer.oauth2.CreateOAuth2ClientRequest; +import org.springframework.cloud.appbroker.deployer.oauth2.DeleteOAuth2ClientRequest; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtilsTest.java b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtilsTest.java index 150e592..0bbda2d 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtilsTest.java +++ b/spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtilsTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import reactor.test.StepVerifier; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.test.util.ReflectionTestUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/AppDeployer.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/AppDeployer.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/AppDeployer.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/AppDeployer.java index 753ceb6..3d5ce0d 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/AppDeployer.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/AppDeployer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import reactor.core.publisher.Mono; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceRequest.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceRequest.java index 375ccae..a5611ca 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceResponse.java index 1094ef7..8eeedbc 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class CreateServiceInstanceResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceRequest.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceRequest.java index bc12354..845f476 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class DeleteBackingSpaceRequest { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceResponse.java index 5bedf35..e610a6c 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class DeleteBackingSpaceResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceRequest.java index 75b66cb..8bbb816 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceResponse.java index afce3b0..385e5b3 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class DeleteServiceInstanceResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationRequest.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationRequest.java index f8b18e3..a5f5b73 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationResponse.java index 722b24e..e585d88 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class DeployApplicationResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeploymentProperties.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeploymentProperties.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeploymentProperties.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeploymentProperties.java index dd5fa6d..93aa79a 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeploymentProperties.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeploymentProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class DeploymentProperties { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationRequest.java index 18f6807..fa0e1cb 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationResponse.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationResponse.java index 055dd0f..804c58e 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequest.java index ab2bbd5..b7345a2 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceResponse.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceResponse.java index 0e11290..e768909 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class GetServiceInstanceResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationRequest.java index 3fc93b1..f2e0615 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationResponse.java index e9765cf..9de32af 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class UndeployApplicationResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationRequest.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationRequest.java index a5f87bb..758f5df 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationResponse.java index 8824b91..9dc34d7 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class UpdateApplicationResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceRequest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceRequest.java index d0be3bd..5153a16 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceResponse.java similarity index 95% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceResponse.java index 9f9b9fe..598b7b8 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; public class UpdateServiceInstanceResponse { diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/util/ByteSizeUtils.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/util/ByteSizeUtils.java index f222c67..8a3339d 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/util/ByteSizeUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer.util; +package org.springframework.cloud.appbroker.deployer.deployer.util; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/AppManager.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/AppManager.java similarity index 94% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/AppManager.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/AppManager.java index 194bb56..863796c 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/AppManager.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/AppManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import reactor.core.publisher.Mono; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequest.java index 990673a..3bfaa56 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequest.java index 304999b..b9cbb89 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StartApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StartApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequest.java index c885509..daa4b33 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StartApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StopApplicationRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequest.java similarity index 96% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StopApplicationRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequest.java index fb82dea..63f9f7f 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StopApplicationRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientRequest.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientRequest.java index 9586c76..23ddb65 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.oauth2; +package org.springframework.cloud.appbroker.deployer.oauth2; import java.util.ArrayList; import java.util.Arrays; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientResponse.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientResponse.java index e1b30ce..8d25849 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.oauth2; +package org.springframework.cloud.appbroker.deployer.oauth2; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientRequest.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientRequest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientRequest.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientRequest.java index 92b9c13..2f7729f 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientRequest.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.oauth2; +package org.springframework.cloud.appbroker.deployer.oauth2; import java.util.Objects; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientResponse.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientResponse.java similarity index 98% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientResponse.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientResponse.java index de1277d..3bafb65 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientResponse.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.oauth2; +package org.springframework.cloud.appbroker.deployer.oauth2; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/OAuth2Client.java b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/OAuth2Client.java similarity index 93% rename from spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/OAuth2Client.java rename to spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/OAuth2Client.java index fb27766..6918bb5 100644 --- a/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/OAuth2Client.java +++ b/spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/OAuth2Client.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.oauth2; +package org.springframework.cloud.appbroker.deployer.oauth2; import reactor.core.publisher.Mono; diff --git a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequestTest.java b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequestTest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequestTest.java rename to spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequestTest.java index 111fe23..e46b1ec 100644 --- a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequestTest.java +++ b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.deployer; +package org.springframework.cloud.appbroker.deployer.deployer; import java.util.Collections; diff --git a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequestTest.java b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequestTest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequestTest.java rename to spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequestTest.java index ed30369..bef40d5 100644 --- a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequestTest.java +++ b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.Collections; diff --git a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequestTest.java b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequestTest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequestTest.java rename to spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequestTest.java index fa8c5a0..a9566e9 100644 --- a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequestTest.java +++ b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.Collections; diff --git a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StartApplicationRequestTest.java b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequestTest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StartApplicationRequestTest.java rename to spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequestTest.java index 9310c6f..7cf5375 100644 --- a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StartApplicationRequestTest.java +++ b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.Collections; diff --git a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StopApplicationRequestTest.java b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequestTest.java similarity index 97% rename from spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StopApplicationRequestTest.java rename to spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequestTest.java index 4d8130a..4759f1d 100644 --- a/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StopApplicationRequestTest.java +++ b/spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequestTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.appbroker.manager; +package org.springframework.cloud.appbroker.deployer.manager; import java.util.Collections; diff --git a/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/ApplicationTest.java b/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/ApplicationTest.java index 14bc633..bfd0e9c 100644 --- a/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/ApplicationTest.java +++ b/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/ApplicationTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.appbroker.deployer.AppDeployer; import org.springframework.cloud.appbroker.deployer.BackingAppDeploymentService; +import org.springframework.cloud.appbroker.deployer.deployer.AppDeployer; import org.springframework.cloud.appbroker.service.WorkflowServiceInstanceService; import org.springframework.cloud.servicebroker.controller.CatalogController; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomTargetComponentTest.java b/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomTargetComponentTest.java index 89b8dd1..34b5436 100644 --- a/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomTargetComponentTest.java +++ b/spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomTargetComponentTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.appbroker.deployer.DeploymentProperties; +import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties; import org.springframework.cloud.appbroker.extensions.targets.ArtifactDetails; import org.springframework.cloud.appbroker.extensions.targets.Target; import org.springframework.cloud.appbroker.extensions.targets.TargetFactory;