Allow configuration of ExceptionTranslator in MongoDatabaseFactorySupport.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java

@@ -119,10 +119,12 @@ public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exce
 		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
 	}
 
+	@Override
 	public Class<? extends MongoClient> getObjectType() {
 		return MongoClient.class;
 	}
 
+	@Override
 	@Nullable
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return exceptionTranslator.translateExceptionIfPossible(ex);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java

@@ -32,8 +32,7 @@
 
 /**
  * Common base class for usage with both {@link com.mongodb.client.MongoClients} defining common properties such as
- * database name and exception translator.
- * <br />
+ * database name and exception translator. <br />
  * Not intended to be used directly.
  *
  * @author Christoph Strobl
@@ -47,8 +46,8 @@ public abstract class MongoDatabaseFactorySupport<C> implements MongoDatabaseFac
 	private final C mongoClient;
 	private final String databaseName;
 	private final boolean mongoInstanceCreated;
-	private final PersistenceExceptionTranslator exceptionTranslator;
 
+	private PersistenceExceptionTranslator exceptionTranslator;
 	private @Nullable WriteConcern writeConcern;
 
 	/**
@@ -78,12 +77,28 @@ protected MongoDatabaseFactorySupport(C mongoClient, String databaseName, boolea
 	/**
 	 * Configures the {@link WriteConcern} to be used on the {@link MongoDatabase} instance being created.
 	 *
-	 * @param writeConcern the writeConcern to set
+	 * @param writeConcern the writeConcern to set.
 	 */
 	public void setWriteConcern(WriteConcern writeConcern) {
 		this.writeConcern = writeConcern;
 	}
 
+	/**
+	 * Configures the {@link PersistenceExceptionTranslator} to be used.
+	 *
+	 * @param exceptionTranslator the exception translator to set.
+	 * @since 4.4
+	 */
+	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator;
+	}
+
+	@Override
+	public PersistenceExceptionTranslator getExceptionTranslator() {
+		return this.exceptionTranslator;
+	}
+
+	@Override
 	public MongoDatabase getMongoDatabase() throws DataAccessException {
 		return getMongoDatabase(getDefaultDatabaseName());
 	}
@@ -116,10 +131,7 @@ public void destroy() throws Exception {
 		}
 	}
 
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
-	}
-
+	@Override
 	public MongoDatabaseFactory withSession(ClientSession session) {
 		return new MongoDatabaseFactorySupport.ClientSessionBoundMongoDbFactory(session, this);
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java

@@ -183,12 +183,10 @@ DataAccessException doTranslateException(RuntimeException ex) {
 	 */
 	public boolean isTransientFailure(Exception e) {
 
-		if (!(e instanceof MongoException)) {
+		if (!(e instanceof MongoException mongoException)) {
 			return false;
 		}
 
-		MongoException mongoException = (MongoException) e;
-
 		return mongoException.hasErrorLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL)
 				|| mongoException.hasErrorLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL);
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java

@@ -20,18 +20,16 @@
 import org.bson.BsonDocument;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.mockito.Mockito;
+
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.data.mongodb.ClientSessionException;
 import org.springframework.data.mongodb.MongoTransactionException;
-import org.springframework.data.mongodb.TransientMongoDbException;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.lang.Nullable;
 
@@ -41,9 +39,7 @@
 import com.mongodb.MongoSocketException;
 import com.mongodb.MongoSocketReadTimeoutException;
 import com.mongodb.MongoSocketWriteException;
-import com.mongodb.MongoWriteException;
 import com.mongodb.ServerAddress;
-import com.mongodb.WriteError;
 
 /**
  * Unit tests for {@link MongoExceptionTranslator}.
@@ -180,30 +176,19 @@ public void translateTransientTransactionExceptions() {
 		MongoException source = new MongoException(267, "PreparedTransactionInProgress");
 		source.addLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL);
 
-		expectExceptionWithCauseMessage(translator.translateExceptionIfPossible(source), TransientMongoDbException.class,
+		expectExceptionWithCauseMessage(translator.translateExceptionIfPossible(source),
+				UncategorizedMongoDbException.class,
 				"PreparedTransactionInProgress");
 	}
 
 	@Test // DATAMONGO-2073
-	public void translateMongoExceptionWithTransientLabelToTransientMongoDbException() {
+	public void translateMongoExceptionWithTransientLabel() {
 
 		MongoException exception = new MongoException(0, "");
 		exception.addLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL);
 		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
 
-		expectExceptionWithCauseMessage(translatedException, TransientMongoDbException.class);
-	}
-
-	@Test // DATAMONGO-2073
-	public void wrapsTranslatedExceptionsWhenTransientLabelPresent() {
-
-		MongoException exception = new MongoWriteException(new WriteError(112, "WriteConflict", new BsonDocument()), null);
-		exception.addLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL);
-
-		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
-
-		assertThat(translatedException).isInstanceOf(TransientMongoDbException.class);
-		assertThat(translatedException.getCause()).isInstanceOf(DataIntegrityViolationException.class);
+		expectExceptionWithCauseMessage(translatedException, UncategorizedMongoDbException.class);
 	}
 
 	private void checkTranslatedMongoException(Class<? extends Exception> clazz, int code) {