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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-01-17 09:57:53 +01:00
parent 8f201d6de5 5b7292212f
commit f4f5a70cb2
9 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-samples/spring-boot-sample-data-ldap/src/main/java/sample/data/ldap/SampleLdapApplication.java
View File

@@ -44,12 +44,6 @@ public class SampleLdapApplication implements CommandLineRunner {
System.out.println("Person found with findByPhone('+46 555-123456'):");
System.out.println("--------------------------------");
System.out.println(this.repository.findByPhone("+46 555-123456"));
//
// System.out.println("Customers found with findByLastName('Smith'):");
// System.out.println("--------------------------------");
// for (Customer customer : this.repository.findByLastName("Smith")) {
// System.out.println(customer);
// }
}
public static void main(String[] args) throws Exception {

2
spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/src/test/java/sample/hypermedia/ui/secure/SampleHypermediaUiSecureApplicationTests.java
View File

@@ -43,7 +43,7 @@ public class SampleHypermediaUiSecureApplicationTests {
}
@Test
public void testInSecureNestedPath() throws Exception {
public void testInsecureNestedPath() throws Exception {
ResponseEntity<String> entity = this.restTemplate.getForEntity("/env",
String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);