This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 16511c9c0e In 3.0.0, we provide one MongoDB module: `log4j-mongodb`,
based on the (#2493)
16511c9c0e is described below
commit 16511c9c0e98a4db6db9905e7ba913631f211e18
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Apr 21 14:29:59 2024 -0400
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`.
---
.../.log4j-plugin-processing-activator | 0
{log4j-mongodb4 => log4j-mongodb}/pom.xml | 6 ++---
.../logging/log4j/mongodb/MongoDbConnection.java | 14 ++++++------
.../log4j/mongodb/MongoDbDocumentObject.java | 6 ++---
.../log4j/mongodb/MongoDbDocumentObjectCodec.java | 14 ++++++------
.../logging/log4j/mongodb/MongoDbLevelCodec.java | 6 ++---
.../logging/log4j/mongodb/MongoDbProvider.java | 26 +++++++++++-----------
.../logging/log4j/mongodb}/package-info.java | 2 +-
.../log4j/mongodb/AbstractMongoDbCappedTest.java | 10 ++++-----
.../log4j/mongodb/MongoDbAdditionalFieldsTest.java | 12 +++++-----
.../log4j/mongodb/MongoDbAuthFailureTest.java | 12 +++++-----
.../log4j/mongodb/MongoDbCappedIntTest.java | 6 ++---
.../log4j/mongodb/MongoDbCappedLongTest.java | 6 ++---
.../log4j/mongodb/MongoDbMapMessageTest.java | 12 +++++-----
.../logging/log4j/mongodb/MongoDbResolver.java | 11 +++++----
.../logging/log4j/mongodb/MongoDbResolverTest.java | 6 ++---
.../apache/logging/log4j/mongodb/MongoDbTest.java | 12 +++++-----
.../log4j/mongodb/MongoDbTestConstants.java | 4 ++--
.../apache/logging/log4j/mongodb/UsingMongoDb.java | 6 ++---
.../resources/log4j2-mongodb-additional-fields.xml | 2 +-
.../test/resources/log4j2-mongodb-auth-failure.xml | 2 +-
.../test/resources/log4j2-mongodb-capped-int.xml | 2 +-
.../test/resources/log4j2-mongodb-capped-long.xml | 2 +-
.../test/resources/log4j2-mongodb-map-message.xml | 2 +-
.../src/test/resources/log4j2-mongodb.xml | 2 +-
pom.xml | 4 ++--
.../rename_log4j_mongodb4_to_log4j_mongodb.xml | 7 ++++++
src/site/antora/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/manual/appenders.adoc | 21 +++++++----------
.../antora/modules/ROOT/pages/manual/messages.adoc | 2 +-
.../modules/ROOT/pages/runtime-dependencies.adoc | 4 ++--
31 files changed, 114 insertions(+), 109 deletions(-)
diff --git a/log4j-mongodb4/.log4j-plugin-processing-activator
b/log4j-mongodb/.log4j-plugin-processing-activator
similarity index 100%
rename from log4j-mongodb4/.log4j-plugin-processing-activator
rename to log4j-mongodb/.log4j-plugin-processing-activator
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb/pom.xml
similarity index 96%
rename from log4j-mongodb4/pom.xml
rename to log4j-mongodb/pom.xml
index 36d7653849..3ccd7f9df7 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb/pom.xml
@@ -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>
<!--
diff --git
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Connection.java
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbConnection.java
similarity index 91%
rename from
log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Connection.java
rename to
log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbConnection.java
index 8076bb055c..cabc6c73e1 100644
---
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Connection.java
+++
b/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 com.mongodb.ConnectionString;
import com.mongodb.MongoException;
@@ -34,7 +34,7 @@ import org.bson.Document;
/**
* 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 @@ public final class MongoDb4Connection extends
AbstractNoSqlConnection<Document,
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 final class MongoDb4Connection extends
AbstractNoSqlConnection<Document,
}
@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
diff --git
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObject.java
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbDocumentObject.java
similarity index 92%
rename from
log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObject.java
rename to
log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbDocumentObject.java
index b42fff221a..f30cc72426 100644
---
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObject.java
+++
b/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 java.util.Arrays;
import org.apache.logging.log4j.core.appender.nosql.NoSqlObject;
@@ -24,14 +24,14 @@ import org.bson.Document;
* 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();
}
diff --git
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObjectCodec.java
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbDocumentObjectCodec.java
similarity index 73%
rename from
log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObjectCodec.java
rename to
log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbDocumentObjectCodec.java
index 4162589d71..c282b4c73c 100644
---
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4DocumentObjectCodec.java
+++
b/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.bson.BsonReader;
import org.bson.BsonWriter;
@@ -24,24 +24,24 @@ import org.bson.codecs.DecoderContext;
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;
diff --git
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4LevelCodec.java
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbLevelCodec.java
similarity index 89%
rename from
log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4LevelCodec.java
rename to
log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbLevelCodec.java
index 930c2f8282..299b7ab83b 100644
---
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4LevelCodec.java
+++
b/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 org.apache.logging.log4j.Level;
import org.bson.BsonReader;
@@ -26,12 +26,12 @@ import org.bson.codecs.EncoderContext;
/**
* 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) {
diff --git
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Provider.java
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java
similarity index 85%
rename from
log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Provider.java
rename to
log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java
index 3508a39497..8bc0098809 100644
---
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/MongoDb4Provider.java
+++
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.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 @@ import org.bson.codecs.configuration.CodecRegistry;
/**
* 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 final class MongoDb4Provider implements
NoSqlProvider<MongoDb4Connection>
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 final class MongoDb4Provider implements
NoSqlProvider<MongoDb4Connection>
// @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 final class MongoDb4Provider implements
NoSqlProvider<MongoDb4Connection>
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 @@ public final class MongoDb4Provider implements
NoSqlProvider<MongoDb4Connection>
}
@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,
diff --git
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/package-info.java
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/package-info.java
similarity index 96%
rename from
log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/package-info.java
rename to
log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/package-info.java
index 6297f23379..7e8d5c8053 100644
---
a/log4j-mongodb4/src/main/java/org/apache/logging/log4j/mongodb4/package-info.java
+++
b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/package-info.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;
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedTest.java
similarity index 86%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedTest.java
index 6f54e77c7e..07e3933994 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java
+++
b/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 com.mongodb.client.MongoClient;
import com.mongodb.client.MongoCollection;
@@ -25,15 +25,15 @@ import org.bson.Document;
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);
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsTest.java
similarity index 92%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsTest.java
index 27062452bf..c74172925f 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java
+++
b/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.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -29,18 +29,18 @@ import
org.apache.logging.log4j.core.test.junit.LoggerContextSource;
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();
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.java
similarity index 87%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.java
index 641305256c..3247dc28c0 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.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.apache.logging.log4j.core.test.junit.LoggerContextSource;
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);
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntTest.java
similarity index 88%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntTest.java
index e01e0c0d63..500964aff0 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java
+++
b/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-int.xml")
-public class MongoDb4CappedIntTest extends AbstractMongoDb4CappedTest {
+public class MongoDbCappedIntTest extends AbstractMongoDbCappedTest {
// test is in superclass
}
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.java
similarity index 88%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.java
index 0a99dbf5b8..34f921fe7b 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.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
}
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageTest.java
similarity index 89%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageTest.java
index d887739244..2733554dbd 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageTest.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageTest.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.bson.Document;
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);
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.java
similarity index 95%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.java
index 640b1e8489..4c641199d8 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.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.MongoClients;
@@ -38,6 +38,7 @@ import de.flapdoodle.os.OSType;
import de.flapdoodle.reverse.TransitionWalker.ReachedState;
import de.flapdoodle.reverse.transitions.Derive;
import de.flapdoodle.reverse.transitions.Start;
+import java.util.Objects;
import java.util.function.Supplier;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.logging.log4j.Level;
@@ -53,7 +54,7 @@ import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver;
-public class MongoDb4Resolver extends TypeBasedParameterResolver<MongoClient>
implements BeforeAllCallback {
+public class MongoDbResolver extends TypeBasedParameterResolver<MongoClient>
implements BeforeAllCallback {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final String LOGGING_TARGET_PROPERTY =
"log4j2.mongoDbLoggingTarget";
@@ -76,7 +77,7 @@ public class MongoDb4Resolver extends
TypeBasedParameterResolver<MongoClient> im
default:
}
}
- throw new NotImplementedException(loggingTarget.toString());
+ throw new NotImplementedException(Objects.toString(loggingTarget));
}
@Override
@@ -143,7 +144,7 @@ public class MongoDb4Resolver extends
TypeBasedParameterResolver<MongoClient> im
final RunningMongodProcess mongodProcess = state.current();
final ServerAddress addr = mongodProcess.getServerAddress();
mongoClient = MongoClients.create(String.format("mongodb://%s:%d",
addr.getHost(), addr.getPort()));
- props.setProperty(MongoDb4TestConstants.PROP_NAME_PORT,
addr.getPort());
+ props.setProperty(MongoDbTestConstants.PROP_NAME_PORT,
addr.getPort());
}
@Override
@@ -166,10 +167,12 @@ public class MongoDb4Resolver extends
TypeBasedParameterResolver<MongoClient> im
this.level = level;
}
+ @Override
public void process(String line) {
LOGGER.log(level, () -> stripLineEndings(line));
}
+ @Override
public void onProcessed() {}
protected String stripLineEndings(String line) {
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverTest.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverTest.java
similarity index 93%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverTest.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverTest.java
index 9d0bebe5e0..199cabcb2f 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverTest.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverTest.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;
@@ -28,8 +28,8 @@ import org.junit.jupiter.api.Test;
* The test framework {@code de.flapdoodle.embed.mongo} requires Java 8.
* </p>
*/
-@UsingMongoDb4
-public class MongoDb4ResolverTest {
+@UsingMongoDb
+public class MongoDbResolverTest {
@Test
public void testAccess(final MongoClient mongoClient) {
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Test.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTest.java
similarity index 91%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Test.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTest.java
index 140a959750..5c4bbb750c 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Test.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTest.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.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.bson.Document;
import org.junit.jupiter.api.Test;
-@UsingMongoDb4
+@UsingMongoDb
@LoggerContextSource("log4j2-mongodb.xml")
-public class MongoDb4Test {
+public class MongoDbTest {
@Test
public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDb4Test.class);
+ final Logger logger = ctx.getLogger(MongoDbTest.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();
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java
similarity index 92%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java
index 6f43c72527..ed5435599b 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java
@@ -14,9 +14,9 @@
* 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;
-public class MongoDb4TestConstants {
+public class MongoDbTestConstants {
public static final String PROP_NAME_PORT = "MongoDBTestPort";
static final String COLLECTION_NAME = "testCollection";
diff --git
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/UsingMongoDb4.java
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/UsingMongoDb.java
similarity index 92%
rename from
log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/UsingMongoDb4.java
rename to
log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/UsingMongoDb.java
index 3fd8c5206b..8ad70c0d20 100644
---
a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/UsingMongoDb4.java
+++
b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/UsingMongoDb.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 java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
@@ -32,5 +32,5 @@ import org.junit.jupiter.api.extension.ExtendWith;
@Inherited
@Documented
@ExtendWith(ExtensionContextAnchor.class)
-@ExtendWith(MongoDb4Resolver.class)
-public @interface UsingMongoDb4 {}
+@ExtendWith(MongoDbResolver.class)
+public @interface UsingMongoDb {}
diff --git
a/log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml
similarity index 92%
rename from
log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml
index eec98585cd..89a642f3b5 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml
@@ -18,7 +18,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
+ <MongoDb
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
<KeyValuePair key="A" value="1" />
<KeyValuePair key="B" value="2" />
<KeyValuePair key="env1" value="${env:PATH}" />
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-auth-failure.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml
similarity index 98%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-auth-failure.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml
index 0674de4fa0..e84603a0a5 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-auth-failure.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml
@@ -18,7 +18,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
+ <MongoDb
connection="mongodb://log4jUser:12345678@localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
</NoSql>
</Appenders>
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-int.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml
similarity index 98%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-int.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml
index 03aca2ebbe..746b19914e 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-int.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml
@@ -18,7 +18,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
+ <MongoDb
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
capped="true"
collectionSize="1073741824"/>
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-long.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-long.xml
similarity index 98%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-long.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb-capped-long.xml
index ddde9bcb05..941ea71c4e 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-long.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-long.xml
@@ -19,7 +19,7 @@
<Appenders>
<NoSql name="MongoDbAppender">
<!-- collectionSize="2147483657" is max int + 10 -->
- <MongoDb4
+ <MongoDb
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
capped="true"
collectionSize="2147483657"/>
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml
similarity index 91%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml
index a84154e78d..4b740bc947 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml
@@ -18,7 +18,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
+ <MongoDb
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
<MessageLayout />
</NoSql>
</Appenders>
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb.xml
similarity index 91%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb.xml
index b36a58affc..4f0865b2c4 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb.xml
@@ -18,7 +18,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
+ <MongoDb
connection="mongodb://localhost:${test:MongoDBTestPort:-27017}/testDb.testCollection"
/>
</NoSql>
</Appenders>
<Loggers>
diff --git a/pom.xml b/pom.xml
index 200aee78d8..ebf46e3953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
<module>log4j-kit</module>
<module>log4j-layout-template-json</module>
<module>log4j-layout-template-json-test</module>
- <module>log4j-mongodb4</module>
+ <module>log4j-mongodb</module>
<module>log4j-osgi-test</module>
<module>log4j-perf-test</module>
<module>log4j-plugin-processor</module>
@@ -494,7 +494,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-mongodb4</artifactId>
+ <artifactId>log4j-mongodb</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/src/changelog/.3.x.x/rename_log4j_mongodb4_to_log4j_mongodb.xml
b/src/changelog/.3.x.x/rename_log4j_mongodb4_to_log4j_mongodb.xml
new file mode 100644
index 0000000000..82bd9001af
--- /dev/null
+++ b/src/changelog/.3.x.x/rename_log4j_mongodb4_to_log4j_mongodb.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
+ type="updated">
+ <description format="asciidoc">Rename the log4j-mongodb4, module, package,
and classes in favor of log4j-mongodb, in other words, drop the `4`; tracks the
current MongoDB client driver.</description>
+</entry>
diff --git a/src/site/antora/modules/ROOT/nav.adoc
b/src/site/antora/modules/ROOT/nav.adoc
index 2911aace43..5f9fbb5cb2 100644
--- a/src/site/antora/modules/ROOT/nav.adoc
+++ b/src/site/antora/modules/ROOT/nav.adoc
@@ -64,7 +64,7 @@
* xref:log4j-jpl.adoc[]
* xref:log4j-to-slf4j.adoc[]
* xref:log4j-flume-ng.adoc[]
-* xref:log4j-mongodb4.adoc[]
+* xref:log4j-mongodb.adoc[]
* xref:log4j-iostreams.adoc[]
* xref:log4j-docker.adoc[]
* xref:log4j-spring-cloud-config-client.adoc[]
diff --git a/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
b/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
index 305be6061c..923d21bb35 100644
--- a/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/appenders.adoc
@@ -1402,18 +1402,13 @@ databases if represented in a JSON format:
----
[#NoSQLAppenderMongoDB]
-== NoSQLAppenderMongoDB
+== NoSQLAppender for MongoDB
-We provide the following MongoDB modules:
+In 3.0.0, we provide one MongoDB module: `log4j-mongodb`, based on the current
MongoDB Client Driver.
-* Added in 2.14.0: `log4j-mongodb4` defines the configuration element
-link:#NoSQLAppenderMongoDB4[`MongoDb4`] matching the MongoDB Driver
-version 4.
+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-mongodb`, `log4j-mongodb2`,
`log4j-mongodb3`.
-
-[#NoSQLAppenderMongoDB4]
-== NoSQLAppenderMongoDB4
+We no longer provide the modules `log4j-mongodb2`, `log4j-mongodb3`,
`log4j-mongodb4`.
This section details specializations of the
link:#NoSQLAppender[NoSQLAppender] provider for MongoDB using the
@@ -1440,7 +1435,7 @@ collection documentation linked above for more
information.
This appender is xref:manual/messages.adoc#MapMessage[MapMessage]-aware.
-Here are a few sample configurations for the NoSQLAppender and MongoDB4
+Here are a few sample configurations for the NoSQLAppender and MongoDB
provider:
[source,xml]
@@ -1449,7 +1444,7 @@ provider:
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
connection="mongodb://log4jUser:12345678@localhost:${sys:MongoDBTestPort:-27017}/testDb.testCollection"
/>
+ <MongoDb
connection="mongodb://log4jUser:12345678@localhost:${sys:MongoDBTestPort:-27017}/testDb.testCollection"
/>
</NoSql>
</Appenders>
<Loggers>
@@ -1466,7 +1461,7 @@ provider:
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
+ <MongoDb
connection="mongodb://localhost:${sys:MongoDBTestPort:-27017}/testDb.testCollection"
capped="true"
collectionSize="1073741824"/>
@@ -1488,7 +1483,7 @@ You can define additional fields to log using
KeyValuePair elements, for example
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb4
connection="mongodb://localhost:${sys:MongoDBTestPort:-27017}/testDb.testCollection"
/>
+ <MongoDb
connection="mongodb://localhost:${sys:MongoDBTestPort:-27017}/testDb.testCollection"
/>
<KeyValuePair key="A" value="1" />
<KeyValuePair key="B" value="2" />
<KeyValuePair key="env1" value="${env:PATH}" />
diff --git a/src/site/antora/modules/ROOT/pages/manual/messages.adoc
b/src/site/antora/modules/ROOT/pages/manual/messages.adoc
index 7769192eb8..541a117c12 100644
--- a/src/site/antora/modules/ROOT/pages/manual/messages.adoc
+++ b/src/site/antora/modules/ROOT/pages/manual/messages.adoc
@@ -225,7 +225,7 @@ with a no layout, it converts a Log4j `MapMessage` to a JMS
* When a xref:manual/appenders.adoc#JDBCAppender[JDBC Appender] is configured
with no layout, it converts a Log4j `MapMessage` to values in a
SQL INSERT statement.
-* When a xref:manual/appenders.adoc#NoSQLAppenderMongoDB4[MongoDB4 Appender] is
+* When a xref:manual/appenders.adoc#NoSQLAppenderMongoDB[MongoDB Appender] is
configured with no layout, it converts a Log4j `MapMessage` to
fields in a MongoDB object.
diff --git a/src/site/antora/modules/ROOT/pages/runtime-dependencies.adoc
b/src/site/antora/modules/ROOT/pages/runtime-dependencies.adoc
index 39edcd74eb..3882e44f03 100644
--- a/src/site/antora/modules/ROOT/pages/runtime-dependencies.adoc
+++ b/src/site/antora/modules/ROOT/pages/runtime-dependencies.adoc
@@ -226,9 +226,9 @@ The xref:log4j-flume-ng.adoc[Flume Appender] requires
https://flume.apache.org/[
xref:log4j-spring-cloud-config-client.adoc[Log4j Spring Cloud Config Client]
requires https://spring.io/projects/spring-cloud-config[Spring Cloud Config].
https://spring.io/projects/spring-cloud-bus[Spring Cloud Bus] is required if
notification of logging configuration changes is desired.
https://spring.io/projects/spring-boot[Spring Boot] is required but
applications do not have to be packaged as a Spring Boot application.
-== log4j-mongodb4
+== log4j-mongodb
-The Log4J xref:log4j-mongodb4.adoc[MongoDB 4] module depends on the
https://docs.mongodb.org/ecosystem/drivers/java/[MongoDB Java Client driver].
+The Log4J xref:log4j-mongodb.adoc[MongoDB] module depends on the
https://docs.mongodb.org/ecosystem/drivers/java/[MongoDB Java Client driver].
== log4j-iostreams
