diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java index 9e2e2db2..4cc72553 100644 --- a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java +++ b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineProperties.java @@ -36,6 +36,9 @@ public class StateMachineProperties { this.monitor = monitor; } + /** + * Config props for "spring.statemachine.monitor". + */ public static class StateMachineMonitoringProperties { private boolean enabled = false; diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineAutoConfiguration.java b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java similarity index 92% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineAutoConfiguration.java rename to spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java index 2d36cdd1..123c7783 100644 --- a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineAutoConfiguration.java +++ b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.statemachine.boot; +package org.springframework.statemachine.boot.autoconfigure; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.actuate.metrics.CounterService; @@ -25,6 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.statemachine.boot.StateMachineProperties; +import org.springframework.statemachine.boot.support.BootStateMachineMonitor; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Statemachine. diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfiguration.java b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java similarity index 96% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfiguration.java rename to spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java index 25de08ba..1ef5b57d 100644 --- a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfiguration.java +++ b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineJpaRepositoriesAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.statemachine.boot; +package org.springframework.statemachine.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfiguration.java b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java similarity index 96% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfiguration.java rename to spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java index 33bed483..27f8a8a5 100644 --- a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfiguration.java +++ b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineMongoDbRepositoriesAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.statemachine.boot; +package org.springframework.statemachine.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfiguration.java b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java similarity index 96% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfiguration.java rename to spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java index bfd27f8a..91a33f1b 100644 --- a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfiguration.java +++ b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/autoconfigure/StateMachineRedisRepositoriesAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.statemachine.boot; +package org.springframework.statemachine.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/BootStateMachineMonitor.java b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java similarity index 98% rename from spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/BootStateMachineMonitor.java rename to spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java index 1df4ff70..27985ae9 100644 --- a/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/BootStateMachineMonitor.java +++ b/spring-statemachine-boot/src/main/java/org/springframework/statemachine/boot/support/BootStateMachineMonitor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.statemachine.boot; +package org.springframework.statemachine.boot.support; import java.util.HashMap; import java.util.Map; diff --git a/spring-statemachine-boot/src/main/resources/META-INF/spring.factories b/spring-statemachine-boot/src/main/resources/META-INF/spring.factories index beea946a..66e58aaa 100644 --- a/spring-statemachine-boot/src/main/resources/META-INF/spring.factories +++ b/spring-statemachine-boot/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.statemachine.boot.StateMachineAutoConfiguration,\ -org.springframework.statemachine.boot.StateMachineJpaRepositoriesAutoConfiguration,\ -org.springframework.statemachine.boot.StateMachineRedisRepositoriesAutoConfiguration,\ -org.springframework.statemachine.boot.StateMachineMongoDbRepositoriesAutoConfiguration +org.springframework.statemachine.boot.autoconfigure.StateMachineAutoConfiguration,\ +org.springframework.statemachine.boot.autoconfigure.StateMachineJpaRepositoriesAutoConfiguration,\ +org.springframework.statemachine.boot.autoconfigure.StateMachineRedisRepositoriesAutoConfiguration,\ +org.springframework.statemachine.boot.autoconfigure.StateMachineMongoDbRepositoriesAutoConfiguration diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java index 86ada6e5..1104bbe7 100644 --- a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java +++ b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineAutoConfigurationTests.java @@ -28,6 +28,8 @@ import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.statemachine.StateMachine; +import org.springframework.statemachine.boot.autoconfigure.StateMachineAutoConfiguration; +import org.springframework.statemachine.boot.support.BootStateMachineMonitor; import org.springframework.statemachine.config.EnableStateMachine; import org.springframework.statemachine.config.StateMachineConfigurerAdapter; import org.springframework.statemachine.config.builders.StateMachineStateConfigurer; diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java index 2617500f..ac5c173f 100644 --- a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java +++ b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineJpaRepositoriesAutoConfigurationTests.java @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; +import org.springframework.statemachine.boot.autoconfigure.StateMachineJpaRepositoriesAutoConfiguration; import org.springframework.statemachine.data.jpa.JpaRepositoryState; public class StateMachineJpaRepositoriesAutoConfigurationTests { diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java index 1fb9094c..ad18a7ac 100644 --- a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java +++ b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineMongoDbRepositoriesAutoConfigurationTests.java @@ -26,6 +26,8 @@ import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; +import org.springframework.statemachine.boot.autoconfigure.StateMachineMongoDbRepositoriesAutoConfiguration; +import org.springframework.statemachine.boot.autoconfigure.StateMachineRedisRepositoriesAutoConfiguration; import org.springframework.statemachine.data.mongodb.MongoDbRepositoryState; public class StateMachineMongoDbRepositoriesAutoConfigurationTests { diff --git a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java index 7814dd10..b1412dc3 100644 --- a/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java +++ b/spring-statemachine-boot/src/test/java/org/springframework/statemachine/boot/StateMachineRedisRepositoriesAutoConfigurationTests.java @@ -25,6 +25,7 @@ import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoCo import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; +import org.springframework.statemachine.boot.autoconfigure.StateMachineRedisRepositoriesAutoConfiguration; import org.springframework.statemachine.data.redis.RedisRepositoryState; public class StateMachineRedisRepositoriesAutoConfigurationTests {