diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java index 1de92c5e..d1addd47 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java @@ -52,8 +52,8 @@ public class EnvironmentManager implements ApplicationEventPublisherAware { MutablePropertySources sources = environment.getPropertySources(); if (sources.contains(MANAGER_PROPERTY_SOURCE)) { @SuppressWarnings("unchecked") - Map map = (Map) sources.get( - MANAGER_PROPERTY_SOURCE).getSource(); + Map map = (Map) sources + .get(MANAGER_PROPERTY_SOURCE).getSource(); this.map = map; } } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/endpoint/event/RefreshEvent.java b/spring-cloud-context/src/main/java/org/springframework/cloud/endpoint/event/RefreshEvent.java index 4e79b6eb..62cde168 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/endpoint/event/RefreshEvent.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/endpoint/event/RefreshEvent.java @@ -7,6 +7,7 @@ import org.springframework.context.ApplicationEvent; * Event that triggers a call to {@link RefreshEndpoint#refresh()} * @author Spencer Gibb */ +@SuppressWarnings("serial") public class RefreshEvent extends ApplicationEvent { private Object event; diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java index 63d82915..1e1630cd 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java @@ -19,7 +19,8 @@ public class BootstrapSourcesOrderingTests { @Test public void sourcesAreOrderedCorrectly() { Class firstConstructedClass = firstToBeCreated.get(); - assertThat(firstConstructedClass).as("bootstrap sources not ordered correctly").isEqualTo(TestHigherPriorityBootstrapConfiguration.class); + assertThat(firstConstructedClass).as("bootstrap sources not ordered correctly") + .isEqualTo(TestHigherPriorityBootstrapConfiguration.class); } @EnableAutoConfiguration diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java index 13373141..a1c4affe 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java @@ -1,5 +1,11 @@ package org.springframework.cloud.context.environment; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +import org.springframework.context.ApplicationEvent; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.mock.env.MockEnvironment; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -7,38 +13,33 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.springframework.context.ApplicationEvent; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.mock.env.MockEnvironment; - public class EnvironmentManagerTest { - @Test - public void testCorrectEvents() { - MockEnvironment environment = new MockEnvironment(); - ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class); - EnvironmentManager environmentManager = new EnvironmentManager(environment); - environmentManager.setApplicationEventPublisher(publisher); + @Test + public void testCorrectEvents() { + MockEnvironment environment = new MockEnvironment(); + ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class); + EnvironmentManager environmentManager = new EnvironmentManager(environment); + environmentManager.setApplicationEventPublisher(publisher); - environmentManager.setProperty("foo", "bar"); + environmentManager.setProperty("foo", "bar"); - assertThat(environment.getProperty("foo")).isEqualTo("bar"); - ArgumentCaptor eventCaptor = ArgumentCaptor.forClass(ApplicationEvent.class); - verify(publisher, times(1)).publishEvent(eventCaptor.capture()); - assertThat(eventCaptor.getValue()).isInstanceOf(EnvironmentChangeEvent.class); - EnvironmentChangeEvent event = (EnvironmentChangeEvent) eventCaptor.getValue(); - assertThat(event.getKeys()).containsExactly("foo"); + assertThat(environment.getProperty("foo")).isEqualTo("bar"); + ArgumentCaptor eventCaptor = ArgumentCaptor + .forClass(ApplicationEvent.class); + verify(publisher, times(1)).publishEvent(eventCaptor.capture()); + assertThat(eventCaptor.getValue()).isInstanceOf(EnvironmentChangeEvent.class); + EnvironmentChangeEvent event = (EnvironmentChangeEvent) eventCaptor.getValue(); + assertThat(event.getKeys()).containsExactly("foo"); - reset(publisher); + reset(publisher); - environmentManager.reset(); - assertThat(environment.getProperty("foo")).isNull(); - verify(publisher, times(1)).publishEvent(eventCaptor.capture()); - assertThat(eventCaptor.getValue()).isInstanceOf(EnvironmentChangeEvent.class); - event = (EnvironmentChangeEvent) eventCaptor.getValue(); - assertThat(event.getKeys()).containsExactly("foo"); - } + environmentManager.reset(); + assertThat(environment.getProperty("foo")).isNull(); + verify(publisher, times(1)).publishEvent(eventCaptor.capture()); + assertThat(eventCaptor.getValue()).isInstanceOf(EnvironmentChangeEvent.class); + event = (EnvironmentChangeEvent) eventCaptor.getValue(); + assertThat(event.getKeys()).containsExactly("foo"); + } } \ No newline at end of file diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java index 2b5078cf..01653787 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java @@ -16,15 +16,13 @@ package org.springframework.cloud.context.scope.refresh; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.List; import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.aop.framework.Advised; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; @@ -44,9 +42,12 @@ import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, - properties = {"test.messages[0]=one","test.messages[1]=two"}) +@SpringBootTest(classes = TestConfiguration.class, properties = { "test.messages[0]=one", + "test.messages[1]=two" }) public class RefreshScopeListBindingIntegrationTests { @Autowired