From dce3f02f668f391720a4768cb8dc8f4b08f69f57 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Fri, 21 Jan 2022 01:41:30 -0500 Subject: [PATCH] Revert "Use Java 8 for examples project" This reverts commit 7b333150a284a787a5f5d20eee7c5a4f51a99001. --- .../guides/examples/docs-modules-guides-examples.gradle | 4 +++- .../main/java/sample/jpa/JpaOAuth2AuthorizationService.java | 2 +- .../main/java/sample/jpa/JpaRegisteredClientRepository.java | 2 +- .../guides/examples/src/test/java/sample/jpa/JpaTests.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/modules/guides/examples/docs-modules-guides-examples.gradle b/docs/modules/guides/examples/docs-modules-guides-examples.gradle index 21989f6e..8b80bf1c 100644 --- a/docs/modules/guides/examples/docs-modules-guides-examples.gradle +++ b/docs/modules/guides/examples/docs-modules-guides-examples.gradle @@ -1,10 +1,12 @@ plugins { + //id 'org.springframework.boot' version '2.6.2' + //id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } group = 'org.springframework.security' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +sourceCompatibility = '11' repositories { mavenCentral() diff --git a/docs/modules/guides/examples/src/main/java/sample/jpa/JpaOAuth2AuthorizationService.java b/docs/modules/guides/examples/src/main/java/sample/jpa/JpaOAuth2AuthorizationService.java index 150a4662..5ed2cbd8 100644 --- a/docs/modules/guides/examples/src/main/java/sample/jpa/JpaOAuth2AuthorizationService.java +++ b/docs/modules/guides/examples/src/main/java/sample/jpa/JpaOAuth2AuthorizationService.java @@ -234,7 +234,7 @@ public class JpaOAuth2AuthorizationService implements OAuth2AuthorizationService private Map parseMap(String data) { try { - return this.objectMapper.readValue(data, new TypeReference>() { + return this.objectMapper.readValue(data, new TypeReference<>() { }); } catch (Exception ex) { throw new IllegalArgumentException(ex.getMessage(), ex); diff --git a/docs/modules/guides/examples/src/main/java/sample/jpa/JpaRegisteredClientRepository.java b/docs/modules/guides/examples/src/main/java/sample/jpa/JpaRegisteredClientRepository.java index 4f4df188..228da9ae 100644 --- a/docs/modules/guides/examples/src/main/java/sample/jpa/JpaRegisteredClientRepository.java +++ b/docs/modules/guides/examples/src/main/java/sample/jpa/JpaRegisteredClientRepository.java @@ -135,7 +135,7 @@ public class JpaRegisteredClientRepository implements RegisteredClientRepository private Map parseMap(String data) { try { - return this.objectMapper.readValue(data, new TypeReference>() { + return this.objectMapper.readValue(data, new TypeReference<>() { }); } catch (Exception ex) { throw new IllegalArgumentException(ex.getMessage(), ex); diff --git a/docs/modules/guides/examples/src/test/java/sample/jpa/JpaTests.java b/docs/modules/guides/examples/src/test/java/sample/jpa/JpaTests.java index 605ea56d..e66a1b05 100644 --- a/docs/modules/guides/examples/src/test/java/sample/jpa/JpaTests.java +++ b/docs/modules/guides/examples/src/test/java/sample/jpa/JpaTests.java @@ -82,7 +82,7 @@ import static sample.util.RegisteredClients.messagingClient; public class JpaTests { private static final Pattern HIDDEN_STATE_INPUT_PATTERN = Pattern.compile(".+.+"); - private static final TypeReference> TOKEN_RESPONSE_TYPE_REFERENCE = new TypeReference>() { + private static final TypeReference> TOKEN_RESPONSE_TYPE_REFERENCE = new TypeReference<>() { }; public final SpringTestContext spring = new SpringTestContext(this);