Skip to content

Commit 4311d95

Browse files
committed
Remove beta annotation for client-side encryption
JAVA-3464
1 parent e42b614 commit 4311d95

File tree

12 files changed

+83
-135
lines changed

12 files changed

+83
-135
lines changed

docs/reference/content/driver-async/tutorials/client-side-encryption.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ With field level encryption, developers can encrypt fields client side without a
1717
configuration or directives. Client-side field level encryption supports workloads where applications must guarantee that
1818
unauthorized parties, including server administrators, cannot read the encrypted data.
1919

20-
{{% note class="important" %}}
21-
Support for client side encryption is in beta. Backwards-breaking changes may be made before the final release.
22-
{{% /note %}}
23-
2420
{{% note class="important" %}}
2521
Java 8 is the minimum required version that supports Async client side encryption.
2622
{{% /note %}}

docs/reference/content/driver/tutorials/client-side-encryption.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ With field level encryption, developers can encrypt fields client side without a
1717
configuration or directives. Client-side field level encryption supports workloads where applications must guarantee that
1818
unauthorized parties, including server administrators, cannot read the encrypted data.
1919

20-
{{% note class="important" %}}
21-
Support for client side encryption is in beta. Backwards-breaking changes may be made before the final release.
22-
{{% /note %}}
23-
2420
## Installation
2521

2622
The recommended way to get started using field level encryption in your project is with a dependency management system.

driver-async/src/main/com/mongodb/async/client/vault/ClientEncryption.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.mongodb.async.client.vault;
1818

