root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-23 11:09:28 +00:00
parent a7ee2b8e0e 07d9c3fef6
commit 863d505994
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/src/main/java/sample/secure/oauth2/resource/SampleSecureOAuth2ResourceApplication.java → spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/src/main/java/sample/secure/oauth2/actuator/SampleSecureOAuth2ActuatorApplication.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package sample.secure.oauth2.resource; package sample.secure.oauth2.actuator;
import java.util.UUID; import java.util.UUID;
@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
@SpringBootApplication @SpringBootApplication
@EnableResourceServer @EnableResourceServer
@RestController @RestController
public class SampleSecureOAuth2ResourceApplication { public class SampleSecureOAuth2ActuatorApplication {
@GetMapping("/") @GetMapping("/")
public Message home() { public Message home() {
@ -35,27 +35,27 @@ public class SampleSecureOAuth2ResourceApplication {
} }
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(SampleSecureOAuth2ResourceApplication.class, args); SpringApplication.run(SampleSecureOAuth2ActuatorApplication.class, args);
} }
} class Message {
class Message { private String id = UUID.randomUUID().toString();
private String id = UUID.randomUUID().toString(); private String value;
private String value; public Message(String value) {
this.value = value;
public Message(String value) { }
this.value = value;
} public String getId() {
return this.id;
public String getId() { }
return id;
} public String getValue() {
return this.value;
public String getValue() { }
return value;
} }
} }

4
spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/src/test/java/sample/secure/oauth2/resource/SampleSecureOAuth2ResourceApplicationTests.java → spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/src/test/java/sample/secure/oauth2/actuator/SampleSecureOAuth2ActuatorApplicationTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package sample.secure.oauth2.resource; package sample.secure.oauth2.actuator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -45,7 +45,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class SampleSecureOAuth2ResourceApplicationTests { public class SampleSecureOAuth2ActuatorApplicationTests {
@Autowired @Autowired
private WebApplicationContext context; private WebApplicationContext context;