Skip to content

JAVA-4421: Remove errorLabels from WriteConcernError #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 12, 2022
Merged

JAVA-4421: Remove errorLabels from WriteConcernError #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adbcbb5
JAVA-4421: Add deprecated annotation instead of deleting fields and m…
ramasai1 Dec 14, 2021
e3121d3
JAVA-4421: Address Jeff's comments and merge in master
ramasai1 Jan 5, 2022
f5a232b
JAVA-4421: Change version number from 3.5 to 4.5 in the javadoc comment
ramasai1 Jan 5, 2022
eff5100
Just focus on the deprecation of errorLabels in WriteConcernError
jyemin Jan 12, 2022
588b258
More suppression
jyemin Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions driver-core/src/main/com/mongodb/MongoBulkWriteException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public MongoBulkWriteException(final BulkWriteResult writeResult, final List<Bul
* @param errorLabels any server errorLabels
* @since 4.1
*/
@SuppressWarnings("deprecation")
public MongoBulkWriteException(final BulkWriteResult writeResult, final List<BulkWriteError> writeErrors,
@Nullable final WriteConcernError writeConcernError, final ServerAddress serverAddress,
final Set<String> errorLabels) {
Expand Down
2 changes: 2 additions & 0 deletions driver-core/src/main/com/mongodb/MongoWriteConcernException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions driver-core/src/main/com/mongodb/bulk/WriteConcernError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> errorLabels) {
this.code = code;
Expand Down Expand Up @@ -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);
Expand All @@ -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<String> getErrorLabels() {
return Collections.unmodifiableSet(errorLabels);
}
Expand Down
1 change: 1 addition & 0 deletions driver-core/src/main/com/mongodb/internal/connection/BulkWriteBatchCombiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ public MongoBulkWriteException getError() {
serverAddress, errorLabels);
}

@SuppressWarnings("deprecation")
private void mergeWriteConcernError(final WriteConcernError writeConcernError) {
if (writeConcernError != null) {
if (writeConcernErrors.isEmpty()) {
Expand Down
1 change: 1 addition & 0 deletions driver-core/src/main/com/mongodb/internal/operation/FindAndModifyHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public T apply(final BsonDocument result, final AsyncConnection connection) {
};
}

@SuppressWarnings("deprecation")
private static <T> T transformDocument(final BsonDocument result, final ServerAddress serverAddress) {
if (hasWriteConcernError(result)) {
MongoWriteConcernException writeConcernException = new MongoWriteConcernException(
Expand Down
2 changes: 2 additions & 0 deletions driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand All @@ -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(),
Expand Down