Skip to content

Commit 2932092

Browse files
jyeminjyemin
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;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import com.mongodb.client.model.vault.DataKeyOptions;
2424
import com.mongodb.client.model.vault.EncryptOptions;
2525
import com.mongodb.client.model.vault.RewrapManyDataKeyOptions;
26-
import com.mongodb.crypt.capi.MongoCrypt;
27-
import com.mongodb.crypt.capi.MongoCryptContext;
2826
import com.mongodb.crypt.capi.MongoCryptException;
29-
import com.mongodb.crypt.capi.MongoDataKeyOptions;
30-
import com.mongodb.crypt.capi.MongoKeyDecryptor;
31-
import com.mongodb.crypt.capi.MongoRewrapManyDataKeyOptions;
3227
import com.mongodb.internal.capi.MongoCryptHelper;
28+
import com.mongodb.internal.crypt.capi.MongoCrypt;
29+
import com.mongodb.internal.crypt.capi.MongoCryptContext;
30+
import com.mongodb.internal.crypt.capi.MongoDataKeyOptions;
31+
import com.mongodb.internal.crypt.capi.MongoKeyDecryptor;
32+
import com.mongodb.internal.crypt.capi.MongoRewrapManyDataKeyOptions;
3333
import com.mongodb.internal.time.Timeout;
3434
import com.mongodb.lang.Nullable;
3535
import org.bson.BsonBinary;
@@ -46,8 +46,8 @@
4646

4747
import static com.mongodb.assertions.Assertions.assertNotNull;
4848
import static com.mongodb.assertions.Assertions.notNull;
49-
import static com.mongodb.crypt.capi.MongoCryptContext.State;
5049
import static com.mongodb.internal.client.vault.EncryptOptionsHelper.asMongoExplicitEncryptOptions;
50+
import static com.mongodb.internal.crypt.capi.MongoCryptContext.State;
5151
import static com.mongodb.internal.thread.InterruptionUtil.translateInterruptedException;
5252

5353
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.mongodb.MongoNamespace;
2323
import com.mongodb.client.MongoClient;
2424
import com.mongodb.client.MongoClients;
25-
import com.mongodb.crypt.capi.MongoCrypt;
26-
import com.mongodb.crypt.capi.MongoCrypts;
25+
import com.mongodb.internal.crypt.capi.MongoCrypt;
26+
import com.mongodb.internal.crypt.capi.MongoCrypts;
2727

2828
import javax.net.ssl.SSLContext;
2929
import java.util.Map;

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/MongoCryptException.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,24 @@
1818
package com.mongodb.crypt.capi;
1919

2020

