Skip to content

Remove remaining beta annotations for encrypted fields. #1503

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 1 commit into from
Sep 23, 2024
Merged

Remove remaining beta annotations for encrypted fields. #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions driver-core/src/main/com/mongodb/MongoUpdatedEncryptedFieldsException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package com.mongodb;

import com.mongodb.annotations.Beta;
import com.mongodb.annotations.Reason;
import org.bson.BsonDocument;

import static com.mongodb.assertions.Assertions.assertNotNull;
Expand All @@ -27,7 +25,6 @@
*
* @since 4.9
*/
@Beta(Reason.SERVER)
public final class MongoUpdatedEncryptedFieldsException extends MongoClientException {
private static final long serialVersionUID = 1;

Expand Down
4 changes: 0 additions & 4 deletions driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package com.mongodb.client.model;

import com.mongodb.AutoEncryptionSettings;
import com.mongodb.annotations.Beta;
import com.mongodb.annotations.Reason;
import com.mongodb.lang.Nullable;
import org.bson.conversions.Bson;

Expand Down Expand Up @@ -354,7 +352,6 @@ public CreateCollectionOptions changeStreamPreAndPostImagesOptions(
* @since 4.7
* @mongodb.server.release 7.0
*/
@Beta(Reason.SERVER)
@Nullable
public Bson getEncryptedFields() {
return encryptedFields;
Expand All @@ -371,7 +368,6 @@ public Bson getEncryptedFields() {
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
* @mongodb.server.release 7.0
*/
@Beta(Reason.SERVER)
public CreateCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) {
this.encryptedFields = encryptedFields;
return this;
Expand Down
3 changes: 0 additions & 3 deletions driver-core/src/main/com/mongodb/client/model/CreateEncryptedCollectionParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.mongodb.client.model;

import com.mongodb.annotations.Beta;
import com.mongodb.annotations.Reason;
import com.mongodb.client.model.vault.DataKeyOptions;
import com.mongodb.lang.Nullable;
import org.bson.BsonDocument;
Expand All @@ -29,7 +27,6 @@
*
* @since 4.9
*/
@Beta(Reason.SERVER)
public final class CreateEncryptedCollectionParams {
private final String kmsProvider;
@Nullable
Expand Down
4 changes: 0 additions & 4 deletions driver-core/src/main/com/mongodb/client/model/DropCollectionOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package com.mongodb.client.model;

import com.mongodb.AutoEncryptionSettings;
import com.mongodb.annotations.Beta;
import com.mongodb.annotations.Reason;
import com.mongodb.lang.Nullable;
import org.bson.conversions.Bson;

Expand All @@ -40,7 +38,6 @@ public class DropCollectionOptions {
* @since 4.7
* @mongodb.server.release 7.0
*/
@Beta(Reason.SERVER)
@Nullable
public Bson getEncryptedFields() {
return encryptedFields;
Expand All @@ -57,7 +54,6 @@ public Bson getEncryptedFields() {
* @mongodb.server.release 7.0
* @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption
*/
@Beta(Reason.SERVER)
public DropCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) {
this.encryptedFields = encryptedFields;
return this;
Expand Down
3 changes: 0 additions & 3 deletions driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.mongodb.client.model.vault;

import com.mongodb.annotations.Beta;
import com.mongodb.annotations.Reason;
import com.mongodb.lang.Nullable;
import org.bson.BsonBinary;

Expand Down Expand Up @@ -192,7 +190,6 @@ public EncryptOptions rangeOptions(@Nullable final RangeOptions rangeOptions) {
* @mongodb.driver.manual /core/queryable-encryption/ queryable encryption
*/
@Nullable
@Beta(Reason.SERVER)
public RangeOptions getRangeOptions() {
return rangeOptions;
}
Expand Down
3 changes: 0 additions & 3 deletions ...er-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import com.mongodb.MongoClientException;
import com.mongodb.MongoException;
import com.mongodb.MongoInternalException;
import com.mongodb.annotations.Beta;
import com.mongodb.annotations.Reason;
import com.mongodb.client.model.vault.DataKeyOptions;
import com.mongodb.client.model.vault.EncryptOptions;
import com.mongodb.client.model.vault.RewrapManyDataKeyOptions;
Expand Down Expand Up @@ -191,7 +189,6 @@ public Mono<BsonBinary> encryptExplicitly(final BsonValue value, final EncryptOp
* @since 4.9
* @mongodb.server.release 6.2
*/
@Beta(Reason.SERVER)
public Mono<BsonDocument> encryptExpression(final BsonDocument expression, final EncryptOptions options, @Nullable final Timeout operationTimeout) {
return executeStateMachine(() ->
mongoCrypt.createEncryptExpressionContext(new BsonDocument("v", expression), asMongoExplicitEncryptOptions(options)), operationTimeout
Expand Down