From be57d1a42e6001026091c016b9a76c6872cacf40 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sun, 29 Oct 2017 16:36:53 +0000 Subject: [PATCH] Polish - Remove unused imports. - Fix some deprecations in boot 2.x --- .../boot/StateMachineAutoConfigurationTests.java | 6 +++--- .../StateMachineJpaRepositoriesAutoConfigurationTests.java | 6 +++--- ...ateMachineMongoDbRepositoriesAutoConfigurationTests.java | 6 +++--- ...StateMachineRedisRepositoriesAutoConfigurationTests.java | 6 +++--- .../src/test/java/demo/monitoring/MonitoringTests.java | 1 - 5 files changed, 12 insertions(+), 13 deletions(-) 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 1104bbe7..081c6934 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 @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import java.util.List; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.statemachine.StateMachine; @@ -64,7 +64,7 @@ public class StateMachineAutoConfigurationTests { @Test public void testMonitorDisabled() throws Exception { context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "spring.statemachine.monitor.enabled:false"); + TestPropertyValues.of("spring.statemachine.monitor.enabled=false").applyTo(context); context.register(StateMachineAutoConfiguration.class); context.refresh(); assertThat(context.containsBean("bootStateMachineMonitor"), is(false)); 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 ac5c173f..044f56ff 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 @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.statemachine.boot.autoconfigure.StateMachineJpaRepositoriesAutoConfiguration; @@ -58,7 +58,7 @@ public class StateMachineJpaRepositoriesAutoConfigurationTests { @Test public void testJpaDisabled() throws Exception { context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "spring.statemachine.data.jpa.repositories.enabled:false"); + TestPropertyValues.of("spring.statemachine.data.jpa.repositories.enabled=false").applyTo(context); context.register(StateMachineJpaRepositoriesAutoConfiguration.class); context.refresh(); assertThat(context.containsBean("jpaStateRepository"), is(false)); 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 ad18a7ac..3c3267db 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 @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.statemachine.boot.autoconfigure.StateMachineMongoDbRepositoriesAutoConfiguration; @@ -59,7 +59,7 @@ public class StateMachineMongoDbRepositoriesAutoConfigurationTests { @Test public void testMongoDisabled() throws Exception { context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "spring.statemachine.data.redis.repositories.enabled:false"); + TestPropertyValues.of("spring.statemachine.data.redis.repositories.enabled=false").applyTo(context); context.register(StateMachineRedisRepositoriesAutoConfiguration.class); context.refresh(); assertThat(context.containsBean("mongoDbStateRepository"), is(false)); 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 b1412dc3..f9c07433 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 @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.statemachine.boot.autoconfigure.StateMachineRedisRepositoriesAutoConfiguration; @@ -56,7 +56,7 @@ public class StateMachineRedisRepositoriesAutoConfigurationTests { @Test public void testRedisDisabled() throws Exception { context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "spring.statemachine.data.redis.repositories.enabled:false"); + TestPropertyValues.of("spring.statemachine.data.redis.repositories.enabled=false").applyTo(context); context.register(StateMachineRedisRepositoriesAutoConfiguration.class); context.refresh(); assertThat(context.containsBean("redisStateRepository"), is(false)); diff --git a/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java index 3d57cffc..12a09c0f 100644 --- a/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java +++ b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java @@ -17,7 +17,6 @@ package demo.monitoring; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString;