From 5982d2285cd94b8450e58256abd0ab03b2461943 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 8 Nov 2021 15:58:26 -0500 Subject: [PATCH] Restructure samples Closes gh-485 --- samples/README.adoc | 13 +++++++++++++ samples/boot/oauth2-integration/README.adoc | 13 ------------- ...mples-custom-consent-authorizationserver.gradle} | 0 ...ustomConsentAuthorizationServerApplication.java} | 4 ++-- .../sample/config/AuthorizationServerConfig.java | 0 .../java/sample/config/DefaultSecurityConfig.java | 0 .../src/main/java/sample/jose/Jwks.java | 0 .../main/java/sample/jose/KeyGeneratorUtils.java | 0 .../sample/web/AuthorizationConsentController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/templates/consent.html | 0 .../CustomConsentAuthorizationServerTests.java} | 2 +- .../samples-default-authorizationserver.gradle} | 0 .../DefaultAuthorizationServerApplication.java} | 6 +++--- .../sample/config/AuthorizationServerConfig.java | 0 .../java/sample/config/DefaultSecurityConfig.java | 0 .../src/main/java/sample/jose/Jwks.java | 0 .../main/java/sample/jose/KeyGeneratorUtils.java | 0 .../src/main/resources/application.yml | 0 ...DefaultAuthorizationServerApplicationTests.java} | 2 +- .../DefaultAuthorizationServerConsentTests.java} | 2 +- .../samples-messages-client.gradle} | 0 .../java/sample/MessagesClientApplication.java} | 6 +++--- .../src/main/java/sample/config/SecurityConfig.java | 0 .../main/java/sample/config/WebClientConfig.java | 0 .../java/sample/web/AuthorizationController.java | 0 .../src/main/java/sample/web/DefaultController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/templates/index.html | 0 .../samples-messages-resource.gradle} | 0 .../java/sample/MessagesResourceApplication.java} | 6 +++--- .../java/sample/config/ResourceServerConfig.java | 0 .../main/java/sample/web/MessagesController.java | 0 .../src/main/resources/application.yml | 0 34 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 samples/README.adoc delete mode 100644 samples/boot/oauth2-integration/README.adoc rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page/spring-security-samples-boot-oauth2-integrated-authorizationserver-custom-consent-page.gradle => custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle} (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/OAuth2AuthorizationServerCustomConsentPageApplication.java => custom-consent-authorizationserver/src/main/java/sample/CustomConsentAuthorizationServerApplication.java} (84%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/java/sample/config/AuthorizationServerConfig.java (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/java/sample/config/DefaultSecurityConfig.java (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/java/sample/jose/Jwks.java (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/java/sample/jose/KeyGeneratorUtils.java (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/java/sample/web/AuthorizationConsentController.java (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/resources/application.yml (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page => custom-consent-authorizationserver}/src/main/resources/templates/consent.html (100%) rename samples/{boot/oauth2-integration/authorizationserver-custom-consent-page/src/test/java/sample/OAuth2AuthorizationServerCustomConsentTests.java => custom-consent-authorizationserver/src/test/java/sample/CustomConsentAuthorizationServerTests.java} (98%) rename samples/{boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle => default-authorizationserver/samples-default-authorizationserver.gradle} (100%) rename samples/{boot/oauth2-integration/authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java => default-authorizationserver/src/main/java/sample/DefaultAuthorizationServerApplication.java} (81%) rename samples/{boot/oauth2-integration/authorizationserver => default-authorizationserver}/src/main/java/sample/config/AuthorizationServerConfig.java (100%) rename samples/{boot/oauth2-integration/authorizationserver => default-authorizationserver}/src/main/java/sample/config/DefaultSecurityConfig.java (100%) rename samples/{boot/oauth2-integration/authorizationserver => default-authorizationserver}/src/main/java/sample/jose/Jwks.java (100%) rename samples/{boot/oauth2-integration/authorizationserver => default-authorizationserver}/src/main/java/sample/jose/KeyGeneratorUtils.java (100%) rename samples/{boot/oauth2-integration/authorizationserver => default-authorizationserver}/src/main/resources/application.yml (100%) rename samples/{boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java => default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerApplicationTests.java} (98%) rename samples/{boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerConsentTests.java => default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java} (98%) rename samples/{boot/oauth2-integration/client/spring-security-samples-boot-oauth2-integrated-client.gradle => messages-client/samples-messages-client.gradle} (100%) rename samples/{boot/oauth2-integration/client/src/main/java/sample/OAuth2ClientApplication.java => messages-client/src/main/java/sample/MessagesClientApplication.java} (83%) rename samples/{boot/oauth2-integration/client => messages-client}/src/main/java/sample/config/SecurityConfig.java (100%) rename samples/{boot/oauth2-integration/client => messages-client}/src/main/java/sample/config/WebClientConfig.java (100%) rename samples/{boot/oauth2-integration/client => messages-client}/src/main/java/sample/web/AuthorizationController.java (100%) rename samples/{boot/oauth2-integration/client => messages-client}/src/main/java/sample/web/DefaultController.java (100%) rename samples/{boot/oauth2-integration/client => messages-client}/src/main/resources/application.yml (100%) rename samples/{boot/oauth2-integration/client => messages-client}/src/main/resources/templates/index.html (100%) rename samples/{boot/oauth2-integration/resourceserver/spring-security-samples-boot-oauth2-integrated-resourceserver.gradle => messages-resource/samples-messages-resource.gradle} (100%) rename samples/{boot/oauth2-integration/resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java => messages-resource/src/main/java/sample/MessagesResourceApplication.java} (83%) rename samples/{boot/oauth2-integration/resourceserver => messages-resource}/src/main/java/sample/config/ResourceServerConfig.java (100%) rename samples/{boot/oauth2-integration/resourceserver => messages-resource}/src/main/java/sample/web/MessagesController.java (100%) rename samples/{boot/oauth2-integration/resourceserver => messages-resource}/src/main/resources/application.yml (100%) diff --git a/samples/README.adoc b/samples/README.adoc new file mode 100644 index 00000000..281ea6a0 --- /dev/null +++ b/samples/README.adoc @@ -0,0 +1,13 @@ += Messages Sample + +This sample integrates `spring-security-oauth2-client` and `spring-security-oauth2-resource-server` with *Spring Authorization Server*. + +The username is `user1` and the password is `password`. + +== Run the Sample + +* Run Authorization Server -> `./gradlew -b samples/default-authorizationserver/samples-default-authorizationserver.gradle bootRun` +** *IMPORTANT:* Make sure to modify your `/etc/hosts` file to avoid problems with session cookie overwrites between `messages-client` and `default-authorizationserver`. Simply add the entry `127.0.0.1 auth-server` +* Run Resource Server -> `./gradlew -b samples/messages-resource/samples-messages-resource.gradle bootRun` +* Run Client -> `./gradlew -b samples/messages-client/samples-messages-client.gradle bootRun` +* Go to `http://127.0.0.1:8080` diff --git a/samples/boot/oauth2-integration/README.adoc b/samples/boot/oauth2-integration/README.adoc deleted file mode 100644 index 05f9ac2a..00000000 --- a/samples/boot/oauth2-integration/README.adoc +++ /dev/null @@ -1,13 +0,0 @@ -= OAuth 2.0 Integration Sample - -This sample integrates `spring-security-oauth2-client` and `spring-security-oauth2-resource-server` with *Spring Authorization Server*. - -The username is `user1` and the password is `password`. - -== Run the Sample - -* Run Authorization Server -> `./gradlew -b samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle bootRun` -** *IMPORTANT:* Make sure to modify your `/etc/hosts` file to avoid problems with session cookie overwrites between `client` and `authorizationserver`. Simply add the entry `127.0.0.1 auth-server` -* Run Resource Server -> `./gradlew -b samples/boot/oauth2-integration/resourceserver/spring-security-samples-boot-oauth2-integrated-resourceserver.gradle bootRun` -* Run Client -> `./gradlew -b samples/boot/oauth2-integration/client/spring-security-samples-boot-oauth2-integrated-client.gradle bootRun` -* Go to `http://127.0.0.1:8080` diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/spring-security-samples-boot-oauth2-integrated-authorizationserver-custom-consent-page.gradle b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/spring-security-samples-boot-oauth2-integrated-authorizationserver-custom-consent-page.gradle rename to samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/OAuth2AuthorizationServerCustomConsentPageApplication.java b/samples/custom-consent-authorizationserver/src/main/java/sample/CustomConsentAuthorizationServerApplication.java similarity index 84% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/OAuth2AuthorizationServerCustomConsentPageApplication.java rename to samples/custom-consent-authorizationserver/src/main/java/sample/CustomConsentAuthorizationServerApplication.java index 1c56d205..85ed2381 100644 --- a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/OAuth2AuthorizationServerCustomConsentPageApplication.java +++ b/samples/custom-consent-authorizationserver/src/main/java/sample/CustomConsentAuthorizationServerApplication.java @@ -22,10 +22,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author Daniel Garnier-Moiroux */ @SpringBootApplication -public class OAuth2AuthorizationServerCustomConsentPageApplication { +public class CustomConsentAuthorizationServerApplication { public static void main(String[] args) { - SpringApplication.run(OAuth2AuthorizationServerCustomConsentPageApplication.class, args); + SpringApplication.run(CustomConsentAuthorizationServerApplication.class, args); } } diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/config/AuthorizationServerConfig.java b/samples/custom-consent-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/config/AuthorizationServerConfig.java rename to samples/custom-consent-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/custom-consent-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/config/DefaultSecurityConfig.java rename to samples/custom-consent-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/jose/Jwks.java b/samples/custom-consent-authorizationserver/src/main/java/sample/jose/Jwks.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/jose/Jwks.java rename to samples/custom-consent-authorizationserver/src/main/java/sample/jose/Jwks.java diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/jose/KeyGeneratorUtils.java b/samples/custom-consent-authorizationserver/src/main/java/sample/jose/KeyGeneratorUtils.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/jose/KeyGeneratorUtils.java rename to samples/custom-consent-authorizationserver/src/main/java/sample/jose/KeyGeneratorUtils.java diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/web/AuthorizationConsentController.java b/samples/custom-consent-authorizationserver/src/main/java/sample/web/AuthorizationConsentController.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/java/sample/web/AuthorizationConsentController.java rename to samples/custom-consent-authorizationserver/src/main/java/sample/web/AuthorizationConsentController.java diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/resources/application.yml b/samples/custom-consent-authorizationserver/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/resources/application.yml rename to samples/custom-consent-authorizationserver/src/main/resources/application.yml diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/resources/templates/consent.html b/samples/custom-consent-authorizationserver/src/main/resources/templates/consent.html similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/main/resources/templates/consent.html rename to samples/custom-consent-authorizationserver/src/main/resources/templates/consent.html diff --git a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/test/java/sample/OAuth2AuthorizationServerCustomConsentTests.java b/samples/custom-consent-authorizationserver/src/test/java/sample/CustomConsentAuthorizationServerTests.java similarity index 98% rename from samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/test/java/sample/OAuth2AuthorizationServerCustomConsentTests.java rename to samples/custom-consent-authorizationserver/src/test/java/sample/CustomConsentAuthorizationServerTests.java index f9905950..dadd36c8 100644 --- a/samples/boot/oauth2-integration/authorizationserver-custom-consent-page/src/test/java/sample/OAuth2AuthorizationServerCustomConsentTests.java +++ b/samples/custom-consent-authorizationserver/src/test/java/sample/CustomConsentAuthorizationServerTests.java @@ -50,7 +50,7 @@ import static org.mockito.Mockito.when; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @AutoConfigureMockMvc -public class OAuth2AuthorizationServerCustomConsentTests { +public class CustomConsentAuthorizationServerTests { @Autowired private WebClient webClient; diff --git a/samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle rename to samples/default-authorizationserver/samples-default-authorizationserver.gradle diff --git a/samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java b/samples/default-authorizationserver/src/main/java/sample/DefaultAuthorizationServerApplication.java similarity index 81% rename from samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java rename to samples/default-authorizationserver/src/main/java/sample/DefaultAuthorizationServerApplication.java index 3bdedcc3..17a7ddcf 100644 --- a/samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java +++ b/samples/default-authorizationserver/src/main/java/sample/DefaultAuthorizationServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2021 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. @@ -23,10 +23,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @since 0.0.1 */ @SpringBootApplication -public class OAuth2AuthorizationServerApplication { +public class DefaultAuthorizationServerApplication { public static void main(String[] args) { - SpringApplication.run(OAuth2AuthorizationServerApplication.class, args); + SpringApplication.run(DefaultAuthorizationServerApplication.class, args); } } diff --git a/samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java b/samples/default-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java rename to samples/default-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java diff --git a/samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/default-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java rename to samples/default-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java diff --git a/samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/jose/Jwks.java b/samples/default-authorizationserver/src/main/java/sample/jose/Jwks.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/jose/Jwks.java rename to samples/default-authorizationserver/src/main/java/sample/jose/Jwks.java diff --git a/samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/jose/KeyGeneratorUtils.java b/samples/default-authorizationserver/src/main/java/sample/jose/KeyGeneratorUtils.java similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver/src/main/java/sample/jose/KeyGeneratorUtils.java rename to samples/default-authorizationserver/src/main/java/sample/jose/KeyGeneratorUtils.java diff --git a/samples/boot/oauth2-integration/authorizationserver/src/main/resources/application.yml b/samples/default-authorizationserver/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2-integration/authorizationserver/src/main/resources/application.yml rename to samples/default-authorizationserver/src/main/resources/application.yml diff --git a/samples/boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerApplicationTests.java similarity index 98% rename from samples/boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java rename to samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerApplicationTests.java index c352c20a..4c76bec0 100644 --- a/samples/boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java +++ b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerApplicationTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @AutoConfigureMockMvc -public class OAuth2AuthorizationServerApplicationTests { +public class DefaultAuthorizationServerApplicationTests { private static final String REDIRECT_URI = "http://127.0.0.1:8080/login/oauth2/code/messaging-client-oidc"; private static final String AUTHORIZATION_REQUEST = UriComponentsBuilder diff --git a/samples/boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerConsentTests.java b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java similarity index 98% rename from samples/boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerConsentTests.java rename to samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java index 9099cbba..a3f42a4a 100644 --- a/samples/boot/oauth2-integration/authorizationserver/src/test/java/sample/OAuth2AuthorizationServerConsentTests.java +++ b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java @@ -50,7 +50,7 @@ import static org.mockito.Mockito.when; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @AutoConfigureMockMvc -public class OAuth2AuthorizationServerConsentTests { +public class DefaultAuthorizationServerConsentTests { @Autowired private WebClient webClient; diff --git a/samples/boot/oauth2-integration/client/spring-security-samples-boot-oauth2-integrated-client.gradle b/samples/messages-client/samples-messages-client.gradle similarity index 100% rename from samples/boot/oauth2-integration/client/spring-security-samples-boot-oauth2-integrated-client.gradle rename to samples/messages-client/samples-messages-client.gradle diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/OAuth2ClientApplication.java b/samples/messages-client/src/main/java/sample/MessagesClientApplication.java similarity index 83% rename from samples/boot/oauth2-integration/client/src/main/java/sample/OAuth2ClientApplication.java rename to samples/messages-client/src/main/java/sample/MessagesClientApplication.java index 5b0dc8c9..a2db0f93 100644 --- a/samples/boot/oauth2-integration/client/src/main/java/sample/OAuth2ClientApplication.java +++ b/samples/messages-client/src/main/java/sample/MessagesClientApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2021 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. @@ -23,10 +23,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @since 0.0.1 */ @SpringBootApplication -public class OAuth2ClientApplication { +public class MessagesClientApplication { public static void main(String[] args) { - SpringApplication.run(OAuth2ClientApplication.class, args); + SpringApplication.run(MessagesClientApplication.class, args); } } diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java b/samples/messages-client/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/oauth2-integration/client/src/main/java/sample/config/SecurityConfig.java rename to samples/messages-client/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/config/WebClientConfig.java b/samples/messages-client/src/main/java/sample/config/WebClientConfig.java similarity index 100% rename from samples/boot/oauth2-integration/client/src/main/java/sample/config/WebClientConfig.java rename to samples/messages-client/src/main/java/sample/config/WebClientConfig.java diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/web/AuthorizationController.java b/samples/messages-client/src/main/java/sample/web/AuthorizationController.java similarity index 100% rename from samples/boot/oauth2-integration/client/src/main/java/sample/web/AuthorizationController.java rename to samples/messages-client/src/main/java/sample/web/AuthorizationController.java diff --git a/samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java b/samples/messages-client/src/main/java/sample/web/DefaultController.java similarity index 100% rename from samples/boot/oauth2-integration/client/src/main/java/sample/web/DefaultController.java rename to samples/messages-client/src/main/java/sample/web/DefaultController.java diff --git a/samples/boot/oauth2-integration/client/src/main/resources/application.yml b/samples/messages-client/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2-integration/client/src/main/resources/application.yml rename to samples/messages-client/src/main/resources/application.yml diff --git a/samples/boot/oauth2-integration/client/src/main/resources/templates/index.html b/samples/messages-client/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/oauth2-integration/client/src/main/resources/templates/index.html rename to samples/messages-client/src/main/resources/templates/index.html diff --git a/samples/boot/oauth2-integration/resourceserver/spring-security-samples-boot-oauth2-integrated-resourceserver.gradle b/samples/messages-resource/samples-messages-resource.gradle similarity index 100% rename from samples/boot/oauth2-integration/resourceserver/spring-security-samples-boot-oauth2-integrated-resourceserver.gradle rename to samples/messages-resource/samples-messages-resource.gradle diff --git a/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java b/samples/messages-resource/src/main/java/sample/MessagesResourceApplication.java similarity index 83% rename from samples/boot/oauth2-integration/resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java rename to samples/messages-resource/src/main/java/sample/MessagesResourceApplication.java index c102de37..8fc9bb94 100644 --- a/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java +++ b/samples/messages-resource/src/main/java/sample/MessagesResourceApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2021 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. @@ -23,10 +23,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @since 0.0.1 */ @SpringBootApplication -public class OAuth2ResourceServerApplication { +public class MessagesResourceApplication { public static void main(String[] args) { - SpringApplication.run(OAuth2ResourceServerApplication.class, args); + SpringApplication.run(MessagesResourceApplication.class, args); } } diff --git a/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/config/ResourceServerConfig.java b/samples/messages-resource/src/main/java/sample/config/ResourceServerConfig.java similarity index 100% rename from samples/boot/oauth2-integration/resourceserver/src/main/java/sample/config/ResourceServerConfig.java rename to samples/messages-resource/src/main/java/sample/config/ResourceServerConfig.java diff --git a/samples/boot/oauth2-integration/resourceserver/src/main/java/sample/web/MessagesController.java b/samples/messages-resource/src/main/java/sample/web/MessagesController.java similarity index 100% rename from samples/boot/oauth2-integration/resourceserver/src/main/java/sample/web/MessagesController.java rename to samples/messages-resource/src/main/java/sample/web/MessagesController.java diff --git a/samples/boot/oauth2-integration/resourceserver/src/main/resources/application.yml b/samples/messages-resource/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2-integration/resourceserver/src/main/resources/application.yml rename to samples/messages-resource/src/main/resources/application.yml