Skip to content

Update encryption terminology #1039

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.

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 2 commits into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import static java.util.Collections.unmodifiableMap;

/**
* The client-side automatic encryption settings. Client side encryption enables an application to specify what fields in a collection
* The client-side automatic encryption settings. In-use encryption enables an application to specify what fields in a collection
* must be encrypted, and the driver automatically encrypts commands sent to MongoDB and decrypts responses.
* <p>
* Automatic encryption is an enterprise only feature that only applies to operations on a collection. Automatic encryption is not
Expand Down
2 changes: 1 addition & 1 deletion driver-core/src/main/com/mongodb/MongoClientSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ public ServerApi getServerApi() {
/**
* Gets the auto-encryption settings.
* <p>
* Client side encryption enables an application to specify what fields in a collection must be
* In-use encryption enables an application to specify what fields in a collection must be
* encrypted, and the driver automatically encrypts commands and decrypts results.
* </p>
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ public Bson getEncryptedFields() {
* @param encryptedFields the encrypted fields document
* @return this
* @since 4.7
* @mongodb.driver.manual core/security-client-side-encryption/ Client side encryption
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
* @mongodb.server.release 6.0
*/
public CreateCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* Options for dropping a collection
*
* @mongodb.driver.manual reference/command/drop/ Drop Collection
* @mongodb.driver.manual core/security-client-side-encryption/ Client side encryption
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
* @since 4.7
*/
public class DropCollectionOptions {
Expand All @@ -50,7 +50,7 @@ public Bson getEncryptedFields() {
* @param encryptedFields the encrypted fields document
* @return this
* @since 4.7
* @mongodb.driver.manual core/security-client-side-encryption/ Client side encryption
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
*/
public DropCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) {
this.encryptedFields = encryptedFields;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package org.mongodb.scala
import com.mongodb.{ AutoEncryptionSettings => JAutoEncryptionSettings }

/**
* The client-side automatic encryption settings. Client side encryption enables an application to specify what fields in a collection
* The client-side automatic encryption settings. In-use encryption enables an application to specify what fields in a collection
* must be encrypted, and the driver automatically encrypts commands sent to MongoDB and decrypts responses.
*
* Automatic encryption is an enterprise only feature that only applies to operations on a collection. Automatic encryption is not
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ package object scala extends ClientSessionImplicits with ObservableImplicits wit
type MongoConnectionPoolClearedException = com.mongodb.MongoConnectionPoolClearedException

/**
* The client-side automatic encryption settings. Client side encryption enables an application to specify what fields in a collection
* The client-side automatic encryption settings. In-use encryption enables an application to specify what fields in a collection
* must be encrypted, and the driver automatically encrypts commands sent to MongoDB and decrypts responses.
*
* Automatic encryption is an enterprise only feature that only applies to operations on a collection. Automatic encryption is not
Expand Down