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

Source format and clean-up

Browse Source
This commit is contained in:
Phillip Webb
2013-11-15 23:42:40 -08:00
parent 883fd9162f
commit 64f32893bb
46 changed files with 133 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java
View File

@@ -59,8 +59,7 @@ public class EndpointsPropertiesSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(configuration, args);
return SpringApplication.run(configuration, args);
}
});
this.context = future.get(60, TimeUnit.SECONDS);

4
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java
View File

@@ -67,8 +67,8 @@ public class ManagementAddressSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(SampleActuatorApplication.class, args);
return SpringApplication.run(
SampleActuatorApplication.class, args);
}
});
context = future.get(60, TimeUnit.SECONDS);

4
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java
View File

@@ -57,8 +57,8 @@ public class ManagementSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(SampleActuatorApplication.class, args);
return SpringApplication.run(
SampleActuatorApplication.class, args);
}
});
context = future.get(60, TimeUnit.SECONDS);

4
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java
View File

@@ -65,8 +65,8 @@ public class NoManagementSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(SampleActuatorApplication.class, args);
return SpringApplication.run(
SampleActuatorApplication.class, args);
}
});
context = future.get(60, TimeUnit.SECONDS);

7
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java
View File

@@ -69,7 +69,7 @@ public class SampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
return SpringApplication
.run(SampleActuatorApplication.class);
}
});
@@ -145,8 +145,7 @@ public class SampleActuatorApplicationTests {
assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, entity.getStatusCode());
String body = entity.getBody();
assertNotNull(body);
assertTrue("Wrong body: " + body,
body.contains("\"error\":"));
assertTrue("Wrong body: " + body, body.contains("\"error\":"));
}
@Test
@@ -171,7 +170,7 @@ public class SampleActuatorApplicationTests {
.getForEntity("http://localhost:8080/trace", List.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
@SuppressWarnings("unchecked")
List<Map<String, Object>> list = (List<Map<String, Object>>) entity.getBody();
List<Map<String, Object>> list = entity.getBody();
Map<String, Object> trace = list.get(list.size() - 1);
@SuppressWarnings("unchecked")
Map<String, Object> map = (Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>) trace

2
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java
View File

@@ -62,7 +62,7 @@ public class ShutdownSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
return SpringApplication
.run(SampleActuatorApplication.class);
}
});

11
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureManagementSampleActuatorApplicationTests.java
View File

@@ -41,7 +41,7 @@ import org.springframework.web.client.RestTemplate;
/**
* Integration tests for unsecured service endpoints (even with Spring Security on
* classpath).
*
*
* @author Dave Syer
*/
public class UnsecureManagementSampleActuatorApplicationTests {
@@ -55,9 +55,9 @@ public class UnsecureManagementSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(SampleActuatorApplication.class,
"--security.management.enabled=false");
return SpringApplication.run(
SampleActuatorApplication.class,
"--security.management.enabled=false");
}
});
context = future.get(60, TimeUnit.SECONDS);
@@ -87,7 +87,8 @@ public class UnsecureManagementSampleActuatorApplicationTests {
public void testMetrics() throws Exception {
try {
testHomeIsSecure(); // makes sure some requests have been made
} catch (AssertionError ex) {
}
catch (AssertionError ex) {
// ignore;
}
@SuppressWarnings("rawtypes")

6
spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java
View File

@@ -54,9 +54,9 @@ public class UnsecureSampleActuatorApplicationTests {
new Callable<ConfigurableApplicationContext>() {
@Override
public ConfigurableApplicationContext call() throws Exception {
return (ConfigurableApplicationContext) SpringApplication
.run(SampleActuatorApplication.class,
"--security.basic.enabled=false");
return SpringApplication.run(
SampleActuatorApplication.class,
"--security.basic.enabled=false");
}
});
context = future.get(60, TimeUnit.SECONDS);