Skip to content

Commit 2a052e1

Browse files
committed
Fix test resource files
1 parent 8eef677 commit 2a052e1

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
@Plugin(name = MongoDb4Provider.PLUGIN_NAME, category = Core.CATEGORY_NAME, printObject = true)
4141
public final class MongoDb4Provider implements NoSqlProvider<MongoDb4Connection> {
4242

43+
private static final StatusLogger LOGGER = StatusLogger.getLogger();
44+
4345
static final String PLUGIN_NAME = "MongoDb4";
4446

4547
/**
@@ -68,8 +70,7 @@ public static class Builder<B extends Builder<B>> extends AbstractFilterable.Bui
6870

6971
@Override
7072
public MongoDb4Provider build() {
71-
StatusLogger.getLogger()
72-
.warn("The {} Appender is deprecated, use the MongoDb Appender instead.", PLUGIN_NAME);
73+
LOGGER.warn("The {} Appender is deprecated, use the MongoDb Appender instead.", PLUGIN_NAME);
7374
return newMongoDb4Provider();
7475
}
7576

@@ -186,6 +187,7 @@ private MongoDb4Provider(
186187
this.isCapped = isCapped;
187188
this.collectionSize = collectionSize;
188189
this.collectionName = getEffectiveCollectionName(connectionString, collectionName);
190+
LOGGER.debug("instantiated {}", this);
189191
}
190192

191193
private static ConnectionString createConnectionString(final String connectionStringSource) {
@@ -233,13 +235,12 @@ public MongoDb4Connection getConnection() {
233235
@Override
234236
public String toString() {
235237
return String.format(
236-
"%s [connectionString=%s, collectionSize=%s, isCapped=%s, mongoClient=%s, mongoDatabase=%s, collectionName=%s]",
238+
"%s [connectionString=`%s`, collectionSize=%s, isCapped=%s, databaseName=`%s`, collectionName=`%s`]",
237239
MongoDb4Provider.class.getSimpleName(),
238240
connectionString,
239241
collectionSize,
240242
isCapped,
241-
mongoClient,
242-
mongoDatabase,
243+
mongoDatabase.getName(),
243244
collectionName);
244245
}
245246
}

log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedIT.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.mongodb.client.MongoDatabase;
2525
import org.apache.logging.log4j.Logger;
2626
import org.apache.logging.log4j.core.LoggerContext;
27+
import org.apache.logging.log4j.status.StatusLogger;
2728
import org.bson.Document;
2829

2930
abstract class AbstractMongoDb4CappedIT {
@@ -33,8 +34,9 @@ protected void test(final LoggerContext ctx, final MongoClient mongoClient) {
3334
logger.info("Hello log");
3435
final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
3536
assertNotNull(database);
36-
final MongoCollection<Document> collection =
37-
database.getCollection(getClass().getSimpleName());
37+
final String collectionName = getClass().getSimpleName();
38+
StatusLogger.getLogger().debug("Using collection name: {}", collectionName);
39+
final MongoCollection<Document> collection = database.getCollection(collectionName);
3840
assertNotNull(collection);
3941
final Document first = collection.find().first();
4042
assertNotNull(first);

log4j-mongodb4/src/test/resources/MongoDb4CollectionNameIT.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<MongoDb4
2626
connection="mongodb://localhost:${sys:log4j.mongo.port:-27017}/testDb"
2727
capped="true"
28-
collectionSize="1073741824"
29-
collectionName="MongoDbCollectionNameIT"/>
28+
collectionName="MongoDb4CollectionNameIT"/>
3029
</NoSql>
3130
</Appenders>
3231
<Loggers>

log4j-mongodb4/src/test/resources/MongoDb4DatabaseAndCollectionNameIT.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
<MongoDb4
2626
connection="mongodb://localhost:${sys:log4j.mongo.port:-27017}"
2727
capped="true"
28-
collectionSize="1073741824"
2928
databaseName="testDb"
30-
collectionName="MongoDbDatabaseAndCollectionNameIT"
29+
collectionName="MongoDb4DatabaseAndCollectionNameIT"
3130
/>
3231
</NoSql>
3332
</Appenders>

0 commit comments

Comments
 (0)