Skip to content

Commit b928cd3

Browse files
jyeminrozza
andauthored
Remove Beta annotation from remaining client side encryption-related classes (#748)
JAVA-4226 Co-authored-by: Ross Lawley <[email protected]>
1 parent 1294de8 commit b928cd3

File tree

9 files changed

+1
-33
lines changed

9 files changed

+1
-33
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ 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-
20+
{{% note %}}
2321
This guide uses the `Observable` implicits as covered in the [Quick Start Primer]({{< relref "driver-scala/getting-started/quick-start-primer.md" >}}).
2422
{{% /note %}}
2523

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,9 +712,6 @@ public ServerApi getServerApi() {
712712
* <p>
713713
* Automatic encryption requires the authenticated user to have the listCollections privilege action.
714714
* </p>
715-
* <p>
716-
* Note: support for client side encryption is in beta. Backwards-breaking changes may be made before the final release.
717-
* </p>
718715
*
719716
* @return the auto-encryption settings, which may be null
720717
* @since 3.11

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/ClientEncryption.java

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

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

19-
import com.mongodb.annotations.Beta;
2019
import com.mongodb.client.model.vault.DataKeyOptions;
2120
import com.mongodb.client.model.vault.EncryptOptions;
2221
import org.bson.BsonBinary;
@@ -30,13 +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 should be considered as beta. Backwards-breaking changes may be made before the final
35-
* release.
36-
* </p>
3732
* @since 1.12
3833
*/
39-
@Beta
4034
public interface ClientEncryption extends Closeable {
4135

4236
/**

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/ClientEncryptions.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
/**
2323
* Factory for ClientEncryption implementations.
2424
*
25-
* <p>
26-
* Note: support for client-side encryption should be considered as beta. Backwards-breaking changes may be made before the final
27-
* release.
28-
* </p>
2925
* @since 1.12
3026
*/
3127
public final class ClientEncryptions {

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/package-info.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
/**
1818
* This package contains the Key Vault API
1919
*
20-
* <p>
21-
* Note: support for client-side encryption should be considered as beta. Backwards-breaking changes may be made before the final
22-
* release.
23-
* </p>
2420
* @since 1.12
2521
*/
2622
@NonNullApi

driver-scala/src/main/scala/org/mongodb/scala/vault/ClientEncryption.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package org.mongodb.scala.vault
1818

1919
import java.io.Closeable
2020

21-
import com.mongodb.annotations.Beta
2221
import com.mongodb.reactivestreams.client.vault.{ ClientEncryption => JClientEncryption }
2322
import org.bson.{ BsonBinary, BsonValue }
2423
import org.mongodb.scala.SingleObservable
@@ -29,11 +28,8 @@ import org.mongodb.scala.model.vault.{ DataKeyOptions, EncryptOptions }
2928
*
3029
* Used to create data encryption keys, and to explicitly encrypt and decrypt values when auto-encryption is not an option.
3130
*
32-
* @note support for client-side encryption should be considered as beta. Backwards-breaking changes may be made before the final
33-
* release.
3431
* @since 2.7
3532
*/
36-
@Beta
3733
case class ClientEncryption(private val wrapped: JClientEncryption) extends Closeable {
3834

3935
/**

driver-scala/src/main/scala/org/mongodb/scala/vault/ClientEncryptions.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,13 @@
1616
package org.mongodb.scala.vault
1717

1818
import com.mongodb.ClientEncryptionSettings
19-
import com.mongodb.annotations.Beta
2019
import com.mongodb.reactivestreams.client.vault.{ ClientEncryptions => JClientEncryptions }
2120

2221
/**
2322
* Factory for ClientEncryption implementations.
2423
*
25-
* @note support for client-side encryption should be considered as beta. Backwards-breaking changes may be made before the final
26-
* release.
2724
* @since 2.7
2825
*/
29-
@Beta
3026
object ClientEncryptions {
3127

3228
/**

driver-scala/src/main/scala/org/mongodb/scala/vault/package.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ package org.mongodb.scala
1818
/**
1919
* This package contains the Key Vault API
2020
*
21-
* @note support for client-side encryption should be considered as beta. Backwards-breaking changes may be made before the final
22-
* release.
2321
* @since 2.7
2422
*/
2523
package object vault {}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
/**
1818
* This package contains the Key Vault API
1919
*
20-
* <p>
21-
* Note: support for client-side encryption is in beta. Backwards-breaking changes may be made before the final release.
22-
* </p>
2320
* @since 3.11
2421
*/
2522

0 commit comments

Comments
 (0)