Skip to content

Commit ec12893

Browse files
Update encryption example for updated encryption module
The encryption module has been updated in paulcwarren/spring-content#2240
1 parent b93dfee commit ec12893

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

spring-content-with-encryption/complete/src/main/java/gettingstarted/FileContentStore.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package gettingstarted;
22

3-
import org.springframework.content.commons.repository.ContentStore;
4-
5-
import org.springframework.content.encryption.EncryptingContentStore;
3+
import org.springframework.content.commons.store.ContentStore;
4+
import org.springframework.content.encryption.store.EncryptingContentStore;
65
import org.springframework.content.rest.StoreRestResource;
76

87
@StoreRestResource

spring-content-with-encryption/complete/src/main/java/gettingstarted/SpringContentApplication.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package gettingstarted;
22

3-
import internal.org.springframework.content.fragments.EncryptingContentStoreConfiguration;
4-
import internal.org.springframework.content.fragments.EncryptingContentStoreConfigurer;
3+
import java.util.List;
54
import org.springframework.boot.SpringApplication;
65
import org.springframework.boot.autoconfigure.SpringBootApplication;
7-
import org.springframework.content.encryption.EnvelopeEncryptionService;
6+
import org.springframework.content.encryption.config.EncryptingContentStoreConfiguration;
7+
import org.springframework.content.encryption.config.EncryptingContentStoreConfigurer;
8+
import org.springframework.content.encryption.keys.VaultTransitDataEncryptionKeyWrapper;
89
import org.springframework.context.annotation.Bean;
910
import org.springframework.context.annotation.Configuration;
1011
import org.springframework.vault.authentication.ClientAuthentication;
@@ -40,16 +41,14 @@ public ClientAuthentication clientAuthentication() {
4041
}
4142

4243
@Bean
43-
public EnvelopeEncryptionService encrypter(VaultOperations vaultOperations) {
44-
return new EnvelopeEncryptionService(vaultOperations);
45-
}
46-
47-
@Bean
48-
public EncryptingContentStoreConfigurer config() {
44+
public EncryptingContentStoreConfigurer<FileContentStore> config(VaultOperations vaultOperations) {
4945
return new EncryptingContentStoreConfigurer<FileContentStore>() {
5046
@Override
5147
public void configure(EncryptingContentStoreConfiguration config) {
52-
config.keyring("fsfile").encryptionKeyContentProperty("key");
48+
config.dataEncryptionKeyWrappers(List.of(
49+
new VaultTransitDataEncryptionKeyWrapper(vaultOperations.opsForTransit(), "fsfile")
50+
))
51+
.encryptionKeyContentProperty("key");
5352
}
5453
};
5554
}

spring-content-with-encryption/complete/src/test/java/gettingstarted/GettingStartedTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
import org.junit.runner.RunWith;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.test.context.SpringBootTest;
12-
import org.springframework.content.encryption.EnvelopeEncryptionService;
1312
import org.springframework.content.fs.io.FileSystemResourceLoader;
14-
import org.springframework.vault.core.VaultOperations;
1513
import org.springframework.web.context.WebApplicationContext;
1614

1715
import java.io.FileInputStream;
@@ -35,12 +33,6 @@ public class GettingStartedTest {
3533
@Autowired
3634
private FileSystemResourceLoader storeLoader;
3735

38-
@Autowired
39-
private EnvelopeEncryptionService encrypter;
40-
41-
@Autowired
42-
private VaultOperations vaultOperations;
43-
4436
private File f;
4537

4638
{

0 commit comments

Comments
 (0)