Skip to content

Commit

Permalink
Polishing.
Browse files Browse the repository at this point in the history 
Reformat code, replace known unsupported constructor with UnsupportedOperationException.

See #4432
Original pull request: #4439
  • Loading branch information
@mp911de
mp911de committed Jul 10, 2023
1 parent 2cc5e42 commit f0697db
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 94 deletions.
13 changes: 6 additions & 7 deletions ...va/org/springframework/data/mongodb/core/convert/encryption/MongoEncryptionConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.bson.BsonDocument;
import org.bson.BsonValue;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.bson.types.Binary;
import org.springframework.core.CollectionFactory;
import org.springframework.data.mongodb.core.convert.MongoConversionContext;
Expand Down Expand Up @@ -96,7 +95,7 @@ public Object decrypt(Object encryptedValue, EncryptionContext context) {
if (!persistentProperty.isEntity()) {
Collection<Object> collection = CollectionFactory.createCollection(persistentProperty.getType(), size);
iterable.forEach(it -> {
if(it instanceof BsonValue bsonValue) {
if (it instanceof BsonValue bsonValue) {
collection.add(BsonUtils.toJavaType(bsonValue));
} else {
collection.add(context.read(it, persistentProperty.getActualType()));
Expand All @@ -107,7 +106,7 @@ public Object decrypt(Object encryptedValue, EncryptionContext context) {
} else {
Collection<Object> collection = CollectionFactory.createCollection(persistentProperty.getType(), size);
iterable.forEach(it -> {
if(it instanceof BsonValue bsonValue) {
if (it instanceof BsonValue bsonValue) {
collection.add(context.read(BsonUtils.toJavaType(bsonValue), persistentProperty.getActualType()));
} else {
collection.add(context.read(it, persistentProperty.getActualType()));
Expand All @@ -118,14 +117,14 @@ public Object decrypt(Object encryptedValue, EncryptionContext context) {
}

if (!persistentProperty.isEntity() && persistentProperty.isMap()) {
if(persistentProperty.getType() != Document.class) {
if(decryptedValue instanceof BsonValue bsonValue) {
if (persistentProperty.getType() != Document.class) {
if (decryptedValue instanceof BsonValue bsonValue) {
return new LinkedHashMap<>((Document) BsonUtils.toJavaType(bsonValue));
}
if(decryptedValue instanceof Document document) {
if (decryptedValue instanceof Document document) {
return new LinkedHashMap<>(document);
}
if(decryptedValue instanceof Map map) {
if (decryptedValue instanceof Map map) {
return map;
}
}
Expand Down
68 changes: 27 additions & 41 deletions spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/BsonUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,36 +287,22 @@ static void removeFrom(Bson bson, String key) {
*/
public static Object toJavaType(BsonValue value) {

switch (value.getBsonType()) {
case INT32:
return value.asInt32().getValue();
case INT64:
return value.asInt64().getValue();
case STRING:
return value.asString().getValue();
case DECIMAL128:
return value.asDecimal128().doubleValue();
case DOUBLE:
return value.asDouble().getValue();
case BOOLEAN:
return value.asBoolean().getValue();
case OBJECT_ID:
return value.asObjectId().getValue();
case DB_POINTER:
return new DBRef(value.asDBPointer().getNamespace(), value.asDBPointer().getId());
case BINARY:
return value.asBinary().getData();
case DATE_TIME:
return new Date(value.asDateTime().getValue());
case SYMBOL:
return value.asSymbol().getSymbol();
case ARRAY:
return value.asArray().toArray();
case DOCUMENT:
return Document.parse(value.asDocument().toJson());
default:
return value;
}
return switch (value.getBsonType()) {
case INT32 -> value.asInt32().getValue();
case INT64 -> value.asInt64().getValue();
case STRING -> value.asString().getValue();
case DECIMAL128 -> value.asDecimal128().doubleValue();
case DOUBLE -> value.asDouble().getValue();
case BOOLEAN -> value.asBoolean().getValue();
case OBJECT_ID -> value.asObjectId().getValue();
case DB_POINTER -> new DBRef(value.asDBPointer().getNamespace(), value.asDBPointer().getId());
case BINARY -> value.asBinary().getData();
case DATE_TIME -> new Date(value.asDateTime().getValue());
case SYMBOL -> value.asSymbol().getSymbol();
case ARRAY -> value.asArray().toArray();
case DOCUMENT -> Document.parse(value.asDocument().toJson());
default -> value;
};
}

/**
Expand All @@ -341,6 +327,7 @@ public static BsonValue simpleToBsonValue(Object source) {
* @throws IllegalArgumentException if {@literal source} does not correspond to a {@link BsonValue} type.
* @since 4.2
*/
@SuppressWarnings("unchecked")
public static BsonValue simpleToBsonValue(Object source, CodecRegistry codecRegistry) {

if (source instanceof BsonValue bsonValue) {
Expand Down Expand Up @@ -407,7 +394,7 @@ public static BsonValue simpleToBsonValue(Object source, CodecRegistry codecRegi

/**
* Merge the given {@link Document documents} into on in the given order. Keys contained within multiple documents are
* overwritten by their follow ups.
* overwritten by their follow-ups.
*
* @param documents must not be {@literal null}. Can be empty.
* @return the document containing all key value pairs.
Expand Down Expand Up @@ -730,8 +717,9 @@ private static String serializeValue(@Nullable Object value) {

private static String toString(Map<?, ?> source) {

// Avoid String.format for performance
return iterableToDelimitedString(source.entrySet(), "{ ", " }",
entry -> String.format("\"%s\" : %s", entry.getKey(), toJson(entry.getValue())));
entry -> "\"" + entry.getKey() + "\" : " + toJson(entry.getValue()));
}

private static String toString(Collection<?> source) {
Expand All @@ -748,12 +736,13 @@ private static <T> String iterableToDelimitedString(Iterable<T> source, String p
return joiner.toString();
}

private static class BsonCapturingWriter extends AbstractBsonWriter {
static class BsonCapturingWriter extends AbstractBsonWriter {

List<BsonValue> values = new ArrayList<>(0);
private final List<BsonValue> values = new ArrayList<>(0);

public BsonCapturingWriter(Class<?> type) {
super(new BsonWriterSettings());

if (ClassUtils.isAssignable(Map.class, type)) {
setContext(new Context(null, BsonContextType.DOCUMENT));
} else if (ClassUtils.isAssignable(List.class, type) || type.isArray()) {
Expand All @@ -763,6 +752,7 @@ public BsonCapturingWriter(Class<?> type) {
}
}

@Nullable
BsonValue getCapturedValue() {

if (values.isEmpty()) {
Expand Down Expand Up @@ -852,18 +842,14 @@ protected void doWriteJavaScript(String value) {

@Override
protected void doWriteJavaScriptWithScope(String value) {
values.add(new BsonJavaScriptWithScope(value, null));
throw new UnsupportedOperationException("Cannot capture JavaScriptWith");
}

@Override
protected void doWriteMaxKey() {

}
protected void doWriteMaxKey() {}

@Override
protected void doWriteMinKey() {

}
protected void doWriteMinKey() {}

@Override
protected void doWriteNull() {
Expand Down
47 changes: 19 additions & 28 deletions ...est/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.time.Month;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand All @@ -34,14 +33,6 @@
import java.util.function.Function;
import java.util.function.Supplier;

import com.mongodb.ClientEncryptionSettings;
import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.IndexOptions;
import com.mongodb.client.model.Indexes;
import com.mongodb.client.vault.ClientEncryptions;
import org.assertj.core.api.Assertions;
import org.bson.BsonBinary;
import org.bson.Document;
Expand All @@ -61,13 +52,21 @@
import org.springframework.data.mongodb.core.convert.encryption.MongoEncryptionConverter;
import org.springframework.data.mongodb.core.mapping.ExplicitEncrypted;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.util.Lazy;

import com.mongodb.ClientEncryptionSettings;
import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings;
import com.mongodb.MongoNamespace;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.IndexOptions;
import com.mongodb.client.model.Indexes;
import com.mongodb.client.model.vault.DataKeyOptions;
import com.mongodb.client.vault.ClientEncryption;
import org.springframework.data.util.Lazy;
import com.mongodb.client.vault.ClientEncryptions;

/**
* @author Christoph Strobl
Expand All @@ -87,7 +86,7 @@ void encryptAndDecryptSimpleValue() {

verifyThat(source) //
.identifiedBy(Person::getId) //
.wasSavedMatching(it -> assertThat(it.get("ssn")).isInstanceOf(Binary.class)) //
.wasSavedMatching(it -> assertThat(it.get("ssn")).isInstanceOf(Binary.class)) //
.loadedIsEqualToSource();
}

Expand Down Expand Up @@ -119,7 +118,7 @@ void encryptAndDecryptComplexValue() {

verifyThat(source) //
.identifiedBy(Person::getId) //
.wasSavedMatching(it -> assertThat(it.get("address")).isInstanceOf(Binary.class)) //
.wasSavedMatching(it -> assertThat(it.get("address")).isInstanceOf(Binary.class)) //
.loadedIsEqualToSource();
}

Expand Down Expand Up @@ -483,24 +482,17 @@ ClientEncryptionSettings encryptionSettings(MongoClient mongoClient) {
MongoCollection<Document> collection = mongoClient.getDatabase(getDatabaseName()).getCollection("test");
collection.drop(); // Clear old data

final byte[] localMasterKey = new byte[96];
byte[] localMasterKey = new byte[96];
new SecureRandom().nextBytes(localMasterKey);
Map<String, Map<String, Object>> kmsProviders = new HashMap<>() {
{
put("local", new HashMap<>() {
{
put("key", localMasterKey);
}
});
}
};
Map<String, Map<String, Object>> kmsProviders = Map.of("local", Map.of("key", localMasterKey));

// Create the ClientEncryption instance
ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
return ClientEncryptionSettings.builder() //
.keyVaultMongoClientSettings(
MongoClientSettings.builder().applyConnectionString(new ConnectionString("mongodb://localhost")).build())
.keyVaultNamespace(keyVaultNamespace.getFullName()).kmsProviders(kmsProviders).build();
return clientEncryptionSettings;
MongoClientSettings.builder().applyConnectionString(new ConnectionString("mongodb://localhost")).build()) //
.keyVaultNamespace(keyVaultNamespace.getFullName()) //
.kmsProviders(kmsProviders) //
.build();
}
}

Expand Down Expand Up @@ -693,8 +685,7 @@ public String toString() {
+ ", wallet=" + this.getWallet() + ", address=" + this.getAddress() + ", encryptedZip="
+ this.getEncryptedZip() + ", listOfString=" + this.getListOfString() + ", listOfComplex="
+ this.getListOfComplex() + ", viaAltKeyNameField=" + this.getViaAltKeyNameField() + ", mapOfString="
+ this.getMapOfString() + ", mapOfComplex=" + this.getMapOfComplex()
+ ", today=" + this.getToday() + ")";
+ this.getMapOfString() + ", mapOfComplex=" + this.getMapOfComplex() + ", today=" + this.getToday() + ")";
}
}

Expand Down
9 changes: 6 additions & 3 deletions .../test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ protected void configureClientSettings(Builder builder) {
ClientEncryptionSettings clientEncryptionSettings = encryptionSettings(mongoClient);
mongoClient.close();

builder.autoEncryptionSettings(
AutoEncryptionSettings.builder().kmsProviders(clientEncryptionSettings.getKmsProviders())
.keyVaultNamespace(clientEncryptionSettings.getKeyVaultNamespace()).bypassAutoEncryption(true).build());
builder.autoEncryptionSettings(AutoEncryptionSettings.builder() //
.kmsProviders(clientEncryptionSettings.getKmsProviders()) //
.keyVaultNamespace(clientEncryptionSettings.getKeyVaultNamespace()) //
.bypassAutoEncryption(true).build());
}

@Override
Expand All @@ -81,6 +82,7 @@ protected void configureConverters(MongoConverterConfigurationAdapter converterC
}

@Bean
@Override
MongoEncryptionConverter encryptingConverter(MongoClientEncryption mongoClientEncryption) {

Lazy<BsonBinary> dataKey = Lazy.of(() -> mongoClientEncryption.getClientEncryption().createDataKey("local",
Expand All @@ -91,6 +93,7 @@ MongoEncryptionConverter encryptingConverter(MongoClientEncryption mongoClientEn
}

@Bean
@Override
CachingMongoClientEncryption clientEncryption(ClientEncryptionSettings encryptionSettings) {
return new CachingMongoClientEncryption(() -> ClientEncryptions.create(encryptionSettings));
}
Expand Down
23 changes: 8 additions & 15 deletions ...ngodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.security.SecureRandom;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.bson.BsonBinary;
Expand Down Expand Up @@ -66,6 +65,7 @@ protected String getDatabaseName() {
}

@Bean
@Override
public MongoClient mongoClient() {
return super.mongoClient();
}
Expand Down Expand Up @@ -106,24 +106,17 @@ ClientEncryptionSettings encryptionSettings(MongoClient mongoClient) {
MongoCollection<Document> collection = mongoClient.getDatabase(getDatabaseName()).getCollection("test");
collection.drop(); // Clear old data

final byte[] localMasterKey = new byte[96];
byte[] localMasterKey = new byte[96];
new SecureRandom().nextBytes(localMasterKey);
Map<String, Map<String, Object>> kmsProviders = new HashMap<>() {
{
put("local", new HashMap<>() {
{
put("key", localMasterKey);
}
});
}
};
Map<String, Map<String, Object>> kmsProviders = Map.of("local", Map.of("key", localMasterKey));

// Create the ClientEncryption instance
ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
return ClientEncryptionSettings.builder()
.keyVaultMongoClientSettings(
MongoClientSettings.builder().applyConnectionString(new ConnectionString("mongodb://localhost")).build())
.keyVaultNamespace(keyVaultNamespace.getFullName()).kmsProviders(kmsProviders).build();
return clientEncryptionSettings;
MongoClientSettings.builder().applyConnectionString(new ConnectionString("mongodb://localhost")).build()) //
.keyVaultNamespace(keyVaultNamespace.getFullName()) //
.kmsProviders(kmsProviders) //
.build();
}
}
}

0 comments on commit f0697db

Please sign in to comment.