Skip to content

Commit a138393

Browse files
authored
Remove remaining beta annotations for encrypted fields. (#1503)
Encrypted fields are used as part of Range encryption which is no longer in server preview. JAVA-5441
1 parent 161feeb commit a138393

File tree

6 files changed

+0
-20
lines changed

6 files changed

+0
-20
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package com.mongodb;
1717

18-
import com.mongodb.annotations.Beta;
19-
import com.mongodb.annotations.Reason;
2018
import org.bson.BsonDocument;
2119

2220
import static com.mongodb.assertions.Assertions.assertNotNull;
@@ -27,7 +25,6 @@
2725
*
2826
* @since 4.9
2927
*/
30-
@Beta(Reason.SERVER)
3128
public final class MongoUpdatedEncryptedFieldsException extends MongoClientException {
3229
private static final long serialVersionUID = 1;
3330

driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java

-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package com.mongodb.client.model;
1818

1919
import com.mongodb.AutoEncryptionSettings;
20-
import com.mongodb.annotations.Beta;
21-
import com.mongodb.annotations.Reason;
2220
import com.mongodb.lang.Nullable;
2321
import org.bson.conversions.Bson;
2422

@@ -354,7 +352,6 @@ public CreateCollectionOptions changeStreamPreAndPostImagesOptions(
354352
* @since 4.7
355353
* @mongodb.server.release 7.0
356354
*/
357-
@Beta(Reason.SERVER)
358355
@Nullable
359356
public Bson getEncryptedFields() {
360357
return encryptedFields;
@@ -371,7 +368,6 @@ public Bson getEncryptedFields() {
371368
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
372369
* @mongodb.server.release 7.0
373370
*/
374-
@Beta(Reason.SERVER)
375371
public CreateCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) {
376372
this.encryptedFields = encryptedFields;
377373
return this;

driver-core/src/main/com/mongodb/client/model/CreateEncryptedCollectionParams.java

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.mongodb.client.model;
1818

19-
import com.mongodb.annotations.Beta;
20-
import com.mongodb.annotations.Reason;
2119
import com.mongodb.client.model.vault.DataKeyOptions;
2220
import com.mongodb.lang.Nullable;
2321
import org.bson.BsonDocument;
@@ -29,7 +27,6 @@
2927
*
3028
* @since 4.9
3129
*/
32-
@Beta(Reason.SERVER)
3330
public final class CreateEncryptedCollectionParams {
3431
private final String kmsProvider;
3532
@Nullable

driver-core/src/main/com/mongodb/client/model/DropCollectionOptions.java

-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package com.mongodb.client.model;
1818

1919
import com.mongodb.AutoEncryptionSettings;
20-
import com.mongodb.annotations.Beta;
21-
import com.mongodb.annotations.Reason;
2220
import com.mongodb.lang.Nullable;
2321
import org.bson.conversions.Bson;
2422

@@ -40,7 +38,6 @@ public class DropCollectionOptions {
4038
* @since 4.7
4139
* @mongodb.server.release 7.0
4240
*/
43-
@Beta(Reason.SERVER)
4441
@Nullable
4542
public Bson getEncryptedFields() {
4643
return encryptedFields;
@@ -57,7 +54,6 @@ public Bson getEncryptedFields() {
5754
* @mongodb.server.release 7.0
5855
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
5956
*/
60-
@Beta(Reason.SERVER)
6157
public DropCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) {
6258
this.encryptedFields = encryptedFields;
6359
return this;

driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

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

19-
import com.mongodb.annotations.Beta;
20-
import com.mongodb.annotations.Reason;
2119
import com.mongodb.lang.Nullable;
2220
import org.bson.BsonBinary;
2321

@@ -192,7 +190,6 @@ public EncryptOptions rangeOptions(@Nullable final RangeOptions rangeOptions) {
192190
* @mongodb.driver.manual /core/queryable-encryption/ queryable encryption
193191
*/
194192
@Nullable
195-
@Beta(Reason.SERVER)
196193
public RangeOptions getRangeOptions() {
197194
return rangeOptions;
198195
}

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java

-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import com.mongodb.MongoClientException;
2020
import com.mongodb.MongoException;
2121
import com.mongodb.MongoInternalException;
22-
import com.mongodb.annotations.Beta;
23-
import com.mongodb.annotations.Reason;
2422
import com.mongodb.client.model.vault.DataKeyOptions;
2523
import com.mongodb.client.model.vault.EncryptOptions;
2624
import com.mongodb.client.model.vault.RewrapManyDataKeyOptions;
@@ -191,7 +189,6 @@ public Mono<BsonBinary> encryptExplicitly(final BsonValue value, final EncryptOp
191189
* @since 4.9
192190
* @mongodb.server.release 6.2
193191
*/
194-
@Beta(Reason.SERVER)
195192
public Mono<BsonDocument> encryptExpression(final BsonDocument expression, final EncryptOptions options, @Nullable final Timeout operationTimeout) {
196193
return executeStateMachine(() ->
197194
mongoCrypt.createEncryptExpressionContext(new BsonDocument("v", expression), asMongoExplicitEncryptOptions(options)), operationTimeout

0 commit comments

Comments
 (0)