From 1a94ba4005378e0fb178131153b6c8ddc6eeb645 Mon Sep 17 00:00:00 2001
From: Amit Pandey <amit2103@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:27:46 +0530
Subject: [PATCH] JAVA-30693 :- Upgrade Spring Cloud vault to latest Spring
 Cloud (#15746)

---
 spring-cloud-modules/spring-cloud-vault/pom.xml               | 2 +-
 .../baeldung/spring/cloud/vaultsample/AccountResource.java    | 2 +-
 .../com/baeldung/spring/cloud/vaultsample/SecretResource.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-modules/spring-cloud-vault/pom.xml b/spring-cloud-modules/spring-cloud-vault/pom.xml
index 1698b1f357..014c6774b7 100644
--- a/spring-cloud-modules/spring-cloud-vault/pom.xml
+++ b/spring-cloud-modules/spring-cloud-vault/pom.xml
@@ -77,7 +77,7 @@
     </build>
 
     <properties>
-        <spring-cloud.version>2020.0.3</spring-cloud.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java
index 34147d3719..435ed29b1a 100644
--- a/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java
+++ b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java
@@ -18,7 +18,7 @@ public class AccountResource {
         
         Account acc = repo.findById(id).orElse(null);
         if ( acc != null ) {
-            return new ResponseEntity<Account>(acc, HttpStatus.OK);
+            return new ResponseEntity<>(acc, HttpStatus.OK);
         }
         else {
             return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java
index 9f51a4512f..6a03db90ca 100644
--- a/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java
+++ b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java
@@ -28,10 +28,10 @@ public class SecretResource {
         String value = env.getProperty(key);
         
         if ( value != null ) {        
-            return new ResponseEntity<String>(value, HttpStatus.OK);
+            return new ResponseEntity<>(value, HttpStatus.OK);
         }
         else {
-            return new ResponseEntity<String>("not found", HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>("not found", HttpStatus.NOT_FOUND);
         }              
     }
 }