diff --git a/README.md b/README.md index 95e894d1585..4111b648d38 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,17 @@ almost always be binary compatible with prior minor releases from the same major Patch 4.x.y increments (such as 4.0.0 -> 4.0.1, 4.1.1 -> 4.1.2, etc) will occur for bug fixes only and will always be binary compatible with prior patch releases of the same minor release branch. +#### @Alpha + +APIs marked with the `@Alpha` annotation are in the early stages of development, subject to incompatible changes, +or even removal, in a future release and may lack some intended features. An APIs bearing `@Alpha` annotation may +contain known issues affecting functionality, performance, and stability. They are also exempt from any compatibility +guarantees made by its containing library. + +It is inadvisable for applications to use Alpha APIs in production environments or for libraries +(which get included on users' CLASSPATHs, outside the library developers' control) to depend on these APIs. Alpha APIs +are intended for experimental purposes only. + #### @Beta APIs marked with the `@Beta` annotation at the class or method level are subject to change. They can be modified in any way, or even diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES index 971643143b8..b864bef56e0 100644 --- a/THIRD-PARTY-NOTICES +++ b/THIRD-PARTY-NOTICES @@ -37,7 +37,12 @@ https://github.com/mongodb/mongo-java-driver. See the License for the specific language governing permissions and limitations under the License. -3) The following files: Beta.java, UnsignedLongs.java, UnsignedLongsTest.java +3) The following files: + + Alpha.java (formerly Beta.java) + Beta.java + UnsignedLongs.java + UnsignedLongsTest.java Copyright 2010 The Guava Authors Copyright 2011 The Guava Authors diff --git a/driver-core/src/main/com/mongodb/AwsCredential.java b/driver-core/src/main/com/mongodb/AwsCredential.java index dfd6c86776c..2fd6f8fb6f4 100644 --- a/driver-core/src/main/com/mongodb/AwsCredential.java +++ b/driver-core/src/main/com/mongodb/AwsCredential.java @@ -17,6 +17,7 @@ package com.mongodb; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import static com.mongodb.assertions.Assertions.notNull; @@ -28,7 +29,7 @@ * @see MongoCredential#AWS_CREDENTIAL_PROVIDER_KEY * @since 4.4 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public final class AwsCredential { private final String accessKeyId; private final String secretAccessKey; diff --git a/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java b/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java index 9c1b4c11382..8d0d8f071ec 100644 --- a/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java +++ b/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java @@ -16,7 +16,9 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.NotThreadSafe; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import javax.net.ssl.SSLContext; @@ -159,6 +161,7 @@ public Builder kmsProviderSslContextMap(final Map kmsProvide * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) public ClientEncryptionSettings.Builder timeout(final long timeout, final TimeUnit timeUnit) { this.timeoutMS = convertAndValidateTimeout(timeout, timeUnit); return this; @@ -324,6 +327,7 @@ public Map getKmsProviderSslContextMap() { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable public Long getTimeout(final TimeUnit timeUnit) { return timeoutMS == null ? null : timeUnit.convert(timeoutMS, MILLISECONDS); diff --git a/driver-core/src/main/com/mongodb/ClientSessionOptions.java b/driver-core/src/main/com/mongodb/ClientSessionOptions.java index 4e9b0c3781e..9b79eacea21 100644 --- a/driver-core/src/main/com/mongodb/ClientSessionOptions.java +++ b/driver-core/src/main/com/mongodb/ClientSessionOptions.java @@ -16,8 +16,10 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; import com.mongodb.annotations.NotThreadSafe; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import com.mongodb.session.ClientSession; @@ -94,6 +96,7 @@ public TransactionOptions getDefaultTransactionOptions() { * @return the default timeout * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable public Long getDefaultTimeout(final TimeUnit timeUnit) { return defaultTimeoutMS == null ? null : timeUnit.convert(defaultTimeoutMS, MILLISECONDS); @@ -223,6 +226,7 @@ public Builder defaultTransactionOptions(final TransactionOptions defaultTransac * @since CSOT * @see #getDefaultTimeout */ + @Alpha(Reason.CLIENT) public Builder defaultTimeout(final long defaultTimeout, final TimeUnit timeUnit) { this.defaultTimeoutMS = convertAndValidateTimeout(defaultTimeout, timeUnit, "defaultTimeout"); return this; diff --git a/driver-core/src/main/com/mongodb/ConnectionString.java b/driver-core/src/main/com/mongodb/ConnectionString.java index 9f64db50d5a..9a7b3f0fba5 100644 --- a/driver-core/src/main/com/mongodb/ConnectionString.java +++ b/driver-core/src/main/com/mongodb/ConnectionString.java @@ -16,6 +16,8 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.connection.ClusterSettings; import com.mongodb.connection.ConnectionPoolSettings; import com.mongodb.connection.ServerMonitoringMode; @@ -137,7 +139,8 @@ *
  • {@code sslInvalidHostNameAllowed=true|false}: Whether to allow invalid host names for TLS connections.
    • *
  • {@code tlsAllowInvalidHostnames=true|false}: Whether to allow invalid host names for TLS connections. Supersedes the * sslInvalidHostNameAllowed option
    • - *
  • {@code timeoutMS=ms}: Time limit for the full execution of an operation.
    • + *
  • {@code timeoutMS=ms}: Time limit for the full execution of an operation. Note: This parameter is part of an {@linkplain Alpha Alpha API} and may be + * subject to changes or even removal in future releases.
    • *
  • {@code connectTimeoutMS=ms}: How long a connection can take to be opened before timing out.
    • *
  • {@code socketTimeoutMS=ms}: How long a receive on a socket can take before timing out. * This option is the same as {@link SocketSettings#getReadTimeout(TimeUnit)}. @@ -1574,6 +1577,7 @@ public Integer getMaxConnecting() { * @return the time limit for the full execution of an operation in milliseconds or null. * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable public Long getTimeout() { return timeout; diff --git a/driver-core/src/main/com/mongodb/MongoClientSettings.java b/driver-core/src/main/com/mongodb/MongoClientSettings.java index 9655b61b024..0eb90110f1f 100644 --- a/driver-core/src/main/com/mongodb/MongoClientSettings.java +++ b/driver-core/src/main/com/mongodb/MongoClientSettings.java @@ -16,8 +16,10 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; import com.mongodb.annotations.NotThreadSafe; +import com.mongodb.annotations.Reason; import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider; import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider; import com.mongodb.client.model.mql.ExpressionCodecProvider; @@ -703,6 +705,7 @@ public Builder inetAddressResolver(@Nullable final InetAddressResolver inetAddre * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) public Builder timeout(final long timeout, final TimeUnit timeUnit) { this.timeoutMS = convertAndValidateTimeout(timeout, timeUnit); return this; @@ -915,6 +918,7 @@ public ServerApi getServerApi() { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable public Long getTimeout(final TimeUnit timeUnit) { return timeoutMS == null ? null : timeUnit.convert(timeoutMS, MILLISECONDS); diff --git a/driver-core/src/main/com/mongodb/MongoCredential.java b/driver-core/src/main/com/mongodb/MongoCredential.java index ffa2a3c4e02..f27d8924d9c 100644 --- a/driver-core/src/main/com/mongodb/MongoCredential.java +++ b/driver-core/src/main/com/mongodb/MongoCredential.java @@ -18,6 +18,7 @@ import com.mongodb.annotations.Beta; import com.mongodb.annotations.Immutable; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import java.util.Arrays; @@ -176,7 +177,7 @@ public final class MongoCredential { * @see AwsCredential * @since 4.4 */ - @Beta(Beta.Reason.CLIENT) + @Beta(Reason.CLIENT) public static final String AWS_CREDENTIAL_PROVIDER_KEY = "AWS_CREDENTIAL_PROVIDER"; /** diff --git a/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java b/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java index fb79c9625fc..f4df19402bb 100644 --- a/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java +++ b/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java @@ -16,6 +16,8 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import org.bson.BsonDocument; /** @@ -32,6 +34,7 @@ public class MongoExecutionTimeoutException extends MongoException { * @param message the error message * @since CSOT */ + @Alpha(Reason.CLIENT) public MongoExecutionTimeoutException(final String message) { super(message); diff --git a/driver-core/src/main/com/mongodb/MongoOperationTimeoutException.java b/driver-core/src/main/com/mongodb/MongoOperationTimeoutException.java index 8ba8b3afe12..a1469fb24b5 100644 --- a/driver-core/src/main/com/mongodb/MongoOperationTimeoutException.java +++ b/driver-core/src/main/com/mongodb/MongoOperationTimeoutException.java @@ -15,6 +15,9 @@ */ package com.mongodb; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; + import java.util.concurrent.TimeUnit; /** @@ -35,6 +38,7 @@ * @see MongoClientSettings#getTimeout(TimeUnit) * @since CSOT */ +@Alpha(Reason.CLIENT) public final class MongoOperationTimeoutException extends MongoTimeoutException { private static final long serialVersionUID = 1L; diff --git a/driver-core/src/main/com/mongodb/MongoSocketWriteTimeoutException.java b/driver-core/src/main/com/mongodb/MongoSocketWriteTimeoutException.java index 97382656fc0..e4e4e22a1b9 100644 --- a/driver-core/src/main/com/mongodb/MongoSocketWriteTimeoutException.java +++ b/driver-core/src/main/com/mongodb/MongoSocketWriteTimeoutException.java @@ -16,11 +16,15 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; + /** * This exception is thrown when there is a timeout writing a response from the socket. * * @since CSOT */ +@Alpha(Reason.CLIENT) public class MongoSocketWriteTimeoutException extends MongoSocketException { private static final long serialVersionUID = 1L; diff --git a/driver-core/src/main/com/mongodb/MongoTimeoutException.java b/driver-core/src/main/com/mongodb/MongoTimeoutException.java index a1f3c760667..6fb9c7ff69f 100644 --- a/driver-core/src/main/com/mongodb/MongoTimeoutException.java +++ b/driver-core/src/main/com/mongodb/MongoTimeoutException.java @@ -16,6 +16,9 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; + /** * An exception indicating that the driver has timed out waiting for either a server or a connection to become available. */ @@ -38,6 +41,7 @@ public MongoTimeoutException(final String message) { * @param cause the cause * @since CSOT */ + @Alpha(Reason.CLIENT) public MongoTimeoutException(final String message, final Throwable cause) { super(message, cause); } diff --git a/driver-core/src/main/com/mongodb/MongoUpdatedEncryptedFieldsException.java b/driver-core/src/main/com/mongodb/MongoUpdatedEncryptedFieldsException.java index 1db6b4eba07..c91a3c87fc5 100644 --- a/driver-core/src/main/com/mongodb/MongoUpdatedEncryptedFieldsException.java +++ b/driver-core/src/main/com/mongodb/MongoUpdatedEncryptedFieldsException.java @@ -16,6 +16,7 @@ package com.mongodb; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import org.bson.BsonDocument; import static com.mongodb.assertions.Assertions.assertNotNull; @@ -26,7 +27,7 @@ * * @since 4.9 */ -@Beta(Beta.Reason.SERVER) +@Beta(Reason.SERVER) public final class MongoUpdatedEncryptedFieldsException extends MongoClientException { private static final long serialVersionUID = 1; diff --git a/driver-core/src/main/com/mongodb/TransactionOptions.java b/driver-core/src/main/com/mongodb/TransactionOptions.java index 536c55eb44f..a868928037b 100644 --- a/driver-core/src/main/com/mongodb/TransactionOptions.java +++ b/driver-core/src/main/com/mongodb/TransactionOptions.java @@ -16,7 +16,9 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import java.util.Objects; @@ -112,6 +114,7 @@ public Long getMaxCommitTime(final TimeUnit timeUnit) { * @since CSOT */ @Nullable + @Alpha(Reason.CLIENT) public Long getTimeout(final TimeUnit timeUnit) { notNull("timeUnit", timeUnit); if (timeoutMS == null) { @@ -294,6 +297,7 @@ public Builder maxCommitTime(@Nullable final Long maxCommitTime, final TimeUnit * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public Builder timeout(@Nullable final Long timeout, final TimeUnit timeUnit) { this.timeoutMS = convertAndValidateTimeoutNullable(timeout, timeUnit); return this; diff --git a/driver-core/src/main/com/mongodb/annotations/Alpha.java b/driver-core/src/main/com/mongodb/annotations/Alpha.java new file mode 100644 index 00000000000..3698c7ac860 --- /dev/null +++ b/driver-core/src/main/com/mongodb/annotations/Alpha.java @@ -0,0 +1,51 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * Copyright 2010 The Guava Authors + * Copyright 2011 The Guava Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mongodb.annotations; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Signifies that a public API element is in the early stages of development, subject to + * incompatible changes, or even removal, in a future release and may lack some intended features. + * An API bearing this annotation may contain known issues affecting functionality, performance, + * and stability. It is also exempt from any compatibility guarantees made by its containing library. + * + *

    It is inadvisable for applications to use Alpha APIs in production environments or + * for libraries (which get included on users' CLASSPATHs, outside the library developers' + * control) to depend on these APIs. Alpha APIs are intended for experimental purposes only.

    + */ +@Retention(RetentionPolicy.CLASS) +@Target({ + ElementType.ANNOTATION_TYPE, + ElementType.CONSTRUCTOR, + ElementType.FIELD, + ElementType.METHOD, + ElementType.PACKAGE, + ElementType.TYPE }) +@Documented +@Beta(Reason.CLIENT) +public @interface Alpha { + /** + * @return The reason an API element is marked with {@link Alpha}. + */ + Reason[] value(); +} diff --git a/driver-core/src/main/com/mongodb/annotations/Beta.java b/driver-core/src/main/com/mongodb/annotations/Beta.java index a44dae43cd5..55753ddc051 100644 --- a/driver-core/src/main/com/mongodb/annotations/Beta.java +++ b/driver-core/src/main/com/mongodb/annotations/Beta.java @@ -47,25 +47,10 @@ ElementType.PACKAGE, ElementType.TYPE }) @Documented -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public @interface Beta { /** * @return The reason an API element is marked with {@link Beta}. */ Reason[] value(); - - /** - * @see Beta#value() - */ - enum Reason { - /** - * The driver API is in preview. - */ - CLIENT, - /** - * The driver API relies on the server API, which is in preview. - * We still may decide to change the driver API even if the server API stays unchanged. - */ - SERVER - } } diff --git a/driver-core/src/main/com/mongodb/annotations/Reason.java b/driver-core/src/main/com/mongodb/annotations/Reason.java new file mode 100644 index 00000000000..af72098a9de --- /dev/null +++ b/driver-core/src/main/com/mongodb/annotations/Reason.java @@ -0,0 +1,34 @@ +/* + * Copyright 2008-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mongodb.annotations; + +/** + * Enumerates the reasons an API element might be marked with annotations like {@link Alpha} or {@link Beta}. + */ +@Beta(Reason.CLIENT) +public enum Reason { + /** + * Indicates that the status of the driver API is the reason for the annotation. + */ + CLIENT, + + /** + * The driver API relies on the server API. + * This dependency is the reason for the annotation and suggests that changes in the server API could impact the driver API. + */ + SERVER +} diff --git a/driver-core/src/main/com/mongodb/client/cursor/TimeoutMode.java b/driver-core/src/main/com/mongodb/client/cursor/TimeoutMode.java index 063efc21e6e..55745d8bfe1 100644 --- a/driver-core/src/main/com/mongodb/client/cursor/TimeoutMode.java +++ b/driver-core/src/main/com/mongodb/client/cursor/TimeoutMode.java @@ -15,6 +15,9 @@ */ package com.mongodb.client.cursor; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; + import java.util.concurrent.TimeUnit; /** @@ -26,6 +29,7 @@ * @see com.mongodb.MongoClientSettings#getTimeout(TimeUnit) * @since CSOT */ +@Alpha(Reason.CLIENT) public enum TimeoutMode { /** diff --git a/driver-core/src/main/com/mongodb/client/model/Aggregates.java b/driver-core/src/main/com/mongodb/client/model/Aggregates.java index 08e2fb10b02..53e9e1eaf52 100644 --- a/driver-core/src/main/com/mongodb/client/model/Aggregates.java +++ b/driver-core/src/main/com/mongodb/client/model/Aggregates.java @@ -18,6 +18,7 @@ import com.mongodb.MongoNamespace; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.client.model.densify.DensifyOptions; import com.mongodb.client.model.densify.DensifyRange; import com.mongodb.client.model.fill.FillOptions; @@ -955,7 +956,7 @@ public static Bson searchMeta(final SearchCollector collector, final SearchOptio * @mongodb.server.release 6.0.10 * @since 4.11 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public static Bson vectorSearch( final FieldSearchPath path, final Iterable queryVector, @@ -984,7 +985,7 @@ public static Bson vectorSearch( * @mongodb.server.release 6.0.10 * @since 4.11 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public static Bson vectorSearch( final FieldSearchPath path, final Iterable queryVector, diff --git a/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java b/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java index 5aa79112871..31165688d4a 100644 --- a/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java @@ -18,6 +18,7 @@ import com.mongodb.AutoEncryptionSettings; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import org.bson.conversions.Bson; @@ -353,7 +354,7 @@ public CreateCollectionOptions changeStreamPreAndPostImagesOptions( * @since 4.7 * @mongodb.server.release 7.0 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) @Nullable public Bson getEncryptedFields() { return encryptedFields; @@ -370,7 +371,7 @@ public Bson getEncryptedFields() { * @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption * @mongodb.server.release 7.0 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public CreateCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) { this.encryptedFields = encryptedFields; return this; diff --git a/driver-core/src/main/com/mongodb/client/model/CreateEncryptedCollectionParams.java b/driver-core/src/main/com/mongodb/client/model/CreateEncryptedCollectionParams.java index eba101ac000..537efdc1716 100644 --- a/driver-core/src/main/com/mongodb/client/model/CreateEncryptedCollectionParams.java +++ b/driver-core/src/main/com/mongodb/client/model/CreateEncryptedCollectionParams.java @@ -17,6 +17,7 @@ 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; @@ -28,7 +29,7 @@ * * @since 4.9 */ -@Beta(Beta.Reason.SERVER) +@Beta(Reason.SERVER) public final class CreateEncryptedCollectionParams { private final String kmsProvider; @Nullable diff --git a/driver-core/src/main/com/mongodb/client/model/DropCollectionOptions.java b/driver-core/src/main/com/mongodb/client/model/DropCollectionOptions.java index 5c904888c00..cf2dbca66c4 100644 --- a/driver-core/src/main/com/mongodb/client/model/DropCollectionOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/DropCollectionOptions.java @@ -18,6 +18,7 @@ import com.mongodb.AutoEncryptionSettings; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import org.bson.conversions.Bson; @@ -39,7 +40,7 @@ public class DropCollectionOptions { * @since 4.7 * @mongodb.server.release 7.0 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) @Nullable public Bson getEncryptedFields() { return encryptedFields; @@ -56,7 +57,7 @@ public Bson getEncryptedFields() { * @mongodb.server.release 7.0 * @mongodb.driver.manual core/security-client-side-encryption/ In-use encryption */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public DropCollectionOptions encryptedFields(@Nullable final Bson encryptedFields) { this.encryptedFields = encryptedFields; return this; diff --git a/driver-core/src/main/com/mongodb/client/model/Projections.java b/driver-core/src/main/com/mongodb/client/model/Projections.java index e92a95abf81..98fd2810ed5 100644 --- a/driver-core/src/main/com/mongodb/client/model/Projections.java +++ b/driver-core/src/main/com/mongodb/client/model/Projections.java @@ -17,6 +17,7 @@ package com.mongodb.client.model; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.client.model.search.FieldSearchPath; import com.mongodb.client.model.search.SearchCollector; import com.mongodb.client.model.search.SearchCount; @@ -223,7 +224,7 @@ public static Bson metaSearchScore(final String fieldName) { * @mongodb.server.release 6.0.10 * @since 4.11 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public static Bson metaVectorSearchScore(final String fieldName) { return meta(fieldName, "vectorSearchScore"); } diff --git a/driver-core/src/main/com/mongodb/client/model/mql/Branches.java b/driver-core/src/main/com/mongodb/client/model/mql/Branches.java index 1a576cfe581..c6b414de213 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/Branches.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/Branches.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.assertions.Assertions; import java.util.ArrayList; @@ -36,7 +37,7 @@ * @param the type of the values that may be checked. * @since 4.9.0 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public final class Branches { Branches() { diff --git a/driver-core/src/main/com/mongodb/client/model/mql/BranchesIntermediary.java b/driver-core/src/main/com/mongodb/client/model/mql/BranchesIntermediary.java index 9b1b88e4467..b068c118ad3 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/BranchesIntermediary.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/BranchesIntermediary.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.assertions.Assertions; import java.util.ArrayList; @@ -32,7 +33,7 @@ * @param the type of the value produced. * @since 4.9.0 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public final class BranchesIntermediary extends BranchesTerminal { BranchesIntermediary(final List>> branches) { super(branches, null); diff --git a/driver-core/src/main/com/mongodb/client/model/mql/BranchesTerminal.java b/driver-core/src/main/com/mongodb/client/model/mql/BranchesTerminal.java index f72cb5cb1f4..299942ebdbf 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/BranchesTerminal.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/BranchesTerminal.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import java.util.List; @@ -30,7 +31,7 @@ * @param the type of the value produced. * @since 4.9.0 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public class BranchesTerminal { private final List>> branches; diff --git a/driver-core/src/main/com/mongodb/client/model/mql/ExpressionCodecProvider.java b/driver-core/src/main/com/mongodb/client/model/mql/ExpressionCodecProvider.java index d4176b7205f..893c57c5c86 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/ExpressionCodecProvider.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/ExpressionCodecProvider.java @@ -18,6 +18,7 @@ import com.mongodb.annotations.Beta; import com.mongodb.annotations.Immutable; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import org.bson.codecs.Codec; import org.bson.codecs.configuration.CodecProvider; @@ -35,7 +36,7 @@ * * @since 4.9.0 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) @Immutable public final class ExpressionCodecProvider implements CodecProvider { @Override diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlArray.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlArray.java index 047e294c8e9..e979b4687e7 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlArray.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlArray.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.util.function.Function; @@ -33,7 +34,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlArray extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlBoolean.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlBoolean.java index 5e594a757c7..28290cf25f4 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlBoolean.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlBoolean.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.util.function.Function; @@ -28,7 +29,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlBoolean extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlDate.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlDate.java index 7c39057ee23..b6600aaf689 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlDate.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlDate.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.util.function.Function; @@ -30,7 +31,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlDate extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlDocument.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlDocument.java index b99d5b3354b..c60fde8f82a 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlDocument.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlDocument.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.assertions.Assertions; import org.bson.conversions.Bson; @@ -40,7 +41,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlDocument extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlEntry.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlEntry.java index bcb1f26e251..dffa35405f1 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlEntry.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlEntry.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -34,7 +35,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlEntry extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlInteger.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlInteger.java index 0fe85fd88d9..46380b57773 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlInteger.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlInteger.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.util.function.Function; @@ -30,7 +31,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlInteger extends MqlNumber { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlMap.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlMap.java index 24ee3ef405b..58a279c89c7 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlMap.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlMap.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.assertions.Assertions; @@ -35,7 +36,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlMap extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlNumber.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlNumber.java index ec3099047b8..7b6590b7624 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlNumber.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlNumber.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.assertions.Assertions; @@ -31,7 +32,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlNumber extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlString.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlString.java index dd24a8c94a2..e5b6e8fa8bc 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlString.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlString.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.util.function.Function; @@ -30,7 +31,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlString extends MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlValue.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlValue.java index 9366ce77fe9..8cb50885584 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlValue.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlValue.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.util.function.Function; @@ -89,7 +90,7 @@ * @since 4.9.0 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MqlValue { /** diff --git a/driver-core/src/main/com/mongodb/client/model/mql/MqlValues.java b/driver-core/src/main/com/mongodb/client/model/mql/MqlValues.java index 8d791dc6b3b..a2d58fbc02b 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/MqlValues.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/MqlValues.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.assertions.Assertions; import org.bson.BsonArray; import org.bson.BsonBoolean; @@ -46,7 +47,7 @@ * * @since 4.9.0 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public final class MqlValues { private MqlValues() {} diff --git a/driver-core/src/main/com/mongodb/client/model/mql/package-info.java b/driver-core/src/main/com/mongodb/client/model/mql/package-info.java index 08cbc6195a7..caef0925787 100644 --- a/driver-core/src/main/com/mongodb/client/model/mql/package-info.java +++ b/driver-core/src/main/com/mongodb/client/model/mql/package-info.java @@ -19,8 +19,9 @@ * @see com.mongodb.client.model.mql.MqlValues * @since 4.9.0 */ -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) @NonNullApi package com.mongodb.client.model.mql; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.NonNullApi; diff --git a/driver-core/src/main/com/mongodb/client/model/search/AddSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/AddSearchScoreExpression.java index 11411ca923d..d8a2fe5e908 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/AddSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/AddSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface AddSearchScoreExpression extends SearchScoreExpression { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/AutocompleteSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/AutocompleteSearchOperator.java index 2a700e6a770..447de8168cd 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/AutocompleteSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/AutocompleteSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -24,7 +25,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface AutocompleteSearchOperator extends SearchOperator { @Override AutocompleteSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperator.java index 3d1549fb2fa..b12a86ae78a 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface CompoundSearchOperator extends CompoundSearchOperatorBase, SearchOperator { @Override CompoundSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperatorBase.java b/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperatorBase.java index f3fe27dbe3d..2834199a4e0 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperatorBase.java +++ b/driver-core/src/main/com/mongodb/client/model/search/CompoundSearchOperatorBase.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -26,7 +27,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface CompoundSearchOperatorBase { /** * Creates a new {@link CompoundSearchOperator} by adding to it {@code clauses} that must all be satisfied. diff --git a/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScore.java b/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScore.java index 31c9cfb4c21..463df7634e3 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScore.java +++ b/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScore.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface ConstantSearchScore extends SearchScore { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScoreExpression.java index e7ae9be59f2..691ee643572 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/ConstantSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface ConstantSearchScoreExpression extends SearchScoreExpression { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/DateNearSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/DateNearSearchOperator.java index 5edb7a02756..8421d058eeb 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/DateNearSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/DateNearSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.time.Duration; @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface DateNearSearchOperator extends SearchOperator { @Override DateNearSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperator.java index dfa98485837..f8c654cae1d 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -24,7 +25,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface DateRangeSearchOperator extends DateRangeSearchOperatorBase, SearchOperator { @Override DateRangeSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperatorBase.java b/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperatorBase.java index b7db8c190e9..df8fbaa93d8 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperatorBase.java +++ b/driver-core/src/main/com/mongodb/client/model/search/DateRangeSearchOperatorBase.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import java.time.Instant; @@ -29,7 +30,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface DateRangeSearchOperatorBase { /** * Creates a new {@link DateRangeSearchOperator} that tests if values are within (l; ∞). diff --git a/driver-core/src/main/com/mongodb/client/model/search/DateSearchFacet.java b/driver-core/src/main/com/mongodb/client/model/search/DateSearchFacet.java index 936ac3040f8..39d8bb2ddf0 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/DateSearchFacet.java +++ b/driver-core/src/main/com/mongodb/client/model/search/DateSearchFacet.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface DateSearchFacet extends SearchFacet { /** * Creates a new {@link DateSearchFacet} with the default bucket specified. diff --git a/driver-core/src/main/com/mongodb/client/model/search/ExistsSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/ExistsSearchOperator.java index cb847a49b66..847070dc3bc 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/ExistsSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/ExistsSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface ExistsSearchOperator extends SearchOperator { @Override ExistsSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/FacetSearchCollector.java b/driver-core/src/main/com/mongodb/client/model/search/FacetSearchCollector.java index 72be0245b2c..01190216633 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/FacetSearchCollector.java +++ b/driver-core/src/main/com/mongodb/client/model/search/FacetSearchCollector.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface FacetSearchCollector extends SearchCollector { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/FieldSearchPath.java b/driver-core/src/main/com/mongodb/client/model/search/FieldSearchPath.java index cc4b89f6381..2be4cdecb90 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/FieldSearchPath.java +++ b/driver-core/src/main/com/mongodb/client/model/search/FieldSearchPath.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import org.bson.conversions.Bson; @@ -26,7 +27,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface FieldSearchPath extends SearchPath { /** * Creates a new {@link FieldSearchPath} with the name of the alternate analyzer specified. diff --git a/driver-core/src/main/com/mongodb/client/model/search/FilterCompoundSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/FilterCompoundSearchOperator.java index 92b414ebbc8..df23133d1a8 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/FilterCompoundSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/FilterCompoundSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface FilterCompoundSearchOperator extends CompoundSearchOperator { @Override FilterCompoundSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/FunctionSearchScore.java b/driver-core/src/main/com/mongodb/client/model/search/FunctionSearchScore.java index 047cf65b2e4..e2bf09bf1a5 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/FunctionSearchScore.java +++ b/driver-core/src/main/com/mongodb/client/model/search/FunctionSearchScore.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface FunctionSearchScore extends SearchScore { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/FuzzySearchOptions.java b/driver-core/src/main/com/mongodb/client/model/search/FuzzySearchOptions.java index 7afe5fc1c8a..2acbb244537 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/FuzzySearchOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/search/FuzzySearchOptions.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import org.bson.conversions.Bson; @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface FuzzySearchOptions extends Bson { /** * Creates a new {@link FuzzySearchOptions} with the maximum diff --git a/driver-core/src/main/com/mongodb/client/model/search/GaussSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/GaussSearchScoreExpression.java index 038d5973d78..b3ac5fadedb 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/GaussSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/GaussSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface GaussSearchScoreExpression extends SearchScoreExpression { /** * Creates a new {@link GaussSearchScoreExpression} which does not decay, i.e., its output stays 1, if the value of the diff --git a/driver-core/src/main/com/mongodb/client/model/search/GeoNearSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/GeoNearSearchOperator.java index 5c02fce3030..1501bbd819e 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/GeoNearSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/GeoNearSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.geojson.Point; @@ -25,7 +26,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface GeoNearSearchOperator extends SearchOperator { @Override GeoNearSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/Log1pSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/Log1pSearchScoreExpression.java index f1499a5de16..40ad061cbcb 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/Log1pSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/Log1pSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface Log1pSearchScoreExpression extends SearchScoreExpression { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/LogSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/LogSearchScoreExpression.java index 10ad3b9d40d..ae4e5fa8725 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/LogSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/LogSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface LogSearchScoreExpression extends SearchScoreExpression { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/LowerBoundSearchCount.java b/driver-core/src/main/com/mongodb/client/model/search/LowerBoundSearchCount.java index 888d66d50b0..15576d4a5b6 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/LowerBoundSearchCount.java +++ b/driver-core/src/main/com/mongodb/client/model/search/LowerBoundSearchCount.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface LowerBoundSearchCount extends SearchCount { /** * Creates a new {@link LowerBoundSearchCount} that instructs to count documents up to the {@code threshold} exactly, diff --git a/driver-core/src/main/com/mongodb/client/model/search/MultiplySearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/MultiplySearchScoreExpression.java index 31d330ba161..e6ab2332bfe 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/MultiplySearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/MultiplySearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MultiplySearchScoreExpression extends SearchScoreExpression { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/MustCompoundSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/MustCompoundSearchOperator.java index e9715a9b076..d9db7f7e34b 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/MustCompoundSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/MustCompoundSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MustCompoundSearchOperator extends CompoundSearchOperator { @Override MustCompoundSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/MustNotCompoundSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/MustNotCompoundSearchOperator.java index aad0bb633cc..5bdcc56009d 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/MustNotCompoundSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/MustNotCompoundSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface MustNotCompoundSearchOperator extends CompoundSearchOperator { @Override MustNotCompoundSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/NumberNearSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/NumberNearSearchOperator.java index 1baf5f2303f..65d6ec4969e 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/NumberNearSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/NumberNearSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -24,7 +25,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface NumberNearSearchOperator extends SearchOperator { @Override NumberNearSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperator.java index e0acad425c6..fe5d37bdc41 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -24,7 +25,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface NumberRangeSearchOperator extends NumberRangeSearchOperatorBase, SearchOperator { @Override NumberRangeSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperatorBase.java b/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperatorBase.java index 2492f1db11c..daa31d48656 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperatorBase.java +++ b/driver-core/src/main/com/mongodb/client/model/search/NumberRangeSearchOperatorBase.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface NumberRangeSearchOperatorBase { /** * Creates a new {@link NumberRangeSearchOperator} that tests if values are within (l; ∞). diff --git a/driver-core/src/main/com/mongodb/client/model/search/NumberSearchFacet.java b/driver-core/src/main/com/mongodb/client/model/search/NumberSearchFacet.java index 4fc6bc27d21..4587f688097 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/NumberSearchFacet.java +++ b/driver-core/src/main/com/mongodb/client/model/search/NumberSearchFacet.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface NumberSearchFacet extends SearchFacet { /** * Creates a new {@link NumberSearchFacet} with the default bucket specified. diff --git a/driver-core/src/main/com/mongodb/client/model/search/PathBoostSearchScore.java b/driver-core/src/main/com/mongodb/client/model/search/PathBoostSearchScore.java index 37c675e523b..40459fa1724 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/PathBoostSearchScore.java +++ b/driver-core/src/main/com/mongodb/client/model/search/PathBoostSearchScore.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface PathBoostSearchScore extends SearchScore { /** * Creates a new {@link PathBoostSearchScore} with the value to fall back to diff --git a/driver-core/src/main/com/mongodb/client/model/search/PathSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/PathSearchScoreExpression.java index a144addae89..b3c14025f4e 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/PathSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/PathSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface PathSearchScoreExpression extends SearchScoreExpression { /** * Creates a new {@link PathSearchScoreExpression} with the value to fall back to diff --git a/driver-core/src/main/com/mongodb/client/model/search/RelevanceSearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/RelevanceSearchScoreExpression.java index 89491f5c935..2a36a679ad5 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/RelevanceSearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/RelevanceSearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface RelevanceSearchScoreExpression extends SearchScoreExpression { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchCollector.java b/driver-core/src/main/com/mongodb/client/model/search/SearchCollector.java index a93c5690699..6f2c45b4961 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchCollector.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchCollector.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Aggregates; import com.mongodb.client.model.Projections; @@ -34,7 +35,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchCollector extends Bson { /** * Returns a {@link SearchCollector} that groups results by values or ranges in the specified faceted fields and returns the count @@ -45,7 +46,7 @@ public interface SearchCollector extends Bson { * @return The requested {@link SearchCollector}. * @mongodb.atlas.manual atlas-search/facet/ facet collector */ - @Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) + @Beta({Reason.CLIENT, Reason.SERVER}) static FacetSearchCollector facet(final SearchOperator operator, final Iterable facets) { notNull("operator", operator); notNull("facets", facets); diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchCount.java b/driver-core/src/main/com/mongodb/client/model/search/SearchCount.java index bb80a894f95..f9a5917582b 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchCount.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchCount.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Projections; import org.bson.BsonDocument; @@ -33,7 +34,7 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface SearchCount extends Bson { /** * Returns a {@link SearchCount} that instructs to count documents exactly. diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchFacet.java b/driver-core/src/main/com/mongodb/client/model/search/SearchFacet.java index fcc4e2866b8..4aac0fef089 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchFacet.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchFacet.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import org.bson.BsonDocument; import org.bson.BsonType; @@ -43,7 +44,7 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface SearchFacet extends Bson { /** * Returns a {@link SearchFacet} that allows narrowing down search results based on the most frequent diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchHighlight.java b/driver-core/src/main/com/mongodb/client/model/search/SearchHighlight.java index c337be57e5b..6610c57590f 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchHighlight.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchHighlight.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Projections; import org.bson.BsonDocument; @@ -37,7 +38,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchHighlight extends Bson { /** * Creates a new {@link SearchHighlight} with the maximum number of characters to examine on a document diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java index e9fd4796234..9234db91c51 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Aggregates; import com.mongodb.client.model.geojson.Point; @@ -40,7 +41,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchOperator extends Bson { /** * Creates a new {@link SearchOperator} with the scoring modifier specified. diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchOptions.java b/driver-core/src/main/com/mongodb/client/model/search/SearchOptions.java index 8550c672ee5..f5cd0261e8f 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchOptions.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Aggregates; import org.bson.conversions.Bson; @@ -29,7 +30,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchOptions extends Bson { /** * Creates a new {@link SearchOptions} with the index name specified. @@ -53,7 +54,7 @@ public interface SearchOptions extends Bson { * @param option The counting option. * @return A new {@link SearchOptions}. */ - @Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) + @Beta({Reason.CLIENT, Reason.SERVER}) SearchOptions count(SearchCount option); /** @@ -63,7 +64,7 @@ public interface SearchOptions extends Bson { * @return A new {@link SearchOptions}. * @mongodb.atlas.manual atlas-search/return-stored-source/ Return stored source fields */ - @Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) + @Beta({Reason.CLIENT, Reason.SERVER}) SearchOptions returnStoredSource(boolean returnStoredSource); /** diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchPath.java b/driver-core/src/main/com/mongodb/client/model/search/SearchPath.java index c620c2995f0..7213f3f894b 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchPath.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchPath.java @@ -17,6 +17,7 @@ import com.mongodb.annotations.Beta; import com.mongodb.annotations.Sealed; +import com.mongodb.annotations.Reason; import com.mongodb.internal.client.model.Util; import org.bson.BsonDocument; import org.bson.BsonString; @@ -37,7 +38,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchPath extends Bson { /** * Returns a {@link SearchPath} for the given {@code path}. diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchScore.java b/driver-core/src/main/com/mongodb/client/model/search/SearchScore.java index 7c241e8ec06..825264cf7f5 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchScore.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchScore.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Projections; import org.bson.BsonDocument; @@ -34,7 +35,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchScore extends Bson { /** * Returns a {@link SearchScore} that instructs to multiply the score by the specified {@code value}. diff --git a/driver-core/src/main/com/mongodb/client/model/search/SearchScoreExpression.java b/driver-core/src/main/com/mongodb/client/model/search/SearchScoreExpression.java index 442b361d813..268786c3344 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/SearchScoreExpression.java +++ b/driver-core/src/main/com/mongodb/client/model/search/SearchScoreExpression.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import org.bson.BsonDocument; import org.bson.BsonDouble; @@ -36,7 +37,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface SearchScoreExpression extends Bson { /** * Returns a {@link SearchScoreExpression} that evaluates into the relevance score of a document. diff --git a/driver-core/src/main/com/mongodb/client/model/search/ShouldCompoundSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/ShouldCompoundSearchOperator.java index 388a08bcb03..a6bda94e206 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/ShouldCompoundSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/ShouldCompoundSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -27,7 +28,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface ShouldCompoundSearchOperator extends CompoundSearchOperator { @Override ShouldCompoundSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/StringSearchFacet.java b/driver-core/src/main/com/mongodb/client/model/search/StringSearchFacet.java index 523d20bfe98..209eaf9ff47 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/StringSearchFacet.java +++ b/driver-core/src/main/com/mongodb/client/model/search/StringSearchFacet.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,7 +24,7 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface StringSearchFacet extends SearchFacet { /** * Creates a new {@link StringSearchFacet} that explicitly limits the number of facet categories. diff --git a/driver-core/src/main/com/mongodb/client/model/search/TextSearchOperator.java b/driver-core/src/main/com/mongodb/client/model/search/TextSearchOperator.java index 71d1206d2d7..241639f3a47 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/TextSearchOperator.java +++ b/driver-core/src/main/com/mongodb/client/model/search/TextSearchOperator.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -24,7 +25,7 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface TextSearchOperator extends SearchOperator { @Override TextSearchOperator score(SearchScore modifier); diff --git a/driver-core/src/main/com/mongodb/client/model/search/TotalSearchCount.java b/driver-core/src/main/com/mongodb/client/model/search/TotalSearchCount.java index 5df56e6bbbd..2bcbde468f3 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/TotalSearchCount.java +++ b/driver-core/src/main/com/mongodb/client/model/search/TotalSearchCount.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta({Beta.Reason.CLIENT, Beta.Reason.SERVER}) +@Beta({Reason.CLIENT, Reason.SERVER}) public interface TotalSearchCount extends SearchCount { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/ValueBoostSearchScore.java b/driver-core/src/main/com/mongodb/client/model/search/ValueBoostSearchScore.java index 5b180b7c14f..d760bd60d52 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/ValueBoostSearchScore.java +++ b/driver-core/src/main/com/mongodb/client/model/search/ValueBoostSearchScore.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface ValueBoostSearchScore extends SearchScore { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/VectorSearchOptions.java b/driver-core/src/main/com/mongodb/client/model/search/VectorSearchOptions.java index e512ab0a31c..df3607d039b 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/VectorSearchOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/search/VectorSearchOptions.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; import com.mongodb.client.model.Aggregates; import com.mongodb.client.model.Filters; @@ -30,7 +31,7 @@ * @since 4.11 */ @Sealed -@Beta(Beta.Reason.SERVER) +@Beta(Reason.SERVER) public interface VectorSearchOptions extends Bson { /** * Creates a new {@link VectorSearchOptions} with the filter specified. diff --git a/driver-core/src/main/com/mongodb/client/model/search/WildcardSearchPath.java b/driver-core/src/main/com/mongodb/client/model/search/WildcardSearchPath.java index 9fb66644fbd..2fceaaaad7a 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/WildcardSearchPath.java +++ b/driver-core/src/main/com/mongodb/client/model/search/WildcardSearchPath.java @@ -16,6 +16,7 @@ package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.Sealed; /** @@ -23,6 +24,6 @@ * @since 4.7 */ @Sealed -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) public interface WildcardSearchPath extends SearchPath { } diff --git a/driver-core/src/main/com/mongodb/client/model/search/package-info.java b/driver-core/src/main/com/mongodb/client/model/search/package-info.java index d17cba4139e..c3664cb5560 100644 --- a/driver-core/src/main/com/mongodb/client/model/search/package-info.java +++ b/driver-core/src/main/com/mongodb/client/model/search/package-info.java @@ -31,8 +31,9 @@ * @since 4.7 */ @NonNullApi -@Beta(Beta.Reason.CLIENT) +@Beta(Reason.CLIENT) package com.mongodb.client.model.search; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.NonNullApi; diff --git a/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java b/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java index aef24b54765..509e467273b 100644 --- a/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java @@ -17,6 +17,7 @@ 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; @@ -181,7 +182,7 @@ public String getQueryType() { * @mongodb.server.release 6.2 * @mongodb.driver.manual /core/queryable-encryption/ queryable encryption */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public EncryptOptions rangeOptions(@Nullable final RangeOptions rangeOptions) { this.rangeOptions = rangeOptions; return this; @@ -195,7 +196,7 @@ public EncryptOptions rangeOptions(@Nullable final RangeOptions rangeOptions) { * @mongodb.driver.manual /core/queryable-encryption/ queryable encryption */ @Nullable - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public RangeOptions getRangeOptions() { return rangeOptions; } diff --git a/driver-core/src/main/com/mongodb/client/model/vault/RangeOptions.java b/driver-core/src/main/com/mongodb/client/model/vault/RangeOptions.java index b763b0bf112..42a6618bcdb 100644 --- a/driver-core/src/main/com/mongodb/client/model/vault/RangeOptions.java +++ b/driver-core/src/main/com/mongodb/client/model/vault/RangeOptions.java @@ -17,6 +17,7 @@ package com.mongodb.client.model.vault; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -33,7 +34,7 @@ * @mongodb.server.release 6.2 * @mongodb.driver.manual /core/queryable-encryption/ queryable encryption */ -@Beta(Beta.Reason.SERVER) +@Beta(Reason.SERVER) public class RangeOptions { private BsonValue min; diff --git a/driver-core/src/main/com/mongodb/connection/ServerDescription.java b/driver-core/src/main/com/mongodb/connection/ServerDescription.java index 87ca6775e05..4d8f3d19ce3 100644 --- a/driver-core/src/main/com/mongodb/connection/ServerDescription.java +++ b/driver-core/src/main/com/mongodb/connection/ServerDescription.java @@ -18,8 +18,10 @@ import com.mongodb.ServerAddress; import com.mongodb.TagSet; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; import com.mongodb.annotations.NotThreadSafe; +import com.mongodb.annotations.Reason; import com.mongodb.internal.connection.DecimalFormatHelper; import com.mongodb.internal.connection.Time; import com.mongodb.lang.Nullable; @@ -354,6 +356,7 @@ public Builder roundTripTime(final long roundTripTime, final TimeUnit timeUnit) * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public Builder minRoundTripTime(final long minRoundTripTime, final TimeUnit timeUnit) { this.minRoundTripTimeNanos = timeUnit.toNanos(minRoundTripTime); return this; @@ -880,6 +883,7 @@ public long getRoundTripTimeNanos() { * @return the recent min time taken to request the information, in nano seconds * @since CSOT */ + @Alpha(Reason.CLIENT) public long getMinRoundTripTimeNanos() { return minRoundTripTimeNanos; } diff --git a/driver-core/src/main/com/mongodb/internal/client/model/FindOptions.java b/driver-core/src/main/com/mongodb/internal/client/model/FindOptions.java index e2f92029950..49ce9e0abb4 100644 --- a/driver-core/src/main/com/mongodb/internal/client/model/FindOptions.java +++ b/driver-core/src/main/com/mongodb/internal/client/model/FindOptions.java @@ -17,6 +17,8 @@ package com.mongodb.internal.client.model; import com.mongodb.CursorType; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -247,6 +249,7 @@ public FindOptions batchSize(final int batchSize) { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public FindOptions timeoutMode(final TimeoutMode timeoutMode) { this.timeoutMode = timeoutMode; return this; @@ -256,6 +259,7 @@ public FindOptions timeoutMode(final TimeoutMode timeoutMode) { * @see #timeoutMode(TimeoutMode) * @return timeout mode */ + @Alpha(Reason.CLIENT) @Nullable public TimeoutMode getTimeoutMode() { return timeoutMode; diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/AggregateFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/AggregateFlow.kt index 46e18b50aec..dcb88186536 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/AggregateFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/AggregateFlow.kt @@ -16,6 +16,8 @@ package com.mongodb.kotlin.client.coroutine import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation import com.mongodb.reactivestreams.client.AggregatePublisher @@ -56,6 +58,7 @@ public class AggregateFlow(private val wrapped: AggregatePublisher) * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): AggregateFlow = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/DistinctFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/DistinctFlow.kt index c687eea7c5b..800c2dfdf95 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/DistinctFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/DistinctFlow.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client.coroutine +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation import com.mongodb.reactivestreams.client.DistinctPublisher @@ -52,6 +54,7 @@ public class DistinctFlow(private val wrapped: DistinctPublisher) : * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): DistinctFlow = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/FindFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/FindFlow.kt index ee2cc4706d3..0b7b11e572d 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/FindFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/FindFlow.kt @@ -17,6 +17,8 @@ package com.mongodb.kotlin.client.coroutine import com.mongodb.CursorType import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation import com.mongodb.reactivestreams.client.FindPublisher @@ -61,6 +63,7 @@ public class FindFlow(private val wrapped: FindPublisher) : Flow * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): FindFlow = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListCollectionsFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListCollectionsFlow.kt index eb5aecc7a0a..6f9825e46f2 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListCollectionsFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListCollectionsFlow.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client.coroutine +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.reactivestreams.client.ListCollectionsPublisher import java.util.concurrent.TimeUnit @@ -52,6 +54,7 @@ public class ListCollectionsFlow(private val wrapped: ListCollectionsPu * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListCollectionsFlow = apply { wrapped.timeoutMode(timeoutMode) } diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListDatabasesFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListDatabasesFlow.kt index 60670429029..90b874c81f1 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListDatabasesFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListDatabasesFlow.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client.coroutine +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.reactivestreams.client.ListDatabasesPublisher import java.util.concurrent.TimeUnit @@ -51,6 +53,7 @@ public class ListDatabasesFlow(private val wrapped: ListDatabasesPublis * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListDatabasesFlow = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListIndexesFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListIndexesFlow.kt index dd736b977ff..5a64445d388 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListIndexesFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListIndexesFlow.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client.coroutine +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.reactivestreams.client.ListIndexesPublisher import java.util.concurrent.TimeUnit @@ -50,6 +52,7 @@ public class ListIndexesFlow(private val wrapped: ListIndexesPublisher< * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListIndexesFlow = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListSearchIndexesFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListSearchIndexesFlow.kt index 0cbeaf70de9..71cadc06a87 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListSearchIndexesFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/ListSearchIndexesFlow.kt @@ -16,6 +16,8 @@ package com.mongodb.kotlin.client.coroutine import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation import com.mongodb.reactivestreams.client.ListSearchIndexesPublisher @@ -56,6 +58,7 @@ public class ListSearchIndexesFlow(private val wrapped: ListSearchIndex * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListSearchIndexesFlow = apply { wrapped.timeoutMode(timeoutMode) } diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MapReduceFlow.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MapReduceFlow.kt index 3f4a319090b..762c98f355b 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MapReduceFlow.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MapReduceFlow.kt @@ -17,6 +17,8 @@ package com.mongodb.kotlin.client.coroutine +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation import com.mongodb.client.model.MapReduceAction @@ -58,6 +60,7 @@ public class MapReduceFlow(private val wrapped: MapReducePublisher) * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): MapReduceFlow = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCluster.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCluster.kt index 74a129643bb..271edcfbdc7 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCluster.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCluster.kt @@ -19,6 +19,8 @@ import com.mongodb.ClientSessionOptions import com.mongodb.ReadConcern import com.mongodb.ReadPreference import com.mongodb.WriteConcern +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.reactivestreams.client.MongoCluster as JMongoCluster import java.util.concurrent.TimeUnit import kotlinx.coroutines.flow.Flow @@ -73,6 +75,7 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo * * @return the optional timeout duration */ + @Alpha(Reason.CLIENT) public fun timeout(timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Long? = wrapped.getTimeout(timeUnit) /** @@ -129,6 +132,7 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo * @see [MongoDatabase.timeout] * @since CSOT */ + @Alpha(Reason.CLIENT) public fun withTimeout(timeout: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): MongoCluster = MongoCluster(wrapped.withTimeout(timeout, timeUnit)) diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCollection.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCollection.kt index d5aecaba080..78e7422bef9 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCollection.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCollection.kt @@ -19,6 +19,8 @@ import com.mongodb.MongoNamespace import com.mongodb.ReadConcern import com.mongodb.ReadPreference import com.mongodb.WriteConcern +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.bulk.BulkWriteResult import com.mongodb.client.model.BulkWriteOptions import com.mongodb.client.model.CountOptions @@ -106,6 +108,7 @@ public class MongoCollection(private val wrapped: JMongoCollection) * @return the optional timeout duration * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeout(timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Long? = wrapped.getTimeout(timeUnit) /** @@ -182,6 +185,7 @@ public class MongoCollection(private val wrapped: JMongoCollection) * @see [MongoCollection.timeout] * @since CSOT */ + @Alpha(Reason.CLIENT) public fun withTimeout(timeout: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): MongoCollection = MongoCollection(wrapped.withTimeout(timeout, timeUnit)) diff --git a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoDatabase.kt b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoDatabase.kt index 182375b1bba..23f2825c87b 100644 --- a/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoDatabase.kt +++ b/driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoDatabase.kt @@ -18,6 +18,8 @@ package com.mongodb.kotlin.client.coroutine import com.mongodb.ReadConcern import com.mongodb.ReadPreference import com.mongodb.WriteConcern +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.model.CreateCollectionOptions import com.mongodb.client.model.CreateViewOptions import com.mongodb.reactivestreams.client.MongoDatabase as JMongoDatabase @@ -74,6 +76,7 @@ public class MongoDatabase(private val wrapped: JMongoDatabase) { * @return the optional timeout duration * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeout(timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Long? = wrapped.getTimeout(timeUnit) /** @@ -130,6 +133,7 @@ public class MongoDatabase(private val wrapped: JMongoDatabase) { * @see [MongoDatabase.timeout] * @since CSOT */ + @Alpha(Reason.CLIENT) public fun withTimeout(timeout: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): MongoDatabase = MongoDatabase(wrapped.withTimeout(timeout, timeUnit)) diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/AggregateIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/AggregateIterable.kt index cf27c638ad3..82c98de616a 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/AggregateIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/AggregateIterable.kt @@ -16,6 +16,8 @@ package com.mongodb.kotlin.client import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.AggregateIterable as JAggregateIterable import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation @@ -52,6 +54,7 @@ public class AggregateIterable(private val wrapped: JAggregateIterable< * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): AggregateIterable { wrapped.timeoutMode(timeoutMode) return this diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/DistinctIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/DistinctIterable.kt index 0ca445adde9..bd002ce0521 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/DistinctIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/DistinctIterable.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.DistinctIterable as JDistinctIterable import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation @@ -49,6 +51,7 @@ public class DistinctIterable(private val wrapped: JDistinctIterable = apply { wrapped.timeoutMode(timeoutMode) } /** diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/FindIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/FindIterable.kt index 6e0a895dd1a..3851bd04d21 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/FindIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/FindIterable.kt @@ -17,6 +17,8 @@ package com.mongodb.kotlin.client import com.mongodb.CursorType import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.FindIterable as JFindIterable import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation @@ -53,6 +55,7 @@ public class FindIterable(private val wrapped: JFindIterable) : Mong * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): FindIterable { wrapped.timeoutMode(timeoutMode) return this diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListCollectionsIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListCollectionsIterable.kt index 8e3473aa8a4..82b4870da3a 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListCollectionsIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListCollectionsIterable.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.ListCollectionsIterable as JListCollectionsIterable import com.mongodb.client.cursor.TimeoutMode import java.util.concurrent.TimeUnit @@ -45,6 +47,7 @@ public class ListCollectionsIterable(private val wrapped: JListCollecti * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListCollectionsIterable { wrapped.timeoutMode(timeoutMode) return this diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListDatabasesIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListDatabasesIterable.kt index de8be15727e..dd156516308 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListDatabasesIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListDatabasesIterable.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.ListDatabasesIterable as JListDatabasesIterable import com.mongodb.client.cursor.TimeoutMode import java.util.concurrent.TimeUnit @@ -45,6 +47,7 @@ public class ListDatabasesIterable(private val wrapped: JListDatabasesI * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListDatabasesIterable { wrapped.timeoutMode(timeoutMode) return this diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListIndexesIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListIndexesIterable.kt index 1fdddbd7d28..ec38934580b 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListIndexesIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListIndexesIterable.kt @@ -15,6 +15,8 @@ */ package com.mongodb.kotlin.client +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.ListIndexesIterable as JListIndexesIterable import com.mongodb.client.cursor.TimeoutMode import java.util.concurrent.TimeUnit @@ -43,6 +45,7 @@ public class ListIndexesIterable(private val wrapped: JListIndexesItera * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListIndexesIterable { wrapped.timeoutMode(timeoutMode) return this diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListSearchIndexesIterable.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListSearchIndexesIterable.kt index 1214e8026e0..dd8509c30e5 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListSearchIndexesIterable.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/ListSearchIndexesIterable.kt @@ -16,6 +16,8 @@ package com.mongodb.kotlin.client import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.ListSearchIndexesIterable as JListSearchIndexesIterable import com.mongodb.client.cursor.TimeoutMode import com.mongodb.client.model.Collation @@ -47,6 +49,7 @@ public class ListSearchIndexesIterable(private val wrapped: JListSearch * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeoutMode(timeoutMode: TimeoutMode): ListSearchIndexesIterable { wrapped.timeoutMode(timeoutMode) return this diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCluster.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCluster.kt index b4febfdba38..6b001d55cb9 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCluster.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCluster.kt @@ -19,6 +19,8 @@ import com.mongodb.ClientSessionOptions import com.mongodb.ReadConcern import com.mongodb.ReadPreference import com.mongodb.WriteConcern +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.MongoCluster as JMongoCluster import java.util.concurrent.TimeUnit import org.bson.Document @@ -70,6 +72,7 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo * * @return the optional timeout duration */ + @Alpha(Reason.CLIENT) public fun timeout(timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Long? = wrapped.getTimeout(timeUnit) /** @@ -126,6 +129,7 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo * @see [MongoDatabase.timeout] * @since CSOT */ + @Alpha(Reason.CLIENT) public fun withTimeout(timeout: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): MongoCluster = MongoCluster(wrapped.withTimeout(timeout, timeUnit)) diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCollection.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCollection.kt index 87816e08383..7776f1ac93a 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCollection.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCollection.kt @@ -19,6 +19,8 @@ import com.mongodb.MongoNamespace import com.mongodb.ReadConcern import com.mongodb.ReadPreference import com.mongodb.WriteConcern +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.bulk.BulkWriteResult import com.mongodb.client.MongoCollection as JMongoCollection import com.mongodb.client.model.BulkWriteOptions @@ -103,6 +105,7 @@ public class MongoCollection(private val wrapped: JMongoCollection) * @return the optional timeout duration * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeout(timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Long? = wrapped.getTimeout(timeUnit) /** @@ -179,6 +182,7 @@ public class MongoCollection(private val wrapped: JMongoCollection) * @see [MongoCollection.timeout] * @since CSOT */ + @Alpha(Reason.CLIENT) public fun withTimeout(timeout: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): MongoCollection = MongoCollection(wrapped.withTimeout(timeout, timeUnit)) diff --git a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoDatabase.kt b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoDatabase.kt index ee242354342..6d8d81e13c3 100644 --- a/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoDatabase.kt +++ b/driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoDatabase.kt @@ -18,6 +18,8 @@ package com.mongodb.kotlin.client import com.mongodb.ReadConcern import com.mongodb.ReadPreference import com.mongodb.WriteConcern +import com.mongodb.annotations.Alpha +import com.mongodb.annotations.Reason import com.mongodb.client.MongoDatabase as JMongoDatabase import com.mongodb.client.model.CreateCollectionOptions import com.mongodb.client.model.CreateViewOptions @@ -72,6 +74,7 @@ public class MongoDatabase(private val wrapped: JMongoDatabase) { * @return the optional timeout duration * @since CSOT */ + @Alpha(Reason.CLIENT) public fun timeout(timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Long? = wrapped.getTimeout(timeUnit) /** @@ -128,6 +131,7 @@ public class MongoDatabase(private val wrapped: JMongoDatabase) { * @see [MongoDatabase.timeout] * @since CSOT */ + @Alpha(Reason.CLIENT) public fun withTimeout(timeout: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): MongoDatabase = MongoDatabase(wrapped.withTimeout(timeout, timeUnit)) diff --git a/driver-legacy/src/main/com/mongodb/MongoClientOptions.java b/driver-legacy/src/main/com/mongodb/MongoClientOptions.java index 8c4442f237c..bcdf83270e9 100644 --- a/driver-legacy/src/main/com/mongodb/MongoClientOptions.java +++ b/driver-legacy/src/main/com/mongodb/MongoClientOptions.java @@ -16,8 +16,10 @@ package com.mongodb; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; import com.mongodb.annotations.NotThreadSafe; +import com.mongodb.annotations.Reason; import com.mongodb.connection.ClusterConnectionMode; import com.mongodb.connection.ConnectionPoolSettings; import com.mongodb.event.ClusterListener; @@ -576,6 +578,7 @@ public ServerApi getServerApi() { * @return the timeout in milliseconds * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable public Long getTimeout() { return wrapped.getTimeout(MILLISECONDS); @@ -1372,6 +1375,7 @@ public Builder srvServiceName(final String srvServiceName) { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) public Builder timeout(final long timeoutMS) { wrapped.timeout(timeoutMS, MILLISECONDS); return this; diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/AggregatePublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/AggregatePublisher.java index 18837e44b40..487a71c299f 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/AggregatePublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/AggregatePublisher.java @@ -17,6 +17,8 @@ package com.mongodb.reactivestreams.client; import com.mongodb.ExplainVerbosity; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -191,6 +193,7 @@ public interface AggregatePublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) AggregatePublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/DistinctPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/DistinctPublisher.java index 8dbaeed75bb..9812097ce83 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/DistinctPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/DistinctPublisher.java @@ -16,6 +16,8 @@ package com.mongodb.reactivestreams.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -106,6 +108,7 @@ public interface DistinctPublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) DistinctPublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/FindPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/FindPublisher.java index 84501d643e9..fd478ba78a7 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/FindPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/FindPublisher.java @@ -18,6 +18,8 @@ import com.mongodb.CursorType; import com.mongodb.ExplainVerbosity; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.client.model.Projections; @@ -288,6 +290,7 @@ public interface FindPublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) FindPublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListCollectionsPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListCollectionsPublisher.java index e114e714de2..0850ea2ccbc 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListCollectionsPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListCollectionsPublisher.java @@ -16,6 +16,8 @@ package com.mongodb.reactivestreams.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -96,6 +98,7 @@ public interface ListCollectionsPublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListCollectionsPublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListDatabasesPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListDatabasesPublisher.java index 5853f30d8ff..b51f27ecdb8 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListDatabasesPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListDatabasesPublisher.java @@ -17,6 +17,8 @@ package com.mongodb.reactivestreams.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -119,6 +121,7 @@ public interface ListDatabasesPublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListDatabasesPublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListIndexesPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListIndexesPublisher.java index e4ac214063f..bb10a96d073 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListIndexesPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListIndexesPublisher.java @@ -16,6 +16,8 @@ package com.mongodb.reactivestreams.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -85,6 +87,7 @@ public interface ListIndexesPublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListIndexesPublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListSearchIndexesPublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListSearchIndexesPublisher.java index ad341e61954..eae3fc0842a 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListSearchIndexesPublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/ListSearchIndexesPublisher.java @@ -17,7 +17,9 @@ package com.mongodb.reactivestreams.client; import com.mongodb.ExplainVerbosity; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Evolving; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -110,6 +112,7 @@ public interface ListSearchIndexesPublisher extends Publisher * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListSearchIndexesPublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MapReducePublisher.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MapReducePublisher.java index 7f7033a723b..d3e4dfeca0c 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MapReducePublisher.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MapReducePublisher.java @@ -17,6 +17,8 @@ package com.mongodb.reactivestreams.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -200,6 +202,7 @@ public interface MapReducePublisher extends Publisher { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) MapReducePublisher timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCluster.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCluster.java index 9c2cd0b9df7..d940400f1cd 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCluster.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCluster.java @@ -21,7 +21,9 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import org.bson.Document; import org.bson.codecs.configuration.CodecRegistry; @@ -105,6 +107,7 @@ public interface MongoCluster { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -165,6 +168,7 @@ public interface MongoCluster { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) MongoCluster withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCollection.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCollection.java index 135cade2d68..e27b7a26377 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCollection.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCollection.java @@ -20,6 +20,8 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.ThreadSafe; import com.mongodb.bulk.BulkWriteResult; import com.mongodb.client.model.BulkWriteOptions; @@ -136,6 +138,7 @@ public interface MongoCollection { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -202,6 +205,7 @@ public interface MongoCollection { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) MongoCollection withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoDatabase.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoDatabase.java index e2d802c012e..b9c1ac8cfc1 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoDatabase.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoDatabase.java @@ -19,6 +19,8 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.ThreadSafe; import com.mongodb.client.model.CreateCollectionOptions; import com.mongodb.client.model.CreateViewOptions; @@ -103,6 +105,7 @@ public interface MongoDatabase { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -160,6 +163,7 @@ public interface MongoDatabase { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) MongoDatabase withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/gridfs/GridFSBucket.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/gridfs/GridFSBucket.java index b452ad36a21..78a3f5357fc 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/gridfs/GridFSBucket.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/gridfs/GridFSBucket.java @@ -19,6 +19,8 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.ThreadSafe; import com.mongodb.client.gridfs.model.GridFSDownloadOptions; import com.mongodb.client.gridfs.model.GridFSUploadOptions; @@ -104,6 +106,7 @@ public interface GridFSBucket { * @return the timeout in the given time unit * @since 4.x */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -155,6 +158,7 @@ public interface GridFSBucket { * @since 4.x * @see #getTimeout */ + @Alpha(Reason.CLIENT) GridFSBucket withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java index a4a4d17b1ca..6d5aca27457 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/Crypt.java @@ -20,6 +20,7 @@ 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; @@ -190,7 +191,7 @@ public Mono encryptExplicitly(final BsonValue value, final EncryptOp * @since 4.9 * @mongodb.server.release 6.2 */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) public Mono encryptExpression(final BsonDocument expression, final EncryptOptions options, @Nullable final Timeout operationTimeout) { return executeStateMachine(() -> mongoCrypt.createEncryptExpressionContext(new BsonDocument("v", expression), asMongoExplicitEncryptOptions(options)), operationTimeout diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/ClientEncryption.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/ClientEncryption.java index 06d5f713019..37d0236293b 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/ClientEncryption.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/vault/ClientEncryption.java @@ -19,6 +19,7 @@ import com.mongodb.AutoEncryptionSettings; import com.mongodb.MongoUpdatedEncryptedFieldsException; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.client.model.CreateCollectionOptions; import com.mongodb.client.model.CreateEncryptedCollectionParams; import com.mongodb.client.model.vault.DataKeyOptions; @@ -108,7 +109,7 @@ public interface ClientEncryption extends Closeable { * @mongodb.driver.manual /core/queryable-encryption/ queryable encryption * @mongodb.driver.manual reference/operator/aggregation/match/ $match */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) Publisher encryptExpression(Bson expression, EncryptOptions options); /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/AggregateObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/AggregateObservable.scala index 9f8a24182db..e036c1d6246 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/AggregateObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/AggregateObservable.scala @@ -17,6 +17,7 @@ package org.mongodb.scala import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.{ Alpha, Reason } import java.util.concurrent.TimeUnit import com.mongodb.reactivestreams.client.AggregatePublisher @@ -214,6 +215,7 @@ case class AggregateObservable[TResult](private val wrapped: AggregatePublisher[ * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): AggregateObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/DistinctObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/DistinctObservable.scala index 1a8c6307e22..b1c072882a2 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/DistinctObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/DistinctObservable.scala @@ -16,6 +16,8 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } + import java.util.concurrent.TimeUnit import com.mongodb.reactivestreams.client.DistinctPublisher import org.mongodb.scala.bson.BsonValue @@ -119,6 +121,7 @@ case class DistinctObservable[TResult](private val wrapped: DistinctPublisher[TR * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): DistinctObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/FindObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/FindObservable.scala index b584a064162..44176db049b 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/FindObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/FindObservable.scala @@ -16,6 +16,7 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } import com.mongodb.reactivestreams.client.FindPublisher import com.mongodb.{ CursorType, ExplainVerbosity } import org.mongodb.scala.bson.BsonValue @@ -348,6 +349,7 @@ case class FindObservable[TResult](private val wrapped: FindPublisher[TResult]) * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): FindObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/ListCollectionsObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/ListCollectionsObservable.scala index 553f73a069a..9a06cf7f1b0 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/ListCollectionsObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/ListCollectionsObservable.scala @@ -16,6 +16,8 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } + import java.util.concurrent.TimeUnit import com.mongodb.reactivestreams.client.ListCollectionsPublisher import org.mongodb.scala.bson.BsonValue @@ -104,6 +106,7 @@ case class ListCollectionsObservable[TResult](wrapped: ListCollectionsPublisher[ * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): ListCollectionsObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/ListDatabasesObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/ListDatabasesObservable.scala index 225c3c1d84e..5a19255dafb 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/ListDatabasesObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/ListDatabasesObservable.scala @@ -16,6 +16,8 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } + import java.util.concurrent.TimeUnit import com.mongodb.reactivestreams.client.ListDatabasesPublisher import org.mongodb.scala.bson.BsonValue @@ -133,6 +135,7 @@ case class ListDatabasesObservable[TResult](wrapped: ListDatabasesPublisher[TRes * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): ListDatabasesObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/ListIndexesObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/ListIndexesObservable.scala index e17be7b1457..994102bdd44 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/ListIndexesObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/ListIndexesObservable.scala @@ -16,6 +16,8 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } + import java.util.concurrent.TimeUnit import com.mongodb.reactivestreams.client.ListIndexesPublisher import org.mongodb.scala.bson.BsonValue @@ -91,6 +93,7 @@ case class ListIndexesObservable[TResult](wrapped: ListIndexesPublisher[TResult] * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): ListIndexesObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/ListSearchIndexesObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/ListSearchIndexesObservable.scala index ef4907d60b3..1f83706d0a4 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/ListSearchIndexesObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/ListSearchIndexesObservable.scala @@ -17,6 +17,7 @@ package org.mongodb.scala import com.mongodb.ExplainVerbosity +import com.mongodb.annotations.{ Alpha, Reason } import com.mongodb.reactivestreams.client.ListSearchIndexesPublisher import org.mongodb.scala.bson.BsonValue import org.mongodb.scala.bson.DefaultHelper.DefaultsTo @@ -138,6 +139,7 @@ case class ListSearchIndexesObservable[TResult](wrapped: ListSearchIndexesPublis * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): ListSearchIndexesObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/MapReduceObservable.scala b/driver-scala/src/main/scala/org/mongodb/scala/MapReduceObservable.scala index e7c8ff67de3..aaf958eb6ea 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/MapReduceObservable.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/MapReduceObservable.scala @@ -16,8 +16,9 @@ package org.mongodb.scala -import java.util.concurrent.TimeUnit +import com.mongodb.annotations.{ Alpha, Reason } +import java.util.concurrent.TimeUnit import com.mongodb.client.model.MapReduceAction import com.mongodb.reactivestreams.client.MapReducePublisher import org.mongodb.scala.bson.conversions.Bson @@ -231,6 +232,7 @@ case class MapReduceObservable[TResult](wrapped: MapReducePublisher[TResult]) ex * @return this * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def timeoutMode(timeoutMode: TimeoutMode): MapReduceObservable[TResult] = { wrapped.timeoutMode(timeoutMode) this diff --git a/driver-scala/src/main/scala/org/mongodb/scala/MongoCluster.scala b/driver-scala/src/main/scala/org/mongodb/scala/MongoCluster.scala index a76f91363a4..44fe5ca2d58 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/MongoCluster.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/MongoCluster.scala @@ -16,6 +16,7 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } import com.mongodb.{ ReadConcern, ReadPreference, WriteConcern } import com.mongodb.reactivestreams.client.{ MongoCluster => JMongoCluster } import org.bson.codecs.configuration.CodecRegistry @@ -99,6 +100,7 @@ class MongoCluster(private val wrapped: JMongoCluster) { * * @return the optional timeout duration */ + @Alpha(Array(Reason.CLIENT)) lazy val timeout: Option[Duration] = Option.apply(wrapped.getTimeout(MILLISECONDS)).map(t => Duration(t, MILLISECONDS)) @@ -156,6 +158,7 @@ class MongoCluster(private val wrapped: JMongoCluster) { * @return a new MongoCluster instance with the set time limit for operations * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def withTimeout(timeout: Duration): MongoCluster = MongoCluster(wrapped.withTimeout(timeout.toMillis, MILLISECONDS)) diff --git a/driver-scala/src/main/scala/org/mongodb/scala/MongoCollection.scala b/driver-scala/src/main/scala/org/mongodb/scala/MongoCollection.scala index 5a3f552014d..1421dc8086c 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/MongoCollection.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/MongoCollection.scala @@ -16,6 +16,7 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } import com.mongodb.client.model.DropCollectionOptions import java.util @@ -103,6 +104,7 @@ case class MongoCollection[TResult](private val wrapped: JMongoCollection[TResul * @return the optional timeout duration * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) lazy val timeout: Option[Duration] = Option.apply(wrapped.getTimeout(MILLISECONDS)).map(t => Duration(t, MILLISECONDS)) @@ -169,6 +171,7 @@ case class MongoCollection[TResult](private val wrapped: JMongoCollection[TResul * @return a new MongoCollection instance with the set time limit for operations * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def withTimeout(timeout: Duration): MongoCollection[TResult] = MongoCollection(wrapped.withTimeout(timeout.toMillis, MILLISECONDS)) diff --git a/driver-scala/src/main/scala/org/mongodb/scala/MongoDatabase.scala b/driver-scala/src/main/scala/org/mongodb/scala/MongoDatabase.scala index 2200cbbcfcd..2c13ef2df7c 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/MongoDatabase.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/MongoDatabase.scala @@ -16,6 +16,7 @@ package org.mongodb.scala +import com.mongodb.annotations.{ Alpha, Reason } import com.mongodb.client.model.{ CreateCollectionOptions, CreateViewOptions } import com.mongodb.reactivestreams.client.{ MongoDatabase => JMongoDatabase } import org.bson.codecs.configuration.CodecRegistry @@ -89,6 +90,7 @@ case class MongoDatabase(private[scala] val wrapped: JMongoDatabase) { * @return the optional timeout duration * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) lazy val timeout: Option[Duration] = Option.apply(wrapped.getTimeout(MILLISECONDS)).map(t => Duration(t, MILLISECONDS)) @@ -146,6 +148,7 @@ case class MongoDatabase(private[scala] val wrapped: JMongoDatabase) { * @return a new MongoDatabase instance with the set time limit for operations * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def withTimeout(timeout: Duration): MongoDatabase = MongoDatabase(wrapped.withTimeout(timeout.toMillis, MILLISECONDS)) diff --git a/driver-scala/src/main/scala/org/mongodb/scala/gridfs/GridFSBucket.scala b/driver-scala/src/main/scala/org/mongodb/scala/gridfs/GridFSBucket.scala index bd89781aa8a..0c893e35dc8 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/gridfs/GridFSBucket.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/gridfs/GridFSBucket.scala @@ -16,6 +16,7 @@ package org.mongodb.scala.gridfs +import com.mongodb.annotations.{ Alpha, Reason } import java.nio.ByteBuffer import com.mongodb.reactivestreams.client.gridfs.{ GridFSBucket => JGridFSBucket, GridFSBuckets } import org.mongodb.scala.bson.conversions.Bson @@ -120,8 +121,9 @@ case class GridFSBucket(private val wrapped: JGridFSBucket) { * - `> 0` The time limit to use for the full execution of an operation. * * @return the optional timeout duration - * @since 4.x + * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) lazy val timeout: Option[Duration] = Option.apply(wrapped.getTimeout(MILLISECONDS)).map(t => Duration(t, MILLISECONDS)) @@ -168,8 +170,9 @@ case class GridFSBucket(private val wrapped: JGridFSBucket) { * * @param timeout the timeout, which must be greater than or equal to 0 * @return a new GridFSBucket instance with the set time limit for operations - * @since 4.x + * @since CSOT */ + @Alpha(Array(Reason.CLIENT)) def withTimeout(timeout: Duration): GridFSBucket = GridFSBucket(wrapped.withTimeout(timeout.toMillis, MILLISECONDS)) diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/Aggregates.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/Aggregates.scala index fc3196f76f6..0fff8c4c8ba 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/Aggregates.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/Aggregates.scala @@ -16,7 +16,7 @@ package org.mongodb.scala.model -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.fill.FillOutputField import com.mongodb.client.model.search.FieldSearchPath @@ -737,7 +737,7 @@ object Aggregates { * @note Requires MongoDB 6.0.10 or greater * @since 4.11 */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) def vectorSearch( path: FieldSearchPath, queryVector: Iterable[java.lang.Double], @@ -763,7 +763,7 @@ object Aggregates { * @note Requires MongoDB 6.0.10 or greater * @since 4.11 */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) def vectorSearch( path: FieldSearchPath, queryVector: Iterable[java.lang.Double], diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/Windows.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/Windows.scala index 4688fa818c6..5ccbd299edf 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/Windows.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/Windows.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.{ MongoTimeUnit => JMongoTimeUnit, Windows => JWindows } import org.bson.types.Decimal128 import org.mongodb.scala.bson.conversions.Bson @@ -56,7 +56,7 @@ import org.mongodb.scala.bson.conversions.Bson * @since 4.3 * @note Requires MongoDB 5.0 or greater. */ -@Beta(Array(Beta.Reason.SERVER)) +@Beta(Array(Reason.SERVER)) object Windows { /** @@ -248,7 +248,7 @@ object Windows { * @since 4.3 * @note Requires MongoDB 5.0 or greater. */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) object Bound { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/package.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/package.scala index a8dc63a2b29..111af0e6568 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/package.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/package.scala @@ -16,7 +16,7 @@ package org.mongodb.scala -import com.mongodb.annotations.{ Beta, Sealed } +import com.mongodb.annotations.{ Beta, Reason, Sealed } import scala.collection.JavaConverters._ import com.mongodb.client.model.{ GeoNearOptions, MongoTimeUnit => JMongoTimeUnit, WindowOutputField } @@ -173,7 +173,7 @@ package object model { * * @since 4.9 */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) type CreateEncryptedCollectionParams = com.mongodb.client.model.CreateEncryptedCollectionParams /** @@ -181,7 +181,7 @@ package object model { * * @since 4.9 */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) object CreateEncryptedCollectionParams { def apply(kmsProvider: String) = new com.mongodb.client.model.CreateEncryptedCollectionParams(kmsProvider) diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/FuzzySearchOptions.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/FuzzySearchOptions.scala index afeb5d195d8..d106d6bbd9d 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/FuzzySearchOptions.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/FuzzySearchOptions.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ FuzzySearchOptions => JFuzzySearchOptions } /** @@ -25,7 +25,7 @@ import com.mongodb.client.model.search.{ FuzzySearchOptions => JFuzzySearchOptio * @see [[https://www.mongodb.com/docs/atlas/atlas-search/text/ text operator]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object FuzzySearchOptions { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCollector.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCollector.scala index d4fe9ccdffc..a651e502b10 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCollector.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCollector.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchCollector => JSearchCollector } import org.mongodb.scala.bson.conversions.Bson import org.mongodb.scala.model.Projections @@ -30,7 +30,7 @@ import scala.collection.JavaConverters._ * @see [[https://www.mongodb.com/docs/atlas/atlas-search/operators-and-collectors/#collectors Search collectors]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchCollector { /** @@ -42,7 +42,7 @@ object SearchCollector { * @return The requested `SearchCollector`. * @see [[https://www.mongodb.com/docs/atlas/atlas-search/facet/ facet collector]] */ - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) def facet(operator: SearchOperator, facets: Iterable[_ <: SearchFacet]): FacetSearchCollector = JSearchCollector.facet(operator, facets.asJava) diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCount.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCount.scala index 0df9a08ac51..ecba0ecce0d 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCount.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchCount.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchCount => JSearchCount } import org.mongodb.scala.bson.conversions.Bson import org.mongodb.scala.model.Projections @@ -28,7 +28,7 @@ import org.mongodb.scala.model.Projections * @see [[https://www.mongodb.com/docs/atlas/atlas-search/counting/ Counting]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) +@Beta(Array(Reason.CLIENT, Reason.SERVER)) object SearchCount { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchFacet.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchFacet.scala index 4482c8bc678..3bc27520ea3 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchFacet.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchFacet.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchFacet => JSearchFacet } import org.mongodb.scala.bson.conversions.Bson @@ -28,7 +28,7 @@ import collection.JavaConverters._ * @see [[https://www.mongodb.com/docs/atlas/atlas-search/facet/#facet-definition Facet definition]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) +@Beta(Array(Reason.CLIENT, Reason.SERVER)) object SearchFacet { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchHighlight.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchHighlight.scala index a46903a3147..7ac1deebac1 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchHighlight.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchHighlight.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchHighlight => JSearchHighlight } import org.mongodb.scala.bson.conversions.Bson import org.mongodb.scala.model.Projections @@ -30,7 +30,7 @@ import collection.JavaConverters._ * @see [[https://www.mongodb.com/docs/atlas/atlas-search/highlighting/ Highlighting]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchHighlight { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOperator.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOperator.scala index a1dc4caebff..90f27092ebc 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOperator.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOperator.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchOperator => JSearchOperator } import org.mongodb.scala.bson.conversions.Bson import org.mongodb.scala.model.geojson.Point @@ -29,7 +29,7 @@ import collection.JavaConverters._ * @see [[https://www.mongodb.com/docs/atlas/atlas-search/operators-and-collectors/#operators Search operators]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchOperator { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOptions.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOptions.scala index 56069e8624d..5eb61591043 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOptions.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchOptions.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchOptions => JSearchOptions } /** @@ -24,7 +24,7 @@ import com.mongodb.client.model.search.{ SearchOptions => JSearchOptions } * @see [[https://www.mongodb.com/docs/atlas/atlas-search/query-syntax/#-search \$search syntax]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchOptions { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchPath.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchPath.scala index cfe85faa6f7..74999deef35 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchPath.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchPath.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchPath => JSearchPath } /** @@ -27,7 +27,7 @@ import com.mongodb.client.model.search.{ SearchPath => JSearchPath } * @see [[https://www.mongodb.com/docs/atlas/atlas-search/path-construction/ Path]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchPath { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScore.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScore.scala index b43598220e3..35005c05970 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScore.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScore.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchScore => JSearchScore } import org.mongodb.scala.bson.conversions.Bson import org.mongodb.scala.model.Projections @@ -28,7 +28,7 @@ import org.mongodb.scala.model.Projections * @see [[https://www.mongodb.com/docs/atlas/atlas-search/scoring/ Scoring]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchScore { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScoreExpression.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScoreExpression.scala index 22657bc874e..244c07e5847 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScoreExpression.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/SearchScoreExpression.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ SearchScoreExpression => JSearchScoreExpression } import org.mongodb.scala.bson.conversions.Bson @@ -26,7 +26,7 @@ import collection.JavaConverters._ * @see [[https://www.mongodb.com/docs/atlas/atlas-search/scoring/#expressions Expressions for the function score modifier]] * @since 4.7 */ -@Beta(Array(Beta.Reason.CLIENT)) +@Beta(Array(Reason.CLIENT)) object SearchScoreExpression { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/VectorSearchOptions.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/VectorSearchOptions.scala index e355a5558cc..ab25650ca7a 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/VectorSearchOptions.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/VectorSearchOptions.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model.search -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.search.{ VectorSearchOptions => JVectorSearchOptions } /** @@ -25,7 +25,7 @@ import com.mongodb.client.model.search.{ VectorSearchOptions => JVectorSearchOpt * @note Requires MongoDB 6.0.10 or greater * @since 4.11 */ -@Beta(Array(Beta.Reason.SERVER)) +@Beta(Array(Reason.SERVER)) object VectorSearchOptions { /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/search/package.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/search/package.scala index e3f3fb5e308..fb9e393dd1b 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/search/package.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/search/package.scala @@ -15,7 +15,7 @@ */ package org.mongodb.scala.model -import com.mongodb.annotations.{ Beta, Sealed } +import com.mongodb.annotations.{ Beta, Reason, Sealed } /** * Query building API for MongoDB Atlas full-text search. @@ -40,7 +40,7 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/operators-and-collectors/#operators Search operators]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchOperator = com.mongodb.client.model.search.SearchOperator /** @@ -50,14 +50,14 @@ package object search { * @see `SearchOperator.compound()` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type CompoundSearchOperatorBase = com.mongodb.client.model.search.CompoundSearchOperatorBase /** * @see `SearchOperator.compound()` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type CompoundSearchOperator = com.mongodb.client.model.search.CompoundSearchOperator /** @@ -68,7 +68,7 @@ package object search { * @see `CompoundSearchOperatorBase.must(Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type MustCompoundSearchOperator = com.mongodb.client.model.search.MustCompoundSearchOperator /** @@ -79,7 +79,7 @@ package object search { * @see `CompoundSearchOperatorBase.mustNot(Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type MustNotCompoundSearchOperator = com.mongodb.client.model.search.MustNotCompoundSearchOperator /** @@ -90,7 +90,7 @@ package object search { * @see `CompoundSearchOperatorBase.should(Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type ShouldCompoundSearchOperator = com.mongodb.client.model.search.ShouldCompoundSearchOperator /** @@ -101,14 +101,14 @@ package object search { * @see `CompoundSearchOperatorBase.filter(Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type FilterCompoundSearchOperator = com.mongodb.client.model.search.FilterCompoundSearchOperator /** * @see `SearchOperator.exists(FieldSearchPath)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type ExistsSearchOperator = com.mongodb.client.model.search.ExistsSearchOperator /** @@ -116,7 +116,7 @@ package object search { * @see `SearchOperator.text(Iterable, Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type TextSearchOperator = com.mongodb.client.model.search.TextSearchOperator /** @@ -124,7 +124,7 @@ package object search { * @see `SearchOperator.autocomplete(Iterable, FieldSearchPath)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type AutocompleteSearchOperator = com.mongodb.client.model.search.AutocompleteSearchOperator /** @@ -134,7 +134,7 @@ package object search { * @see `SearchOperator.numberRange` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type NumberRangeSearchOperatorBase = com.mongodb.client.model.search.NumberRangeSearchOperatorBase /** @@ -144,42 +144,42 @@ package object search { * @see `SearchOperator.dateRange` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type DateRangeSearchOperatorBase = com.mongodb.client.model.search.DateRangeSearchOperatorBase /** * @see `SearchOperator.numberRange` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type NumberRangeSearchOperator = com.mongodb.client.model.search.NumberRangeSearchOperator /** * @see `SearchOperator.dateRange` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type DateRangeSearchOperator = com.mongodb.client.model.search.DateRangeSearchOperator /** * @see `SearchOperator.near` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type NumberNearSearchOperator = com.mongodb.client.model.search.NumberNearSearchOperator /** * @see `SearchOperator.near` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type DateNearSearchOperator = com.mongodb.client.model.search.DateNearSearchOperator /** * @see `SearchOperator.near` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type GeoNearSearchOperator = com.mongodb.client.model.search.GeoNearSearchOperator /** @@ -189,7 +189,7 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/text/ text operator]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type FuzzySearchOptions = com.mongodb.client.model.search.FuzzySearchOptions /** @@ -200,14 +200,14 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/operators-and-collectors/#collectors Search collectors]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchCollector = com.mongodb.client.model.search.SearchCollector /** * @see `SearchCollector.facet(SearchOperator, Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type FacetSearchCollector = com.mongodb.client.model.search.FacetSearchCollector /** @@ -216,7 +216,7 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/query-syntax/#-search \$search syntax]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchOptions = com.mongodb.client.model.search.SearchOptions /** @@ -227,7 +227,7 @@ package object search { * @since 4.11 */ @Sealed - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) type VectorSearchOptions = com.mongodb.client.model.search.VectorSearchOptions /** @@ -238,7 +238,7 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/highlighting/ Highlighting]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchHighlight = com.mongodb.client.model.search.SearchHighlight /** @@ -250,21 +250,21 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/counting/ Counting]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type SearchCount = com.mongodb.client.model.search.SearchCount /** * @see `SearchCount.total()` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type TotalSearchCount = com.mongodb.client.model.search.TotalSearchCount /** * @see `SearchCount.lowerBound()` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type LowerBoundSearchCount = com.mongodb.client.model.search.LowerBoundSearchCount /** @@ -273,28 +273,28 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/facet/#facet-definition Facet definition]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type SearchFacet = com.mongodb.client.model.search.SearchFacet /** * @see `SearchFacet.stringFacet(String, FieldSearchPath)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type StringSearchFacet = com.mongodb.client.model.search.StringSearchFacet /** * @see `SearchFacet.numberFacet(String, FieldSearchPath, Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type NumberSearchFacet = com.mongodb.client.model.search.NumberSearchFacet /** * @see `SearchFacet.dateFacet(String, FieldSearchPath, Iterable)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT, Beta.Reason.SERVER)) + @Beta(Array(Reason.CLIENT, Reason.SERVER)) type DateSearchFacet = com.mongodb.client.model.search.DateSearchFacet /** @@ -306,21 +306,21 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/path-construction/ Path]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchPath = com.mongodb.client.model.search.SearchPath /** * @see `SearchPath.fieldPath(String)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type FieldSearchPath = com.mongodb.client.model.search.FieldSearchPath /** * @see `SearchPath.wildcardPath(String)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type WildcardSearchPath = com.mongodb.client.model.search.WildcardSearchPath /** @@ -331,35 +331,35 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/scoring/ Scoring]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchScore = com.mongodb.client.model.search.SearchScore /** * @see `SearchScore.boost(float)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type ValueBoostSearchScore = com.mongodb.client.model.search.ValueBoostSearchScore /** * @see `SearchScore.boost(FieldSearchPath)` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type PathBoostSearchScore = com.mongodb.client.model.search.PathBoostSearchScore /** * @see `SearchScore.constant` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type ConstantSearchScore = com.mongodb.client.model.search.ConstantSearchScore /** * @see `SearchScore.function` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type FunctionSearchScore = com.mongodb.client.model.search.FunctionSearchScore /** @@ -367,62 +367,62 @@ package object search { * @see [[https://www.mongodb.com/docs/atlas/atlas-search/scoring/#expressions Expressions for the function score modifier]] */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type SearchScoreExpression = com.mongodb.client.model.search.SearchScoreExpression /** * @see `SearchScoreExpression.relevanceExpression` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type RelevanceSearchScoreExpression = com.mongodb.client.model.search.RelevanceSearchScoreExpression /** * @see `SearchScoreExpression.pathExpression` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type PathSearchScoreExpression = com.mongodb.client.model.search.PathSearchScoreExpression /** * @see `SearchScoreExpression.constantExpression` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type ConstantSearchScoreExpression = com.mongodb.client.model.search.ConstantSearchScoreExpression /** * @see `SearchScoreExpression.gaussExpression` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type GaussSearchScoreExpression = com.mongodb.client.model.search.GaussSearchScoreExpression /** * @see `SearchScoreExpression.log` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type LogSearchScoreExpression = com.mongodb.client.model.search.LogSearchScoreExpression /** * @see `SearchScoreExpression.log1p` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type Log1pSearchScoreExpression = com.mongodb.client.model.search.Log1pSearchScoreExpression /** * @see `SearchScoreExpression.addExpression` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type AddSearchScoreExpression = com.mongodb.client.model.search.AddSearchScoreExpression /** * @see `SearchScoreExpression.multiplyExpression` */ @Sealed - @Beta(Array(Beta.Reason.CLIENT)) + @Beta(Array(Reason.CLIENT)) type MultiplySearchScoreExpression = com.mongodb.client.model.search.MultiplySearchScoreExpression } diff --git a/driver-scala/src/main/scala/org/mongodb/scala/model/vault/package.scala b/driver-scala/src/main/scala/org/mongodb/scala/model/vault/package.scala index bf1f7b1ae5b..f57ddce32c6 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/model/vault/package.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/model/vault/package.scala @@ -16,7 +16,7 @@ package org.mongodb.scala.model -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.vault.{ DataKeyOptions => JDataKeyOptions } import com.mongodb.client.model.vault.{ EncryptOptions => JEncryptOptions } import com.mongodb.client.model.vault.{ RangeOptions => JRangeOptions } @@ -60,7 +60,7 @@ package object vault { * * @since 4.9 */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) type RangeOptions = JRangeOptions object RangeOptions { diff --git a/driver-scala/src/main/scala/org/mongodb/scala/package.scala b/driver-scala/src/main/scala/org/mongodb/scala/package.scala index 1a6a24cc229..f79af251238 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/package.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/package.scala @@ -16,7 +16,7 @@ package org.mongodb -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import org.bson.BsonDocumentReader import org.bson.codecs.{ DecoderContext, DocumentCodec } import org.mongodb.scala.bson.BsonDocument @@ -395,7 +395,7 @@ package object scala extends ClientSessionImplicits with ObservableImplicits wit * * @since 4.9 */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) type MongoUpdatedEncryptedFieldsException = com.mongodb.MongoUpdatedEncryptedFieldsException /** diff --git a/driver-scala/src/main/scala/org/mongodb/scala/vault/ClientEncryption.scala b/driver-scala/src/main/scala/org/mongodb/scala/vault/ClientEncryption.scala index b4c9de4d440..3d375b56e21 100644 --- a/driver-scala/src/main/scala/org/mongodb/scala/vault/ClientEncryption.scala +++ b/driver-scala/src/main/scala/org/mongodb/scala/vault/ClientEncryption.scala @@ -16,7 +16,7 @@ package org.mongodb.scala.vault -import com.mongodb.annotations.Beta +import com.mongodb.annotations.{ Beta, Reason } import com.mongodb.client.model.{ CreateCollectionOptions, CreateEncryptedCollectionParams } import java.io.Closeable @@ -91,7 +91,7 @@ case class ClientEncryption(private val wrapped: JClientEncryption) extends Clos * @return a Publisher containing the queryable encrypted range expression * @since 4.9 */ - @Beta(Array(Beta.Reason.SERVER)) def encryptExpression( + @Beta(Array(Reason.SERVER)) def encryptExpression( expression: Document, options: EncryptOptions ): SingleObservable[Document] = @@ -126,7 +126,7 @@ case class ClientEncryption(private val wrapped: JClientEncryption) extends Clos * @note Requires MongoDB 7.0 or greater. * @see [[https://www.mongodb.com/docs/manual/reference/command/create/ Create Command]] */ - @Beta(Array(Beta.Reason.SERVER)) + @Beta(Array(Reason.SERVER)) def createEncryptedCollection( database: MongoDatabase, collectionName: String, diff --git a/driver-sync/src/main/com/mongodb/client/AggregateIterable.java b/driver-sync/src/main/com/mongodb/client/AggregateIterable.java index dda8f757119..8a70725dcd6 100644 --- a/driver-sync/src/main/com/mongodb/client/AggregateIterable.java +++ b/driver-sync/src/main/com/mongodb/client/AggregateIterable.java @@ -17,6 +17,8 @@ package com.mongodb.client; import com.mongodb.ExplainVerbosity; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -85,6 +87,7 @@ public interface AggregateIterable extends MongoIterable { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) AggregateIterable timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-sync/src/main/com/mongodb/client/DistinctIterable.java b/driver-sync/src/main/com/mongodb/client/DistinctIterable.java index ba1f3217890..f18c0313805 100644 --- a/driver-sync/src/main/com/mongodb/client/DistinctIterable.java +++ b/driver-sync/src/main/com/mongodb/client/DistinctIterable.java @@ -16,6 +16,8 @@ package com.mongodb.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -102,5 +104,6 @@ public interface DistinctIterable extends MongoIterable { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) DistinctIterable timeoutMode(TimeoutMode timeoutMode); } diff --git a/driver-sync/src/main/com/mongodb/client/FindIterable.java b/driver-sync/src/main/com/mongodb/client/FindIterable.java index b93ce1873ac..2352cfec7d8 100644 --- a/driver-sync/src/main/com/mongodb/client/FindIterable.java +++ b/driver-sync/src/main/com/mongodb/client/FindIterable.java @@ -18,6 +18,8 @@ import com.mongodb.CursorType; import com.mongodb.ExplainVerbosity; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.client.model.Projections; @@ -281,6 +283,7 @@ public interface FindIterable extends MongoIterable { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) FindIterable timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java b/driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java index 6e7b7284f83..8fdcec9d7bb 100644 --- a/driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java +++ b/driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java @@ -16,6 +16,8 @@ package com.mongodb.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -92,5 +94,6 @@ public interface ListCollectionsIterable extends MongoIterable * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListCollectionsIterable timeoutMode(TimeoutMode timeoutMode); } diff --git a/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java b/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java index 0bd4693279d..9fbfe73affd 100644 --- a/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java +++ b/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java @@ -16,6 +16,8 @@ package com.mongodb.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -114,5 +116,6 @@ public interface ListDatabasesIterable extends MongoIterable { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListDatabasesIterable timeoutMode(TimeoutMode timeoutMode); } diff --git a/driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java b/driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java index 34551441131..9769e40bd29 100644 --- a/driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java +++ b/driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java @@ -16,6 +16,8 @@ package com.mongodb.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.lang.Nullable; import org.bson.BsonValue; @@ -81,5 +83,6 @@ public interface ListIndexesIterable extends MongoIterable { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) ListIndexesIterable timeoutMode(TimeoutMode timeoutMode); } diff --git a/driver-sync/src/main/com/mongodb/client/ListSearchIndexesIterable.java b/driver-sync/src/main/com/mongodb/client/ListSearchIndexesIterable.java index 2aa82ea3fd6..2c5da3e2f5d 100644 --- a/driver-sync/src/main/com/mongodb/client/ListSearchIndexesIterable.java +++ b/driver-sync/src/main/com/mongodb/client/ListSearchIndexesIterable.java @@ -17,7 +17,9 @@ package com.mongodb.client; import com.mongodb.ExplainVerbosity; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Evolving; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -110,6 +112,7 @@ public interface ListSearchIndexesIterable extends MongoIterable timeoutMode(TimeoutMode timeoutMode); /** diff --git a/driver-sync/src/main/com/mongodb/client/MapReduceIterable.java b/driver-sync/src/main/com/mongodb/client/MapReduceIterable.java index 0b28fde91ee..8b747a5d1a0 100644 --- a/driver-sync/src/main/com/mongodb/client/MapReduceIterable.java +++ b/driver-sync/src/main/com/mongodb/client/MapReduceIterable.java @@ -16,6 +16,8 @@ package com.mongodb.client; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.client.cursor.TimeoutMode; import com.mongodb.client.model.Collation; import com.mongodb.lang.Nullable; @@ -192,5 +194,6 @@ public interface MapReduceIterable extends MongoIterable { * @return this * @since CSOT */ + @Alpha(Reason.CLIENT) MapReduceIterable timeoutMode(TimeoutMode timeoutMode); } diff --git a/driver-sync/src/main/com/mongodb/client/MongoCluster.java b/driver-sync/src/main/com/mongodb/client/MongoCluster.java index 7d02a98f0f2..ccc4760891f 100644 --- a/driver-sync/src/main/com/mongodb/client/MongoCluster.java +++ b/driver-sync/src/main/com/mongodb/client/MongoCluster.java @@ -21,7 +21,9 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; import com.mongodb.annotations.Immutable; +import com.mongodb.annotations.Reason; import com.mongodb.lang.Nullable; import org.bson.Document; import org.bson.codecs.configuration.CodecRegistry; @@ -104,6 +106,7 @@ public interface MongoCluster { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -164,6 +167,7 @@ public interface MongoCluster { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) MongoCluster withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-sync/src/main/com/mongodb/client/MongoCollection.java b/driver-sync/src/main/com/mongodb/client/MongoCollection.java index 7f69fad4dd1..976eb349060 100644 --- a/driver-sync/src/main/com/mongodb/client/MongoCollection.java +++ b/driver-sync/src/main/com/mongodb/client/MongoCollection.java @@ -20,6 +20,8 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.ThreadSafe; import com.mongodb.bulk.BulkWriteResult; import com.mongodb.client.model.BulkWriteOptions; @@ -140,6 +142,7 @@ public interface MongoCollection { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -207,6 +210,7 @@ public interface MongoCollection { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) MongoCollection withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-sync/src/main/com/mongodb/client/MongoDatabase.java b/driver-sync/src/main/com/mongodb/client/MongoDatabase.java index b7fee5c1634..83007acfc37 100644 --- a/driver-sync/src/main/com/mongodb/client/MongoDatabase.java +++ b/driver-sync/src/main/com/mongodb/client/MongoDatabase.java @@ -19,6 +19,8 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.ThreadSafe; import com.mongodb.client.model.CreateCollectionOptions; import com.mongodb.client.model.CreateViewOptions; @@ -105,6 +107,7 @@ public interface MongoDatabase { * @return the timeout in the given time unit * @since CSOT */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -163,6 +166,7 @@ public interface MongoDatabase { * @since CSOT * @see #getTimeout */ + @Alpha(Reason.CLIENT) MongoDatabase withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java index d79ae468db7..5335ed4ce91 100644 --- a/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java +++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java @@ -19,6 +19,8 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; +import com.mongodb.annotations.Alpha; +import com.mongodb.annotations.Reason; import com.mongodb.annotations.ThreadSafe; import com.mongodb.client.ClientSession; import com.mongodb.client.MongoDatabase; @@ -106,6 +108,7 @@ public interface GridFSBucket { * @return the timeout in the given time unit * @since 4.x */ + @Alpha(Reason.CLIENT) @Nullable Long getTimeout(TimeUnit timeUnit); @@ -158,6 +161,7 @@ public interface GridFSBucket { * @since 4.x * @see #getTimeout */ + @Alpha(Reason.CLIENT) GridFSBucket withTimeout(long timeout, TimeUnit timeUnit); /** diff --git a/driver-sync/src/main/com/mongodb/client/internal/Crypt.java b/driver-sync/src/main/com/mongodb/client/internal/Crypt.java index 1d31bcf80ba..53a65ceaa02 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/Crypt.java +++ b/driver-sync/src/main/com/mongodb/client/internal/Crypt.java @@ -20,6 +20,7 @@ import com.mongodb.MongoException; import com.mongodb.MongoInternalException; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.client.MongoClient; import com.mongodb.client.model.vault.DataKeyOptions; import com.mongodb.client.model.vault.EncryptOptions; @@ -211,7 +212,7 @@ BsonBinary encryptExplicitly(final BsonValue value, final EncryptOptions options * @param options the options * @return the encrypted expression */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) BsonDocument encryptExpression(final BsonDocument expression, final EncryptOptions options, @Nullable final Timeout timeoutOperation) { notNull("expression", expression); notNull("options", options); diff --git a/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java b/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java index 864fdf004dc..6d529741a24 100644 --- a/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java +++ b/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java @@ -19,6 +19,7 @@ import com.mongodb.AutoEncryptionSettings; import com.mongodb.MongoUpdatedEncryptedFieldsException; import com.mongodb.annotations.Beta; +import com.mongodb.annotations.Reason; import com.mongodb.client.FindIterable; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.CreateCollectionOptions; @@ -108,7 +109,7 @@ public interface ClientEncryption extends Closeable { * @mongodb.driver.manual /core/queryable-encryption/ queryable encryption * @mongodb.driver.manual reference/operator/aggregation/match/ $match */ - @Beta(Beta.Reason.SERVER) + @Beta(Reason.SERVER) BsonDocument encryptExpression(Bson expression, EncryptOptions options); /**