Skip to content

Ensure encrypted fields data exists fully #1802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2025
Merged

Ensure encrypted fields data exists fully #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d2f47
Ensure encrypted fields data exists fully
rozza Sep 11, 2025
7788d76
Merge branch 'main' into JAVA-5959
rozza Sep 11, 2025
9f17390
Removed legacy Client Encryption test from the shell runner
rozza Sep 11, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .evergreen/run-csfle-tests-with-mongocryptd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ echo "Running tests with Java ${JAVA_VERSION}"
${GRADLE_EXTRA_VARS} \
-Dorg.mongodb.test.fle.on.demand.credential.test.failure.enabled=true \
--stacktrace --info --continue \
driver-legacy:test \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Legacy tests don't use the unified test runner (this was missed when migrating from the legacy runner)
--tests "*.Client*Encryption*" \
driver-sync:test \
--tests "*.Client*Encryption*" \
driver-reactive-streams:test \
Expand Down
4 changes: 2 additions & 2 deletions driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ public void executeAsync(final AsyncWriteBinding binding, final SingleResultCall
*
* @return the list of commands to run to create the collection
*/
private List<Supplier<BsonDocument>> getCommands(final BsonDocument encryptedFields) {
if (encryptedFields == null) {
private List<Supplier<BsonDocument>> getCommands(@Nullable final BsonDocument encryptedFields) {
if (encryptedFields == null || encryptedFields.isEmpty()) {
return singletonList(this::dropCollectionCommand);
} else {
return asList(
Expand Down