21-
import com.mongodb.crypt.capi.CAPI.mongocrypt_status_t;
22-
23-
import static com.mongodb.crypt.capi.CAPI.mongocrypt_status_code;
24-
import static org.bson.assertions.Assertions.isTrue;
25-
2621
/**
27-
* Top level Exception for all Mongo Crypt CAPI exceptions
22+
* Exception thrown for errors originating in the mongodb-crypt module.
2823
*/
2924
public class MongoCryptException extends RuntimeException {
3025
private static final long serialVersionUID = -5524416583514807953L;
3126
private final int code;
3227

28+
/**
29+
* Construct an instance
30+
*
31+
* @param message the message
32+
* @param code the code
33+
*/
34+
public MongoCryptException(final String message, final int code) {
35+
super(message);
36+
this.code = code;
37+
}
38+
3339
/**
3440
* @param msg the message
3541
*/
@@ -47,17 +53,6 @@ public MongoCryptException(final String msg, final Throwable cause) {
4753
this.code = -1;
4854
}
4955

50-
/**
51-
* Construct an instance from a {@code mongocrypt_status_t}.
52-
*
53-
* @param status the status
54-
*/
55-
MongoCryptException(final mongocrypt_status_t status) {
56-
super(CAPI.mongocrypt_status_message(status, null).toString());
57-
isTrue("status not ok", !CAPI.mongocrypt_status_ok(status));
58-
code = mongocrypt_status_code(status);
59-
}
60-
6156
/**
6257
* @return the error code for the exception.
6358
*/

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/BinaryHolder.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/BinaryHolder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

20-
import com.mongodb.crypt.capi.CAPI.mongocrypt_binary_t;
20+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_t;
2121

22-
import static com.mongodb.crypt.capi.CAPI.mongocrypt_binary_destroy;
22+
import static com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_destroy;
2323

2424
// Wrap JNA memory and a mongocrypt_binary_t that references that memory, in order to ensure that the JNA Memory is not GC'd before the
2525
// mongocrypt_binary_t is destroyed

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/CAPI.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/CAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

2020
import com.sun.jna.Callback;
2121
import com.sun.jna.Memory;

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/CAPIHelper.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/CAPIHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

20-
import com.mongodb.crypt.capi.CAPI.mongocrypt_binary_t;
20+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_t;
2121
import com.sun.jna.Pointer;
2222
import org.bson.BsonBinaryWriter;
2323
import org.bson.BsonDocument;
@@ -31,7 +31,7 @@
3131

3232
import java.nio.ByteBuffer;
3333

34-
import static com.mongodb.crypt.capi.CAPI.mongocrypt_binary_new_from_data;
34+
import static com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_new_from_data;
3535
import static java.lang.String.format;
3636

3737
final class CAPIHelper {

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/CipherCallback.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/CipherCallback.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

20-
import com.mongodb.crypt.capi.CAPI.cstring;
21-
import com.mongodb.crypt.capi.CAPI.mongocrypt_binary_t;
22-
import com.mongodb.crypt.capi.CAPI.mongocrypt_crypto_fn;
23-
import com.mongodb.crypt.capi.CAPI.mongocrypt_status_t;
20+
import com.mongodb.internal.crypt.capi.CAPI.cstring;
21+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_t;
22+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_crypto_fn;
23+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_status_t;
2424
import com.sun.jna.Pointer;
2525

2626
import javax.crypto.Cipher;
@@ -30,10 +30,10 @@
3030
import java.security.NoSuchAlgorithmException;
3131
import java.util.concurrent.ConcurrentLinkedDeque;
3232

33-
import static com.mongodb.crypt.capi.CAPI.MONGOCRYPT_STATUS_ERROR_CLIENT;
34-
import static com.mongodb.crypt.capi.CAPI.mongocrypt_status_set;
35-
import static com.mongodb.crypt.capi.CAPIHelper.toByteArray;
36-
import static com.mongodb.crypt.capi.CAPIHelper.writeByteArrayToBinary;
33+
import static com.mongodb.internal.crypt.capi.CAPI.MONGOCRYPT_STATUS_ERROR_CLIENT;
34+
import static com.mongodb.internal.crypt.capi.CAPI.mongocrypt_status_set;
35+
import static com.mongodb.internal.crypt.capi.CAPIHelper.toByteArray;
36+
import static com.mongodb.internal.crypt.capi.CAPIHelper.writeByteArrayToBinary;
3737

3838
class CipherCallback implements mongocrypt_crypto_fn {
3939
private final String algorithm;

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/DisposableMemory.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/DisposableMemory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

2020
import com.sun.jna.Memory;
2121

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/JULLogger.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/JULLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package com.mongodb.crypt.capi;
19+
package com.mongodb.internal.crypt.capi;
2020

2121
import java.util.logging.Level;
2222

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/Logger.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/Logger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package com.mongodb.crypt.capi;
19+
package com.mongodb.internal.crypt.capi;
2020

2121
/**
2222
* Not part of the public API

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/Loggers.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/Loggers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

2020
/**
2121
* This class is not part of the public API.

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/MacCallback.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/MacCallback.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

20-
import com.mongodb.crypt.capi.CAPI.cstring;
21-
import com.mongodb.crypt.capi.CAPI.mongocrypt_binary_t;
22-
import com.mongodb.crypt.capi.CAPI.mongocrypt_hmac_fn;
23-
import com.mongodb.crypt.capi.CAPI.mongocrypt_status_t;
20+
import com.mongodb.internal.crypt.capi.CAPI.cstring;
21+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_t;
22+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_hmac_fn;
23+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_status_t;
2424
import com.sun.jna.Pointer;
2525

2626
import javax.crypto.Mac;
2727
import javax.crypto.spec.SecretKeySpec;
2828

29-
import static com.mongodb.crypt.capi.CAPI.MONGOCRYPT_STATUS_ERROR_CLIENT;
30-
import static com.mongodb.crypt.capi.CAPI.mongocrypt_status_set;
31-
import static com.mongodb.crypt.capi.CAPIHelper.toByteArray;
32-
import static com.mongodb.crypt.capi.CAPIHelper.writeByteArrayToBinary;
29+
import static com.mongodb.internal.crypt.capi.CAPI.MONGOCRYPT_STATUS_ERROR_CLIENT;
30+
import static com.mongodb.internal.crypt.capi.CAPI.mongocrypt_status_set;
31+
import static com.mongodb.internal.crypt.capi.CAPIHelper.toByteArray;
32+
import static com.mongodb.internal.crypt.capi.CAPIHelper.writeByteArrayToBinary;
3333

3434
class MacCallback implements mongocrypt_hmac_fn {
3535
private final String algorithm;

‎mongodb-crypt/src/main/com/mongodb/crypt/capi/MessageDigestCallback.java renamed to ‎mongodb-crypt/src/main/com/mongodb/internal/crypt/capi/MessageDigestCallback.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
*
1616
*/
1717

18-
package com.mongodb.crypt.capi;
18+
package com.mongodb.internal.crypt.capi;
1919

20-
import com.mongodb.crypt.capi.CAPI.cstring;
21-
import com.mongodb.crypt.capi.CAPI.mongocrypt_binary_t;
22-
import com.mongodb.crypt.capi.CAPI.mongocrypt_hash_fn;
23-
import com.mongodb.crypt.capi.CAPI.mongocrypt_status_t;
20+
import com.mongodb.internal.crypt.capi.CAPI.cstring;
21+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_binary_t;
22+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_hash_fn;
23+
import com.mongodb.internal.crypt.capi.CAPI.mongocrypt_status_t;
2424
import com.sun.jna.Pointer;
2525

2626
import java.security.MessageDigest;
2727

28-
import static com.mongodb.crypt.capi.CAPI.MONGOCRYPT_STATUS_ERROR_CLIENT;
29-
import static com.mongodb.crypt.capi.CAPI.mongocrypt_status_set;
30-
import static com.mongodb.crypt.capi.CAPIHelper.toByteArray;
31-
import static com.mongodb.crypt.capi.CAPIHelper.writeByteArrayToBinary;
28+
import static com.mongodb.internal.crypt.capi.CAPI.MONGOCRYPT_STATUS_ERROR_CLIENT;
29+
import static com.mongodb.internal.crypt.capi.CAPI.mongocrypt_status_set;
30+
import static com.mongodb.internal.crypt.capi.CAPIHelper.toByteArray;
31+
import static com.mongodb.internal.crypt.capi.CAPIHelper.writeByteArrayToBinary;
3232

3333
class MessageDigestCallback implements mongocrypt_hash_fn {
3434

0 commit comments

Comments
 (0)