Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2015-06-26 16:06:11 -07:00
parent 4f072f4046
commit b68382f3ba
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java
View File

@@ -107,6 +107,7 @@ public class EndpointHandlerMapping extends RequestMappingHandlerMapping impleme
}
@Override
@Deprecated
protected void registerHandlerMethod(Object handler, Method method,
RequestMappingInfo mapping) {
if (mapping == null) {

1
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java
View File

@@ -205,4 +205,5 @@ public class HealthMvcEndpointTests {
Health health = ((ResponseEntity<Health>) result).getBody();
assertTrue(health.getStatus() == Status.DOWN);
}
}

2
spring-boot/src/main/java/org/springframework/boot/test/IntegrationTestPropertiesListener.java
View File

@@ -37,7 +37,7 @@ public class IntegrationTestPropertiesListener extends AbstractTestExecutionList
public void prepareTestInstance(TestContext testContext) throws Exception {
Class<?> testClass = testContext.getTestClass();
AnnotationAttributes annotationAttributes = AnnotatedElementUtils
.getAnnotationAttributes(testClass, IntegrationTest.class.getName());
.getMergedAnnotationAttributes(testClass, IntegrationTest.class.getName());
if (annotationAttributes != null) {
addPropertySourceProperties(testContext,
annotationAttributes.getStringArray("value"));

9
spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
View File

@@ -23,11 +23,6 @@ import org.springframework.boot.ansi.AnsiOutput.Enabled;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.springframework.boot.ansi.AnsiElement.BOLD;
import static org.springframework.boot.ansi.AnsiElement.FAINT;
import static org.springframework.boot.ansi.AnsiElement.GREEN;
import static org.springframework.boot.ansi.AnsiElement.NORMAL;
import static org.springframework.boot.ansi.AnsiElement.RED;
/**
* Tests for {@link AnsiOutput}.
@@ -48,8 +43,8 @@ public class AnsiOutputTests {
@Test
public void encoding() throws Exception {
String encoded = AnsiOutput.toString("A", RED, BOLD, "B", NORMAL, "D", GREEN,
"E", FAINT, "F");
String encoded = AnsiOutput.toString("A", AnsiColor.RED, AnsiStyle.BOLD, "B",
AnsiStyle.NORMAL, "D", AnsiColor.GREEN, "E", AnsiStyle.FAINT, "F");
assertThat(encoded, equalTo("ABDEF"));
}

2
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@@ -37,9 +37,9 @@ import javax.servlet.ServletResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContextBuilder;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;