From ec1289382f95b7e998fee324084e9f9281f3a175 Mon Sep 17 00:00:00 2001
From: Lars Vierbergen <lars@vbgn.be>
Date: Tue, 21 Jan 2025 14:33:46 +0100
Subject: [PATCH] Update encryption example for updated encryption module

The encryption module has been updated in paulcwarren/spring-content#2240
---
 .../java/gettingstarted/FileContentStore.java |  5 ++---
 .../SpringContentApplication.java             | 19 +++++++++----------
 .../gettingstarted/GettingStartedTest.java    |  8 --------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/spring-content-with-encryption/complete/src/main/java/gettingstarted/FileContentStore.java b/spring-content-with-encryption/complete/src/main/java/gettingstarted/FileContentStore.java
index bcfaca2..58d5d6e 100644
--- a/spring-content-with-encryption/complete/src/main/java/gettingstarted/FileContentStore.java
+++ b/spring-content-with-encryption/complete/src/main/java/gettingstarted/FileContentStore.java
@@ -1,8 +1,7 @@
 package gettingstarted;
 
-import org.springframework.content.commons.repository.ContentStore;
-
-import org.springframework.content.encryption.EncryptingContentStore;
+import org.springframework.content.commons.store.ContentStore;
+import org.springframework.content.encryption.store.EncryptingContentStore;
 import org.springframework.content.rest.StoreRestResource;
 
 @StoreRestResource
diff --git a/spring-content-with-encryption/complete/src/main/java/gettingstarted/SpringContentApplication.java b/spring-content-with-encryption/complete/src/main/java/gettingstarted/SpringContentApplication.java
index beb2795..d993333 100644
--- a/spring-content-with-encryption/complete/src/main/java/gettingstarted/SpringContentApplication.java
+++ b/spring-content-with-encryption/complete/src/main/java/gettingstarted/SpringContentApplication.java
@@ -1,10 +1,11 @@
 package gettingstarted;
 
-import internal.org.springframework.content.fragments.EncryptingContentStoreConfiguration;
-import internal.org.springframework.content.fragments.EncryptingContentStoreConfigurer;
+import java.util.List;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.content.encryption.EnvelopeEncryptionService;
+import org.springframework.content.encryption.config.EncryptingContentStoreConfiguration;
+import org.springframework.content.encryption.config.EncryptingContentStoreConfigurer;
+import org.springframework.content.encryption.keys.VaultTransitDataEncryptionKeyWrapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.vault.authentication.ClientAuthentication;
@@ -40,16 +41,14 @@ public ClientAuthentication clientAuthentication() {
 		}
 
 		@Bean
-		public EnvelopeEncryptionService encrypter(VaultOperations vaultOperations) {
-			return new EnvelopeEncryptionService(vaultOperations);
-		}
-
-		@Bean
-		public EncryptingContentStoreConfigurer config() {
+		public EncryptingContentStoreConfigurer<FileContentStore> config(VaultOperations vaultOperations) {
 			return new EncryptingContentStoreConfigurer<FileContentStore>() {
 				@Override
 				public void configure(EncryptingContentStoreConfiguration config) {
-					config.keyring("fsfile").encryptionKeyContentProperty("key");
+					config.dataEncryptionKeyWrappers(List.of(
+									new VaultTransitDataEncryptionKeyWrapper(vaultOperations.opsForTransit(), "fsfile")
+							))
+							.encryptionKeyContentProperty("key");
 				}
 			};
 		}
diff --git a/spring-content-with-encryption/complete/src/test/java/gettingstarted/GettingStartedTest.java b/spring-content-with-encryption/complete/src/test/java/gettingstarted/GettingStartedTest.java
index 73bf6df..960dfc2 100644
--- a/spring-content-with-encryption/complete/src/test/java/gettingstarted/GettingStartedTest.java
+++ b/spring-content-with-encryption/complete/src/test/java/gettingstarted/GettingStartedTest.java
@@ -9,9 +9,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.content.encryption.EnvelopeEncryptionService;
 import org.springframework.content.fs.io.FileSystemResourceLoader;
-import org.springframework.vault.core.VaultOperations;
 import org.springframework.web.context.WebApplicationContext;
 
 import java.io.FileInputStream;
@@ -35,12 +33,6 @@ public class GettingStartedTest {
 	@Autowired
 	private FileSystemResourceLoader storeLoader;
 
-	@Autowired
-	private EnvelopeEncryptionService encrypter;
-
-	@Autowired
-	private VaultOperations vaultOperations;
-
 	private File f;
 
 	{