Refactor scheduler packages into org.springframework.cloud.deployer.spi

Resolves #309
spring-cloud · Aug 30, 2019 · a370028 · a370028
1 parent fb0075a
commit a370028
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 26 deletions.
diff --git a/...loudfoundry/CloudFoundryAppScheduler.java → ...loudfoundry/CloudFoundryAppScheduler.java b/...loudfoundry/CloudFoundryAppScheduler.java → ...loudfoundry/CloudFoundryAppScheduler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 import java.text.ParseException;
 import java.time.Duration;
@@ -46,17 +46,17 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import org.springframework.cloud.deployer.scheduler.spi.cloudfoundry.expression.QuartzCronExpression;
-import org.springframework.cloud.deployer.scheduler.spi.core.CreateScheduleException;
-import org.springframework.cloud.deployer.scheduler.spi.core.ScheduleInfo;
-import org.springframework.cloud.deployer.scheduler.spi.core.ScheduleRequest;
-import org.springframework.cloud.deployer.scheduler.spi.core.Scheduler;
-import org.springframework.cloud.deployer.scheduler.spi.core.SchedulerException;
-import org.springframework.cloud.deployer.scheduler.spi.core.SchedulerPropertyKeys;
-import org.springframework.cloud.deployer.scheduler.spi.core.UnScheduleException;
-import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryTaskLauncher;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryTaskLauncher;
 import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest;
+import org.springframework.cloud.deployer.spi.scheduler.CreateScheduleException;
+import org.springframework.cloud.deployer.spi.scheduler.ScheduleInfo;
+import org.springframework.cloud.deployer.spi.scheduler.ScheduleRequest;
+import org.springframework.cloud.deployer.spi.scheduler.Scheduler;
+import org.springframework.cloud.deployer.spi.scheduler.SchedulerException;
+import org.springframework.cloud.deployer.spi.scheduler.SchedulerPropertyKeys;
+import org.springframework.cloud.deployer.spi.scheduler.UnScheduleException;
+import org.springframework.cloud.deployer.spi.scheduler.cloudfoundry.expression.QuartzCronExpression;
 import org.springframework.retry.RecoveryCallback;
 import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;

diff --git a/...dry/CloudFoundryScheduleSSLException.java → ...dry/CloudFoundryScheduleSSLException.java b/...dry/CloudFoundryScheduleSSLException.java → ...dry/CloudFoundryScheduleSSLException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 /**
  * A {@link RuntimeException} that wraps SSL based exceptions.

diff --git a/...ndry/CloudFoundrySchedulerProperties.java → ...ndry/CloudFoundrySchedulerProperties.java b/...ndry/CloudFoundrySchedulerProperties.java → ...ndry/CloudFoundrySchedulerProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 import javax.validation.constraints.NotNull;
 

diff --git a/...ndry/expression/QuartzCronExpression.java → ...ndry/expression/QuartzCronExpression.java b/...ndry/expression/QuartzCronExpression.java → ...ndry/expression/QuartzCronExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry.expression;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry.expression;
 
 import java.text.ParseException;
 import java.util.Calendar;

diff --git a/...oundry/CloudFoundryAppSchedulerTests.java → ...oundry/CloudFoundryAppSchedulerTests.java b/...oundry/CloudFoundryAppSchedulerTests.java → ...oundry/CloudFoundryAppSchedulerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -67,22 +67,22 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import org.springframework.cloud.deployer.scheduler.spi.core.CreateScheduleException;
-import org.springframework.cloud.deployer.scheduler.spi.core.ScheduleInfo;
-import org.springframework.cloud.deployer.scheduler.spi.core.ScheduleRequest;
-import org.springframework.cloud.deployer.scheduler.spi.core.SchedulerException;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryTaskLauncher;
 import org.springframework.cloud.deployer.spi.core.AppDefinition;
 import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest;
+import org.springframework.cloud.deployer.spi.scheduler.CreateScheduleException;
+import org.springframework.cloud.deployer.spi.scheduler.ScheduleInfo;
+import org.springframework.cloud.deployer.spi.scheduler.ScheduleRequest;
+import org.springframework.cloud.deployer.spi.scheduler.SchedulerException;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
-import static org.springframework.cloud.deployer.scheduler.spi.core.SchedulerPropertyKeys.CRON_EXPRESSION;
+import static org.springframework.cloud.deployer.spi.scheduler.SchedulerPropertyKeys.CRON_EXPRESSION;
 
 /**
  * Test the core features of the Spring Cloud Scheduler implementation.

diff --git a/...loudFoundryScheduleSSLExceptionTests.java → ...loudFoundryScheduleSSLExceptionTests.java b/...loudFoundryScheduleSSLExceptionTests.java → ...loudFoundryScheduleSSLExceptionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 import org.junit.Test;
 

diff --git a/.../CloudFoundrySchedulerPropertiesTest.java → .../CloudFoundrySchedulerPropertiesTest.java b/.../CloudFoundrySchedulerPropertiesTest.java → .../CloudFoundrySchedulerPropertiesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 import org.junit.Test;
 

diff --git a/...SpringCloudSchedulerIntegrationTests.java → ...SpringCloudSchedulerIntegrationTests.java b/...SpringCloudSchedulerIntegrationTests.java → ...SpringCloudSchedulerIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry;
 
 import java.util.Collections;
 import java.util.List;
@@ -38,12 +38,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.deployer.CloudFoundryTestSupport;
 import org.springframework.cloud.deployer.resource.maven.MavenProperties;
-import org.springframework.cloud.deployer.scheduler.spi.core.Scheduler;
-import org.springframework.cloud.deployer.scheduler.spi.core.SchedulerPropertyKeys;
-import org.springframework.cloud.deployer.scheduler.spi.test.AbstractSchedulerIntegrationTests;
+import org.springframework.cloud.deployer.spi.scheduler.test.AbstractSchedulerIntegrationTests;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryTaskLauncher;
+import org.springframework.cloud.deployer.spi.scheduler.Scheduler;
+import org.springframework.cloud.deployer.spi.scheduler.SchedulerPropertyKeys;
 import org.springframework.cloud.deployer.spi.task.TaskLauncher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...expression/QuartzCronExpressionTests.java → ...expression/QuartzCronExpressionTests.java b/...expression/QuartzCronExpressionTests.java → ...expression/QuartzCronExpressionTests.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.deployer.scheduler.spi.cloudfoundry.expression;
+package org.springframework.cloud.deployer.spi.scheduler.cloudfoundry.expression;
 
 import java.text.ParseException;
 
 import junit.framework.TestCase;
 
+import org.springframework.cloud.deployer.spi.scheduler.cloudfoundry.expression.QuartzCronExpression;
+
 public class QuartzCronExpressionTests extends TestCase {
 
 	/*