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

Final polish before 1.0.0.RC1

Browse Source
This commit is contained in:
Phillip Webb
2014-01-21 13:30:23 -08:00
parent 853b0a8027
commit ac54d7fe3c
67 changed files with 390 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@@ -260,7 +260,8 @@ public class EndpointWebMvcAutoConfigurationTests {
}
@Override
public Class<?> getEndpointType() {
@SuppressWarnings("rawtypes")
public Class<? extends Endpoint> getEndpointType() {
return Endpoint.class;
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 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.
@@ -146,7 +146,7 @@ public class EndpointHandlerMappingTests {
}
private static class TestMvcEndpoint extends GenericMvcEndpoint {
private static class TestMvcEndpoint extends EndpointMvcAdapter {
public TestMvcEndpoint(TestEndpoint delegate) {
super(delegate);
@@ -154,7 +154,7 @@ public class EndpointHandlerMappingTests {
}
private static class TestActionEndpoint extends GenericMvcEndpoint {
private static class TestActionEndpoint extends EndpointMvcAdapter {
public TestActionEndpoint(TestEndpoint delegate) {
super(delegate);

14
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisServer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 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.
@@ -54,10 +54,9 @@ public class RedisServer implements TestRule {
try {
this.resource = obtainResource();
}
catch (Exception e) {
catch (Exception ex) {
maybeCleanup();
return failOrSkip(e);
return failOrSkip(ex);
}
return new Statement() {
@@ -82,17 +81,18 @@ public class RedisServer implements TestRule {
};
}
private Statement failOrSkip(Exception e) {
private Statement failOrSkip(Exception exception) {
String serversRequired = System.getenv(EXTERNAL_SERVERS_REQUIRED);
if ("true".equalsIgnoreCase(serversRequired)) {
logger.error(this.resourceDescription + " IS REQUIRED BUT NOT AVAILABLE", e);
logger.error(this.resourceDescription + " IS REQUIRED BUT NOT AVAILABLE",
exception);
fail(this.resourceDescription + " IS NOT AVAILABLE");
// Never reached, here to satisfy method signature
return null;
}
else {
logger.error(this.resourceDescription + " IS NOT AVAILABLE, SKIPPING TESTS",
e);
exception);
return new Statement() {
@Override