Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix config bean dependencies. (#1588)

Browse Source 
Closes #1557.
This commit is contained in:
Michael Reiche
2022-10-12 09:41:08 -10:00
committed by GitHub
parent b0d96fc52e
commit faf3dd9b40
2 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java
View File

@@ -344,9 +344,9 @@ public class CouchbaseRepositoryFieldLevelEncryptionIntegrationTests extends Clu
}
@Override
public ObjectMapper couchbaseObjectMapper(CryptoManager cryptoManager) {
ObjectMapper om = super.couchbaseObjectMapper(cryptoManager);
om.registerModule(new JodaModule());
public ObjectMapper couchbaseObjectMapper() {
ObjectMapper om = super.couchbaseObjectMapper();
om.registerModule(new JodaModule()); // to test joda mapping
return om;
}
@@ -356,8 +356,6 @@ public class CouchbaseRepositoryFieldLevelEncryptionIntegrationTests extends Clu
builder.securityConfig(
SecurityConfig.builder().trustManagerFactory(InsecureTrustManagerFactory.INSTANCE).enableTls(true));
}
CryptoManager cryptoManager = cryptoManager();
builder.cryptoManager(cryptoManager).build();
}
@Override
@@ -390,27 +388,6 @@ public class CouchbaseRepositoryFieldLevelEncryptionIntegrationTests extends Clu
return result;
}
private String toBytes(byte[] plaintext) {
StringBuffer sb = new StringBuffer();
for (byte b : plaintext) {
sb.append(b);
sb.append(" ");
}
return sb.toString();
}
private boolean cmp(byte[] a, byte[] b) {
if (a.length != b.length)
return false;
for (int i = 0; i < a.length; i++) {
if (a[i] != b[i])
return false;
}
return true;
}
byte[] canned_sdk_encbytes = { 34, 65, 81, 73, 68, 66, 65, 61, 61, 34 };
byte[] canned_spring_encbytes = { 91, 49, 44, 50, 44, 51, 44, 52, 93 };
}
}