Rename package for deployer module

The deployer module package was overloaded with another module, which break
standard Java conventions.

Author: royclarkson

spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java

@@ -26,7 +26,6 @@
 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.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.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;

spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfiguration.java

@@ -43,15 +43,15 @@
 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;

spring-cloud-app-broker-autoconfigure/src/test/java/org/springframework/cloud/appbroker/autoconfigure/CloudFoundryAppDeployerAutoConfigurationTest.java

@@ -29,12 +29,12 @@
 
 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;
 

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/BackingService.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties;
 import org.springframework.util.CollectionUtils;
 
 public class BackingService {

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/deployer/DeployerClient.java

@@ -22,6 +22,22 @@
 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);

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/SpacePerServiceInstance.java

@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.springframework.cloud.appbroker.deployer.DeploymentProperties;
+import org.springframework.cloud.appbroker.deployer.deployer.DeploymentProperties;
 
 public class SpacePerServiceInstance extends TargetFactory<SpacePerServiceInstance.Config> {
 

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/BackingAppManagementService.java

@@ -24,14 +24,14 @@
 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 {

spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/manager/ManagementClient.java

@@ -21,6 +21,11 @@
 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 {
 

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.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;

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.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;