19-
import com.mongodb.annotations.Beta;
2019
import com.mongodb.async.SingleResultCallback;
2120
import com.mongodb.client.model.vault.DataKeyOptions;
2221
import com.mongodb.client.model.vault.EncryptOptions;
@@ -30,12 +29,8 @@
3029
* <p>
3130
* Used to create data encryption keys, and to explicitly encrypt and decrypt values when auto-encryption is not an option.
3231
* </p>
33-
* <p>
34-
* Note: support for client-side encryption is in beta. Backwards-breaking changes may be made before the final release.
35-
* </p>
3632
* @since 3.11
3733
*/
38-
@Beta
3934
public interface ClientEncryption extends Closeable {
4035

4136
/**

driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptions.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,12 @@
1717
package com.mongodb.async.client.vault;
1818

1919
import com.mongodb.ClientEncryptionSettings;
20-
import com.mongodb.annotations.Beta;
2120

2221
/**
2322
* Factory for ClientEncryption implementations.
2423
*
25-
* <p>
26-
* Note: support for client side encryption is in beta. Backwards-breaking changes may be made before the final release.
27-
* </p>
2824
* @since 3.11
2925
*/
30-
@Beta
3126
public final class ClientEncryptions {
3227

3328
/**

driver-async/src/main/com/mongodb/async/client/vault/package-info.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
* </p>
2323
* @since 3.11
2424
*/
25-
@Beta
25+
2626
@NonNullApi
2727
package com.mongodb.async.client.vault;
2828

29-
import com.mongodb.annotations.Beta;
3029
import com.mongodb.lang.NonNullApi;

driver-core/src/main/com/mongodb/AutoEncryptionSettings.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.mongodb;
1818

19-
import com.mongodb.annotations.Beta;
2019
import com.mongodb.annotations.NotThreadSafe;
2120
import com.mongodb.lang.Nullable;
2221
import org.bson.BsonDocument;
@@ -52,13 +51,9 @@
5251
* <p>
5352
* Automatic encryption requires the authenticated user to have the listCollections privilege action.
5453
* </p>
55-
* <p>
56-
* Note: support for client side encryption is in beta. Backwards-breaking changes may be made before the final release.
57-
* </p>
5854
*
5955
* @since 3.11
6056
*/
61-
@Beta
6257
public final class AutoEncryptionSettings {
6358
private final MongoClientSettings keyVaultMongoClientSettings;
6459
private final String keyVaultNamespace;
@@ -72,7 +67,6 @@ public final class AutoEncryptionSettings {
7267
* construction through chaining.
7368
*/
7469
@NotThreadSafe
75-
@Beta
7670
public static final class Builder {
7771
private MongoClientSettings keyVaultMongoClientSettings;
7872
private String keyVaultNamespace;
@@ -183,6 +177,7 @@ public static Builder builder() {
183177
* keyVaultMongoClientSettings can be used to route data key queries to a separate MongoDB cluster, or the same cluster but using a
184178
* different credential.
185179
* </p>
180+
*
186181
* @return the key vault settings, which may be null to indicate that the same {@code MongoClient} should be used to access the key
187182
* vault collection as is used for the rest of the application.
188183
*/
@@ -253,6 +248,7 @@ public Map<String, Map<String, Object>> getKmsProviders() {
253248
* Schemas supplied in the schemaMap only apply to configuring automatic encryption for client side encryption. Other validation
254249
* rules in the JSON schema will not be enforced by the driver and will result in an error.
255250
* </p>
251+
*
256252
* @return map of namespace to local JSON schema
257253
*/
258254
public Map<String, BsonDocument> getSchemaMap() {
@@ -289,6 +285,7 @@ public Map<String, Object> getExtraOptions() {
289285
* cases, the application can construct a {@code MongoClient} with {@code AutoEncryptionSettings} with {@code bypassAutoEncryption}
290286
* enabled.
291287
* </p>
288+
*
292289
* @return true if auto-encryption should be bypassed
293290
*/
294291
public boolean isBypassAutoEncryption() {

driver-core/src/main/com/mongodb/ClientEncryptionSettings.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.mongodb;
1818

19-
import com.mongodb.annotations.Beta;
2019
import com.mongodb.annotations.NotThreadSafe;
2120

2221
import java.util.Map;
@@ -30,14 +29,9 @@
3029
* Explicit encryption/decryption is a community feature, enabled with the new {@code com.mongodb.client.vault.ClientEncryption} type,
3130
* for which this is the settings.
3231
* </p>
33-
* <p>
34-
* Note: support for client side encryption is in beta. Backwards-breaking changes may be made before the final
35-
* release.
36-
* </p>
3732
*
3833
* @since 3.11
3934
*/
40-
@Beta
4135
public final class ClientEncryptionSettings {
4236
private final MongoClientSettings keyVaultMongoClientSettings;
4337
private final String keyVaultNamespace;

driver-core/src/main/com/mongodb/MongoClientSettings.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.mongodb;
1818

19-
import com.mongodb.annotations.Beta;
2019
import com.mongodb.annotations.Immutable;
2120
import com.mongodb.annotations.NotThreadSafe;
2221
import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider;
@@ -440,15 +439,11 @@ public Builder compressorList(final List<MongoCompressor> compressorList) {
440439
/**
441440
* Sets the auto-encryption settings
442441
*
443-
* <p>
444-
* Note: support for client side encryption is in beta. Backwards-breaking changes may be made before the final release.
445-
* </p>
446442
* @param autoEncryptionSettings the auto-encryption settings
447443
* @return this
448444
* @since 3.11
449445
* @see #getAutoEncryptionSettings()
450446
*/
451-
@Beta
452447
public Builder autoEncryptionSettings(final AutoEncryptionSettings autoEncryptionSettings) {
453448
this.autoEncryptionSettings = autoEncryptionSettings;
454449
return this;
@@ -616,7 +611,6 @@ public List<MongoCompressor> getCompressorList() {
616611
* @since 3.11
617612
*/
618613
@Nullable
619-
@Beta
620614
public AutoEncryptionSettings getAutoEncryptionSettings() {
621615
return autoEncryptionSettings;
622616
}

0 commit comments

Comments
 (0)