In 3.0.0, we provide one MongoDB module: log4j-mongodb, based on the (#2493)

current MongoDB Client Driver.

We renamed the `log4j-mongodb4`, module, package, and classes in favor
of `log4j-mongodb`, in other words, drop the `4`.

We no longer provide the modules `log4j-mongodb2`, `log4j-mongodb3`,
`log4j-mongodb4`.

Author: garydgregory

log4j-mongodb4/.log4j-plugin-processing-activator log4j-mongodb/.log4j-plugin-processing-activator

@@ -26,9 +26,9 @@
     <relativePath>../log4j-parent</relativePath>
   </parent>
 
-  <artifactId>log4j-mongodb4</artifactId>
-  <name>Apache Log4j MongoDB 4</name>
-  <description>MongoDB appender for Log4j using the MongoDB 4 driver API.</description>
+  <artifactId>log4j-mongodb</artifactId>
+  <name>Apache Log4j MongoDB Appender</name>
+  <description>MongoDB appender for Log4j using the MongoDB 5 driver API.</description>
 
   <properties>
     <!--

log4j-mongodb4/pom.xml log4j-mongodb/pom.xml

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoException;
@@ -34,7 +34,7 @@
 /**
  * The MongoDB implementation of {@link NoSqlConnection}.
  */
-public final class MongoDb4Connection extends AbstractNoSqlConnection<Document, MongoDb4DocumentObject> {
+public final class MongoDbConnection extends AbstractNoSqlConnection<Document, MongoDbDocumentObject> {
 
     private static final Logger LOGGER = StatusLogger.getLogger();
 
@@ -63,7 +63,7 @@ private static MongoCollection<Document> getOrCreateMongoCollection(
     private final MongoCollection<Document> collection;
     private final MongoClient mongoClient;
 
-    public MongoDb4Connection(
+    public MongoDbConnection(
             final ConnectionString connectionString,
             final MongoClient mongoClient,
             final MongoDatabase mongoDatabase,
@@ -82,13 +82,13 @@ public void closeImpl() {
     }
 
     @Override
-    public MongoDb4DocumentObject[] createList(final int length) {
-        return new MongoDb4DocumentObject[length];
+    public MongoDbDocumentObject[] createList(final int length) {
+        return new MongoDbDocumentObject[length];
     }
 
     @Override
-    public MongoDb4DocumentObject createObject() {
-        return new MongoDb4DocumentObject();
+    public MongoDbDocumentObject createObject() {
+        return new MongoDbDocumentObject();
     }
 
     @Override

log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Connection.java log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbConnection.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import java.util.Arrays;
 import org.apache.logging.log4j.core.appender.nosql.NoSqlObject;
@@ -24,14 +24,14 @@
  * The MongoDB implementation of {@link NoSqlObject} typed to a BSON
  * {@link Document}.
  */
-public final class MongoDb4DocumentObject implements NoSqlObject<Document> {
+public final class MongoDbDocumentObject implements NoSqlObject<Document> {
 
     private final Document document;
 
     /**
      * Constructs a new instance.
      */
-    public MongoDb4DocumentObject() {
+    public MongoDbDocumentObject() {
         this.document = new Document();
     }
 

log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObject.java log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbDocumentObject.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
@@ -24,24 +24,24 @@
 import org.bson.codecs.DocumentCodec;
 import org.bson.codecs.EncoderContext;
 
-final class MongoDb4DocumentObjectCodec implements Codec<MongoDb4DocumentObject> {
+final class MongoDbDocumentObjectCodec implements Codec<MongoDbDocumentObject> {
 
     private final Codec<Document> documentCodec = new DocumentCodec();
 
     @Override
     public void encode(
-            final BsonWriter writer, final MongoDb4DocumentObject value, final EncoderContext encoderContext) {
+            final BsonWriter writer, final MongoDbDocumentObject value, final EncoderContext encoderContext) {
         documentCodec.encode(writer, value.unwrap(), encoderContext);
     }
 
     @Override
-    public Class<MongoDb4DocumentObject> getEncoderClass() {
-        return MongoDb4DocumentObject.class;
+    public Class<MongoDbDocumentObject> getEncoderClass() {
+        return MongoDbDocumentObject.class;
     }
 
     @Override
-    public MongoDb4DocumentObject decode(final BsonReader reader, final DecoderContext decoderContext) {
-        final MongoDb4DocumentObject object = new MongoDb4DocumentObject();
+    public MongoDbDocumentObject decode(final BsonReader reader, final DecoderContext decoderContext) {
+        final MongoDbDocumentObject object = new MongoDbDocumentObject();
         documentCodec.decode(reader, decoderContext).entrySet().stream()
                 .forEach(entry -> object.set(entry.getKey(), entry.getValue()));
         return object;

log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObjectCodec.java log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbDocumentObjectCodec.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import org.apache.logging.log4j.Level;
 import org.bson.BsonReader;
@@ -26,12 +26,12 @@
 /**
  * A BSON {@link Codec} for Log4j {@link Level}s.
  */
-public class MongoDb4LevelCodec implements Codec<Level> {
+public class MongoDbLevelCodec implements Codec<Level> {
 
     /**
      * The singleton instance.
      */
-    public static final MongoDb4LevelCodec INSTANCE = new MongoDb4LevelCodec();
+    public static final MongoDbLevelCodec INSTANCE = new MongoDbLevelCodec();
 
     @Override
     public Level decode(final BsonReader reader, final DecoderContext decoderContext) {

log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4LevelCodec.java log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbLevelCodec.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
@@ -35,14 +35,14 @@
 
 /**
  * The MongoDB implementation of {@link NoSqlProvider} using the MongoDB driver
- * version 4 API.
+ * version 5 API.
  */
 @Configurable(printObject = true)
-@Plugin("MongoDb4")
-public final class MongoDb4Provider implements NoSqlProvider<MongoDb4Connection> {
+@Plugin("MongoDb")
+public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> {
 
     public static class Builder<B extends Builder<B>> extends AbstractFilterable.Builder<B>
-            implements org.apache.logging.log4j.core.util.Builder<MongoDb4Provider> {
+            implements org.apache.logging.log4j.plugins.util.Builder<MongoDbProvider> {
 
         @PluginAttribute(value = "connection")
         @Required(message = "No connection string provided")
@@ -55,8 +55,8 @@ public static class Builder<B extends Builder<B>> extends AbstractFilterable.Bui
         private boolean capped = false;
 
         @Override
-        public MongoDb4Provider build() {
-            return new MongoDb4Provider(connectionStringSource, capped, collectionSize);
+        public MongoDbProvider build() {
+            return new MongoDbProvider(connectionStringSource, capped, collectionSize);
         }
 
         public B setConnectionStringSource(final String connectionStringSource) {
@@ -80,8 +80,8 @@ public B setCollectionSize(final long collectionSize) {
     // @formatter:off
     private static final CodecRegistry CODEC_REGISTRIES = CodecRegistries.fromRegistries(
             MongoClientSettings.getDefaultCodecRegistry(),
-            CodecRegistries.fromCodecs(MongoDb4LevelCodec.INSTANCE),
-            CodecRegistries.fromCodecs(new MongoDb4DocumentObjectCodec()));
+            CodecRegistries.fromCodecs(MongoDbLevelCodec.INSTANCE),
+            CodecRegistries.fromCodecs(new MongoDbDocumentObjectCodec()));
     // @formatter:on
 
     // TODO Where does this number come from?
@@ -98,7 +98,7 @@ public static <B extends Builder<B>> B newBuilder() {
     private final MongoDatabase mongoDatabase;
     private final ConnectionString connectionString;
 
-    private MongoDb4Provider(final String connectionStringSource, final boolean isCapped, final Long collectionSize) {
+    private MongoDbProvider(final String connectionStringSource, final boolean isCapped, final Long collectionSize) {
         LOGGER.debug("Creating ConnectionString {}...", connectionStringSource);
         this.connectionString = new ConnectionString(connectionStringSource);
         LOGGER.debug("Created ConnectionString {}", connectionString);
@@ -122,15 +122,15 @@ private MongoDb4Provider(final String connectionStringSource, final boolean isCa
     }
 
     @Override
-    public MongoDb4Connection getConnection() {
-        return new MongoDb4Connection(connectionString, mongoClient, mongoDatabase, isCapped, collectionSize);
+    public MongoDbConnection getConnection() {
+        return new MongoDbConnection(connectionString, mongoClient, mongoDatabase, isCapped, collectionSize);
     }
 
     @Override
     public String toString() {
         return String.format(
                 "%s [connectionString=%s, collectionSize=%s, isCapped=%s, mongoClient=%s, mongoDatabase=%s]",
-                MongoDb4Provider.class.getSimpleName(),
+                MongoDbProvider.class.getSimpleName(),
                 connectionString,
                 collectionSize,
                 isCapped,

log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Provider.java log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java

@@ -21,7 +21,7 @@
 @Export
 @Open("org.apache.logging.log4j.core")
 @Version("2.21.0")
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import aQute.bnd.annotation.jpms.Open;
 import org.osgi.annotation.bundle.Export;

log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/package-info.java log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/package-info.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
@@ -25,15 +25,15 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public abstract class AbstractMongoDb4CappedTest {
+public abstract class AbstractMongoDbCappedTest {
 
     @Test
     public void test(final LoggerContext ctx, final MongoClient mongoClient) {
-        final Logger logger = ctx.getLogger(AbstractMongoDb4CappedTest.class);
+        final Logger logger = ctx.getLogger(AbstractMongoDbCappedTest.class);
         logger.info("Hello log");
-        final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
+        final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
         Assertions.assertNotNull(database);
-        final MongoCollection<Document> collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+        final MongoCollection<Document> collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
         Assertions.assertNotNull(collection);
         final Document first = collection.find().first();
         Assertions.assertNotNull(first);

log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -29,18 +29,18 @@
 import org.bson.Document;
 import org.junit.jupiter.api.Test;
 
-@UsingMongoDb4
+@UsingMongoDb
 @LoggerContextSource("log4j2-mongodb-additional-fields.xml")
-public class MongoDb4AdditionalFieldsTest {
+public class MongoDbAdditionalFieldsTest {
 
     @Test
     public void test(final LoggerContext ctx, final MongoClient mongoClient) {
-        final Logger logger = ctx.getLogger(MongoDb4AdditionalFieldsTest.class);
+        final Logger logger = ctx.getLogger(MongoDbAdditionalFieldsTest.class);
         logger.info("Hello log 1");
         logger.info("Hello log 2", new RuntimeException("Hello ex 2"));
-        final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
+        final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
         assertNotNull(database);
-        final MongoCollection<Document> collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+        final MongoCollection<Document> collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
         assertNotNull(collection);
         final FindIterable<Document> found = collection.find();
         final Document first = found.first();

log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -28,17 +28,17 @@
 import org.bson.Document;
 import org.junit.jupiter.api.Test;
 
-@UsingMongoDb4
+@UsingMongoDb
 @LoggerContextSource("log4j2-mongodb-auth-failure.xml")
-public class MongoDb4AuthFailureTest {
+public class MongoDbAuthFailureTest {
 
     @Test
     public void test(final LoggerContext ctx, final MongoClient mongoClient) {
-        final Logger logger = ctx.getLogger(MongoDb4AuthFailureTest.class);
+        final Logger logger = ctx.getLogger(MongoDbAuthFailureTest.class);
         logger.info("Hello log");
-        final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
+        final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
         assertNotNull(database);
-        final MongoCollection<Document> collection = database.getCollection(MongoDb4TestConstants.DATABASE_NAME);
+        final MongoCollection<Document> collection = database.getCollection(MongoDbTestConstants.DATABASE_NAME);
         assertNotNull(collection);
         final Document first = collection.find().first();
         assertNull(first);

log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 
-@UsingMongoDb4
+@UsingMongoDb
 @LoggerContextSource("log4j2-mongodb-capped-int.xml")
-public class MongoDb4CappedIntTest extends AbstractMongoDb4CappedTest {
+public class MongoDbCappedIntTest extends AbstractMongoDbCappedTest {
 
     // test is in superclass
 }

log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntTest.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 
-@UsingMongoDb4
+@UsingMongoDb
 @LoggerContextSource("log4j2-mongodb-capped-long.xml")
-public class MongoDb4CappedLongTest extends AbstractMongoDb4CappedTest {
+public class MongoDbCappedLongTest extends AbstractMongoDbCappedTest {
 
     // test is in superclass
 }

log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.mongodb4;
+package org.apache.logging.log4j.mongodb;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
@@ -27,20 +27,20 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-@UsingMongoDb4
+@UsingMongoDb
 @LoggerContextSource("log4j2-mongodb-map-message.xml")
-public class MongoDb4MapMessageTest {
+public class MongoDbMapMessageTest {
 
     @Test
     public void test(final LoggerContext ctx, final MongoClient mongoClient) {
-        final Logger logger = ctx.getLogger(MongoDb4MapMessageTest.class);
+        final Logger logger = ctx.getLogger(MongoDbMapMessageTest.class);
         final MapMessage<?, Object> mapMessage = new MapMessage<>();
         mapMessage.with("SomeName", "SomeValue");
         mapMessage.with("SomeInt", 1);
         logger.info(mapMessage);
-        final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
+        final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
         Assertions.assertNotNull(database);
-        final MongoCollection<Document> collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+        final MongoCollection<Document> collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
         Assertions.assertNotNull(collection);
         final Document first = collection.find().first();
         Assertions.assertNotNull(first);