Skip to content

Commit 2932092

Browse files
authored
Move mongodb-crypt classes to internal package (#1500)
* Move all but one of the classes in mongodb-crypt module to an internal package * The MongoCryptException class stays where it is because it is exposed in the API as a chained exception. JAVA-5584
1 parent e89ada5 commit 2932092

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+243
-204
lines changed

config/spotbugs/exclude.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262

263263
<!-- mongocrypt -->
264264
<Match>
265-
<Class name="com.mongodb.crypt.capi.CAPI$cstring"/>
265+
<Class name="com.mongodb.internal.crypt.capi.CAPI$cstring"/>
266266
<Bug pattern="NM_CLASS_NAMING_CONVENTION"/>
267267
</Match>
268268

driver-benchmarks/src/main/com/mongodb/benchmark/framework/MongoCryptBenchmarkRunner.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
*
1818
*/
1919

20-
import com.mongodb.crypt.capi.CAPI;
21-
import com.mongodb.crypt.capi.MongoCrypt;
22-
import com.mongodb.crypt.capi.MongoCryptContext;
23-
import com.mongodb.crypt.capi.MongoCryptOptions;
24-
import com.mongodb.crypt.capi.MongoCrypts;
25-
import com.mongodb.crypt.capi.MongoExplicitEncryptOptions;
26-
import com.mongodb.crypt.capi.MongoLocalKmsProviderOptions;
20+
import com.mongodb.internal.crypt.capi.CAPI;
21+
import com.mongodb.internal.crypt.capi.MongoCrypt;
22+
import com.mongodb.internal.crypt.capi.MongoCryptContext;
23+
import com.mongodb.internal.crypt.capi.MongoCryptOptions;
24+
import com.mongodb.internal.crypt.capi.MongoCrypts;
25+
import com.mongodb.internal.crypt.capi.MongoExplicitEncryptOptions;
26+
import com.mongodb.internal.crypt.capi.MongoLocalKmsProviderOptions;
2727
import org.bson.BsonBinary;
2828
import org.bson.BsonBinarySubType;
2929
import org.bson.BsonDocument;

driver-core/src/main/com/mongodb/internal/capi/MongoCryptHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.mongodb.MongoClientSettings;
2525
import com.mongodb.MongoConfigurationException;
2626
import com.mongodb.client.model.vault.RewrapManyDataKeyOptions;
27-
import com.mongodb.crypt.capi.MongoCryptOptions;
2827
import com.mongodb.internal.authentication.AwsCredentialHelper;
2928
import com.mongodb.internal.authentication.AzureCredentialHelper;
3029
import com.mongodb.internal.authentication.GcpCredentialHelper;
30+
import com.mongodb.internal.crypt.capi.MongoCryptOptions;
3131
import com.mongodb.lang.Nullable;
3232
import org.bson.BsonDocument;
3333
import org.bson.BsonDocumentWrapper;

driver-core/src/main/com/mongodb/internal/client/vault/EncryptOptionsHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.mongodb.client.model.vault.EncryptOptions;
1919
import com.mongodb.client.model.vault.RangeOptions;
20-
import com.mongodb.crypt.capi.MongoExplicitEncryptOptions;
20+
import com.mongodb.internal.crypt.capi.MongoExplicitEncryptOptions;
2121
import org.bson.BsonDocument;
2222
import org.bson.BsonInt32;
2323
import org.bson.BsonInt64;

driver-core/src/test/functional/com/mongodb/internal/capi/MongoCryptHelperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.mongodb.MongoClientException;
2222
import com.mongodb.MongoClientSettings;
2323
import com.mongodb.client.model.vault.RewrapManyDataKeyOptions;
24-
import com.mongodb.crypt.capi.MongoCryptOptions;
24+
import com.mongodb.internal.crypt.capi.MongoCryptOptions;
2525
import org.bson.BsonDocument;
2626
import org.junit.jupiter.api.Test;
2727

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CommandMarker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.mongodb.MongoOperationTimeoutException;
2323
import com.mongodb.ReadConcern;
2424
import com.mongodb.ReadPreference;
25-
import com.mongodb.crypt.capi.MongoCrypt;
25+
import com.mongodb.internal.crypt.capi.MongoCrypt;
2626
import com.mongodb.internal.time.Timeout;
2727
import com.mongodb.lang.Nullable;
2828
import com.mongodb.reactivestreams.client.MongoClient;

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import com.mongodb.client.model.vault.DataKeyOptions;
2525
import com.mongodb.client.model.vault.EncryptOptions;
2626
import com.mongodb.client.model.vault.RewrapManyDataKeyOptions;
27-
import com.mongodb.crypt.capi.MongoCrypt;
28-
import com.mongodb.crypt.capi.MongoCryptContext;
2927
import com.mongodb.crypt.capi.MongoCryptException;
30-
import com.mongodb.crypt.capi.MongoDataKeyOptions;
31-
import com.mongodb.crypt.capi.MongoKeyDecryptor;
32-
import com.mongodb.crypt.capi.MongoRewrapManyDataKeyOptions;
3328
import com.mongodb.internal.capi.MongoCryptHelper;
29+
import com.mongodb.internal.crypt.capi.MongoCrypt;
30+
import com.mongodb.internal.crypt.capi.MongoCryptContext;
31+
import com.mongodb.internal.crypt.capi.MongoDataKeyOptions;
32+
import com.mongodb.internal.crypt.capi.MongoKeyDecryptor;
33+
import com.mongodb.internal.crypt.capi.MongoRewrapManyDataKeyOptions;
3434
import com.mongodb.internal.diagnostics.logging.Logger;
3535
import com.mongodb.internal.diagnostics.logging.Loggers;
3636
import com.mongodb.internal.time.Timeout;
@@ -48,8 +48,8 @@
4848
import java.util.function.Supplier;
4949

5050
import static com.mongodb.assertions.Assertions.notNull;
51-
import static com.mongodb.crypt.capi.MongoCryptContext.State;
5251
import static com.mongodb.internal.client.vault.EncryptOptionsHelper.asMongoExplicitEncryptOptions;
52+
import static com.mongodb.internal.crypt.capi.MongoCryptContext.State;
5353

5454
/**
5555
* <p>This class is not part of the public API and may be removed or changed at any time</p>

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypts.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.mongodb.MongoClientException;
2222
import com.mongodb.MongoClientSettings;
2323
import com.mongodb.MongoNamespace;
24-
import com.mongodb.crypt.capi.MongoCrypt;
25-
import com.mongodb.crypt.capi.MongoCrypts;
24+
import com.mongodb.internal.crypt.capi.MongoCrypt;
25+
import com.mongodb.internal.crypt.capi.MongoCrypts;
2626
import com.mongodb.reactivestreams.client.MongoClient;
2727
import com.mongodb.reactivestreams.client.MongoClients;
2828

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/KeyManagementService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.mongodb.connection.AsyncCompletionHandler;
2525
import com.mongodb.connection.SocketSettings;
2626
import com.mongodb.connection.SslSettings;
27-
import com.mongodb.crypt.capi.MongoKeyDecryptor;
2827
import com.mongodb.internal.TimeoutContext;
2928
import com.mongodb.internal.TimeoutSettings;
3029
import com.mongodb.internal.connection.AsynchronousChannelStream;
@@ -33,6 +32,7 @@
3332
import com.mongodb.internal.connection.Stream;
3433
import com.mongodb.internal.connection.StreamFactory;
3534
import com.mongodb.internal.connection.TlsChannelStreamFactoryFactory;
35+
import com.mongodb.internal.crypt.capi.MongoKeyDecryptor;
3636
import com.mongodb.internal.diagnostics.logging.Logger;
3737
import com.mongodb.internal.diagnostics.logging.Loggers;
3838
import com.mongodb.internal.time.Timeout;

driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.mongodb.client.MongoClient;
2727
import com.mongodb.client.MongoClients;
2828
import com.mongodb.client.MongoDatabase;
29-
import com.mongodb.crypt.capi.MongoCrypt;
29+
import com.mongodb.internal.crypt.capi.MongoCrypt;
3030
import com.mongodb.internal.time.Timeout;
3131
import com.mongodb.lang.Nullable;
3232
import org.bson.RawBsonDocument;

0 commit comments

Comments
 (0)