diff --git a/driver-core/src/main/com/mongodb/MongoBulkWriteException.java b/driver-core/src/main/com/mongodb/MongoBulkWriteException.java index 3eccc9d371e..8bc1a2d55d4 100644 --- a/driver-core/src/main/com/mongodb/MongoBulkWriteException.java +++ b/driver-core/src/main/com/mongodb/MongoBulkWriteException.java @@ -66,6 +66,7 @@ public MongoBulkWriteException(final BulkWriteResult writeResult, final List writeErrors, @Nullable final WriteConcernError writeConcernError, final ServerAddress serverAddress, final Set errorLabels) { diff --git a/driver-core/src/main/com/mongodb/MongoWriteConcernException.java b/driver-core/src/main/com/mongodb/MongoWriteConcernException.java index ae07404f509..b8cc7474d93 100644 --- a/driver-core/src/main/com/mongodb/MongoWriteConcernException.java +++ b/driver-core/src/main/com/mongodb/MongoWriteConcernException.java @@ -52,6 +52,7 @@ public MongoWriteConcernException(final WriteConcernError writeConcernError, fin * @param serverAddress the non-null server address * @since 3.2 */ + @SuppressWarnings("deprecation") public MongoWriteConcernException(final WriteConcernError writeConcernError, @Nullable final WriteConcernResult writeConcernResult, final ServerAddress serverAddress) { super(writeConcernError.getCode(), writeConcernError.getMessage(), serverAddress); @@ -63,6 +64,7 @@ public MongoWriteConcernException(final WriteConcernError writeConcernError, @Nu } @Override + @SuppressWarnings("deprecation") public void addLabel(final String errorLabel) { writeConcernError.addLabel(errorLabel); super.addLabel(errorLabel); diff --git a/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java b/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java index ac69355ddde..99982a30e45 100644 --- a/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java +++ b/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java @@ -59,7 +59,9 @@ public WriteConcernError(final int code, final String codeName, final String mes * @param details any details * @param errorLabels any error labels * @since 4.1 + * @deprecated Prefer using error labels included in the top level response document */ + @Deprecated public WriteConcernError(final int code, final String codeName, final String message, final BsonDocument details, final Set errorLabels) { this.code = code; @@ -113,7 +115,9 @@ public BsonDocument getDetails() { * @param errorLabel the non-null error label to add to the exception * * @since 4.1 + * @deprecated Prefer using error labels included in the top level response document */ + @Deprecated public void addLabel(final String errorLabel) { notNull("errorLabel", errorLabel); errorLabels.add(errorLabel); @@ -124,8 +128,10 @@ public void addLabel(final String errorLabel) { * * @return the error labels, which may not be null but may be empty * @since 4.1 + * @deprecated Prefer using error labels included in the top level response document */ @NonNull + @Deprecated public Set getErrorLabels() { return Collections.unmodifiableSet(errorLabels); } diff --git a/driver-core/src/main/com/mongodb/internal/connection/BulkWriteBatchCombiner.java b/driver-core/src/main/com/mongodb/internal/connection/BulkWriteBatchCombiner.java index df81da995ca..7439b5c1ff6 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/BulkWriteBatchCombiner.java +++ b/driver-core/src/main/com/mongodb/internal/connection/BulkWriteBatchCombiner.java @@ -168,6 +168,7 @@ public MongoBulkWriteException getError() { serverAddress, errorLabels); } + @SuppressWarnings("deprecation") private void mergeWriteConcernError(final WriteConcernError writeConcernError) { if (writeConcernError != null) { if (writeConcernErrors.isEmpty()) { diff --git a/driver-core/src/main/com/mongodb/internal/operation/FindAndModifyHelper.java b/driver-core/src/main/com/mongodb/internal/operation/FindAndModifyHelper.java index 9b23f3de8ae..c7702721e5d 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/FindAndModifyHelper.java +++ b/driver-core/src/main/com/mongodb/internal/operation/FindAndModifyHelper.java @@ -53,6 +53,7 @@ public T apply(final BsonDocument result, final AsyncConnection connection) { }; } + @SuppressWarnings("deprecation") private static T transformDocument(final BsonDocument result, final ServerAddress serverAddress) { if (hasWriteConcernError(result)) { MongoWriteConcernException writeConcernException = new MongoWriteConcernException( diff --git a/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java b/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java index 426ef930c81..8001105294e 100644 --- a/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java +++ b/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java @@ -60,6 +60,7 @@ public static boolean hasWriteConcernError(final BsonDocument result) { return result.containsKey("writeConcernError"); } + @SuppressWarnings("deprecation") public static MongoWriteConcernException createWriteConcernException(final BsonDocument result, final ServerAddress serverAddress) { MongoWriteConcernException writeConcernException = new MongoWriteConcernException( createWriteConcernError(result.getDocument("writeConcernError")), @@ -69,6 +70,7 @@ public static MongoWriteConcernException createWriteConcernException(final BsonD return writeConcernException; } + @SuppressWarnings("deprecation") public static WriteConcernError createWriteConcernError(final BsonDocument writeConcernErrorDocument) { return new WriteConcernError(writeConcernErrorDocument.getNumber("code").intValue(), writeConcernErrorDocument.getString("codeName", new BsonString("")).getValue(),