SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename package for deployer module

Browse Source 
The deployer module package was overloaded with another module, which break
standard Java conventions.
This commit is contained in:
Roy Clarkson
2025-01-30 12:28:42 -05:00
parent 3c83245e19
commit b147f4da97
64 changed files with 159 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

@@ -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 {

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

@@ -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);

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

@@ -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<SpacePerServiceInstance.Config> {

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

@@ -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 {

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

@@ -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 {

2
spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflow.java
View File

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

2
spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentUpdateServiceInstanceWorkflow.java
View File

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

11
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/deployer/DeployerClientTest.java
View File

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

10
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceTest.java
View File

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

6
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/BackingAppManagementServiceWithServiceInstanceIdTest.java
View File

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

5
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/manager/ManagementClientTest.java
View File

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

2
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/workflow/instance/AppDeploymentDeleteServiceInstanceWorkflowTest.java
View File

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

42
spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java
View File

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

10
spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManager.java
View File

@@ -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 {

2
spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryDeploymentProperties.java
View File

@@ -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

10
spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2Client.java
View File

@@ -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 {

2
spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtils.java
View File

@@ -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 {

4
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerDeleteSpaceTest.java
View File

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

28
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java
View File

@@ -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"))

6
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java
View File

@@ -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)

8
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppManagerTest.java
View File

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

4
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOAuth2ClientTest.java
View File

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

2
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryOperationsUtilsTest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/AppDeployer.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/AppDeployer.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/CreateServiceInstanceResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/CreateServiceInstanceResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class CreateServiceInstanceResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceRequest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class DeleteBackingSpaceRequest {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteBackingSpaceResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteBackingSpaceResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class DeleteBackingSpaceResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeleteServiceInstanceResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeleteServiceInstanceResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class DeleteServiceInstanceResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeployApplicationResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeployApplicationResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class DeployApplicationResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/DeploymentProperties.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/DeploymentProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class DeploymentProperties {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetApplicationResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetApplicationResponse.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class GetServiceInstanceResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UndeployApplicationResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UndeployApplicationResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class UndeployApplicationResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateApplicationResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateApplicationResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class UpdateApplicationResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/UpdateServiceInstanceResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/UpdateServiceInstanceResponse.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.appbroker.deployer;
package org.springframework.cloud.appbroker.deployer.deployer;
public class UpdateServiceInstanceResponse {

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/util/ByteSizeUtils.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/deployer/util/ByteSizeUtils.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/AppManager.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/AppManager.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StartApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/manager/StopApplicationRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/CreateOAuth2ClientResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/CreateOAuth2ClientResponse.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientRequest.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientRequest.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/DeleteOAuth2ClientResponse.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/DeleteOAuth2ClientResponse.java
View File

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

2
spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/oauth2/OAuth2Client.java → spring-cloud-app-broker-deployer/src/main/java/org/springframework/cloud/appbroker/deployer/oauth2/OAuth2Client.java
View File

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

2
spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/GetServiceInstanceRequestTest.java → spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/deployer/GetServiceInstanceRequestTest.java
View File

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

2
spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestageApplicationRequestTest.java → spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestageApplicationRequestTest.java
View File

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

2
spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/RestartApplicationRequestTest.java → spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/RestartApplicationRequestTest.java
View File

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

2
spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StartApplicationRequestTest.java → spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StartApplicationRequestTest.java
View File

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

2
spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/manager/StopApplicationRequestTest.java → spring-cloud-app-broker-deployer/src/test/java/org/springframework/cloud/appbroker/deployer/manager/StopApplicationRequestTest.java
View File

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

2
spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/ApplicationTest.java
View File

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

2
spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomTargetComponentTest.java
View File

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