diff --git a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/TestAzureDS.java b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/TestAzureDS.java index c40eaa76e5a..8e1454e9d6e 100644 --- a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/TestAzureDS.java +++ b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/TestAzureDS.java @@ -63,7 +63,7 @@ public void setUp() throws Exception { @After public void tearDown() { try { - LogCustomizer customizer = LogCustomizer.forLogger(AzureBlobContainerProvider.class.getName()) + LogCustomizer customizer = LogCustomizer.forLogger(AzureBlobContainerProvider.class) .filter(Level.INFO) .create(); customizer.starting(); diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java index 5cb627eb0c6..8f965aa9595 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java @@ -50,7 +50,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.atomic.AtomicReference; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -86,6 +85,7 @@ import org.mockito.internal.util.collections.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; /** * Generic class for BlobGC tests which uses custom MemoryNodeStore as well as a memory NodeStore. @@ -534,7 +534,7 @@ public void gcCheckDeletedSize() throws Exception { // Capture logs for the second round of gc LogCustomizer customLogs = LogCustomizer - .forLogger(MarkSweepGarbageCollector.class.getName()) + .forLogger(MarkSweepGarbageCollector.class) .enable(Level.INFO) .filter(Level.INFO) .contains("Estimated size recovered for") diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java index 9e89fc32f16..bb3d56cfb62 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java @@ -40,8 +40,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import ch.qos.logback.classic.Level; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.FileIOUtils; @@ -60,6 +58,7 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; @@ -691,7 +690,7 @@ public void testUpgradeCompromisedSerializedMap() throws IOException { File pendingUploadsFile = new File(home, DataStoreCacheUpgradeUtils.UPLOAD_MAP); createGibberishLoad(pendingUploadsFile); - LogCustomizer lc = LogCustomizer.forLogger(DataStoreCacheUpgradeUtils.class.getName()) + LogCustomizer lc = LogCustomizer.forLogger(DataStoreCacheUpgradeUtils.class) .filter(Level.WARN) .enable(Level.WARN) .create(); diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java index a935751a650..373a7a95124 100644 --- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java +++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java @@ -91,21 +91,11 @@ private LogCustomizerBuilder(String name) { this.name = name; } - public LogCustomizerBuilder enable(Level level) { - this.enableLevel = level; - return this; - } - public LogCustomizerBuilder enable(org.slf4j.event.Level level) { this.enableLevel = fromSlf4jLevel(level); return this; } - public LogCustomizerBuilder filter(Level level) { - this.filterLevel = level; - return this; - } - public LogCustomizerBuilder filter(org.slf4j.event.Level level) { this.filterLevel = fromSlf4jLevel(level); return this; diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java index 0aebe4532e8..4602885ecf3 100644 --- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java +++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java @@ -29,8 +29,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; /** * Tests for the LogCustomizer class @@ -81,7 +80,7 @@ public void testLogs2() { @Test public void testExactMatch() { LogCustomizer custom = LogCustomizer - .forLogger("org.apache.jackrabbit.oak.commons.junit.LogCustomizerTest") + .forLogger(org.apache.jackrabbit.oak.commons.junit.LogCustomizerTest.class) .exactlyMatches("Test Message") .create(); diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/properties/SystemPropertySupplierTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/properties/SystemPropertySupplierTest.java index 69ed32d9d49..df6515ff713 100755 --- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/properties/SystemPropertySupplierTest.java +++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/properties/SystemPropertySupplierTest.java @@ -65,7 +65,7 @@ public void testString() { @Test public void testFilter() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(SystemPropertySupplierTest.class.getName()).enable(Level.ERROR) + LogCustomizer logCustomizer = LogCustomizer.forLogger(SystemPropertySupplierTest.class).enable(Level.ERROR) .contains("Ignoring invalid value").create(); logCustomizer.starting(); @@ -82,7 +82,7 @@ public void testFilter() { @Test public void testHidden() { String secret = "secret123"; - LogCustomizer logCustomizer = LogCustomizer.forLogger(SystemPropertySupplierTest.class.getName()).enable(Level.TRACE) + LogCustomizer logCustomizer = LogCustomizer.forLogger(SystemPropertySupplierTest.class).enable(Level.TRACE) .contains(secret).create(); logCustomizer.starting(); @@ -99,7 +99,7 @@ public void testHidden() { @Test public void testNonParseable() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(SystemPropertySupplierTest.class.getName()).enable(Level.ERROR) + LogCustomizer logCustomizer = LogCustomizer.forLogger(SystemPropertySupplierTest.class).enable(Level.ERROR) .contains("Ignoring malformed value").create(); logCustomizer.starting(); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java index 825680c09df..60686c6ad74 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java @@ -97,8 +97,8 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; +import org.slf4j.event.Level; -import ch.qos.logback.classic.Level; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; public class AsyncIndexUpdateTest { @@ -1403,7 +1403,7 @@ public void checkpointStability() throws Exception{ async.run(); //Now checkpoints = [checkpoints1]. Note that size is 1 so new checkpoint name remains same - LogCustomizer customLogs = LogCustomizer.forLogger(AsyncIndexUpdate.class.getName()) + LogCustomizer customLogs = LogCustomizer.forLogger(AsyncIndexUpdate.class) .filter(Level.WARN) .create(); @@ -1670,7 +1670,7 @@ private void assertLogPhrase(List logs, String logPhrase){ } private static LogCustomizer createLogCustomizer(Level level){ - LogCustomizer lc = LogCustomizer.forLogger(AsyncIndexUpdate.class.getName()) + LogCustomizer lc = LogCustomizer.forLogger(AsyncIndexUpdate.class) .filter(level) .enable(level) .create(); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java index 03484055f48..af6bff91ce5 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java @@ -49,7 +49,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -85,6 +84,7 @@ import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; +import org.slf4j.event.Level; public class IndexUpdateTest { @@ -997,7 +997,7 @@ public void reindexForDisabledIndexes() throws Exception{ builder.getChildNode("oak:index").getChildNode("fooIndex").setProperty(REINDEX_PROPERTY_NAME, true); after = builder.getNodeState(); - LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class.getName()).filter(Level.INFO).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class).filter(Level.INFO).create(); customLogs.starting(); before = after; @@ -1017,7 +1017,7 @@ public void reindexForDisabledIndexes() throws Exception{ */ @Test public void testConfigErrorInIndexDefintion() throws Exception{ - LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class.getName()).enable(Level.ERROR).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class).enable(Level.ERROR).create(); builder.child("testRoot").setProperty("foo", "abc"); //Create 2 index def - one with config related error and one without diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java index 260967d5c01..de723bf5476 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java @@ -100,7 +100,7 @@ public class IndexImporterTest { @Before public void setup(){ - customizer = LogCustomizer.forLogger(IndexImporter.class.getName()).filter(Level.INFO).create(); + customizer = LogCustomizer.forLogger(IndexImporter.class).filter(Level.INFO).create(); customizer.starting(); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java index e594b0d9cef..44b955f1750 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java @@ -41,14 +41,13 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class OrderedPropertyIndexEditorProviderTest { private final CommitHook hook = new EditorHook(new IndexUpdateProvider( new OrderedPropertyIndexEditorProvider())); private final LogCustomizer custom = LogCustomizer - .forLogger(OrderedPropertyIndexEditorProvider.class.getName()).enable(Level.WARN).create(); + .forLogger(OrderedPropertyIndexEditorProvider.class).enable(Level.WARN).create(); private final String indexName = "mickey"; private final String indexedProperty = "mouse"; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java index bd63ed59cbe..1453dea7502 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java @@ -32,12 +32,11 @@ import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class OrderedPropertyIndexProviderTest extends AbstractQueryTest { private final LogCustomizer custom = LogCustomizer - .forLogger(OrderedPropertyIndexProvider.class.getName()).enable(Level.WARN).create(); + .forLogger(OrderedPropertyIndexProvider.class).enable(Level.WARN).create(); @Override protected void createTestIndexNode() throws Exception { diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java index 72960288730..267e409aa75 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java @@ -79,13 +79,12 @@ import org.junit.Test; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.spi.FilterReply; - +import org.slf4j.event.Level; /** * Test the Property2 index mechanism. @@ -849,7 +848,7 @@ public void testPathIncludeExclude() throws Exception { @Test public void testPathExcludeInclude() throws Exception{ - LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class.getName()).enable(Level.ERROR).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class).enable(Level.ERROR).create(); NodeState root = INITIAL_CONTENT; // Add index definition @@ -1143,7 +1142,7 @@ private static class TraversingWarningFilter extends ch.qos.logback.core.filter. @Override public FilterReply decide(ILoggingEvent event) { - if (event.getLevel().isGreaterOrEqual(Level.WARN) + if (event.getLevel().toInt() >= Level.WARN.toInt() && event.getMessage().contains("Traversed")) { return FilterReply.ACCEPT; } else { diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryLimitTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryLimitTest.java index 38361b5b409..fb3a027419d 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryLimitTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryLimitTest.java @@ -97,7 +97,7 @@ public void queryLengthErrorLimitBreachThrowsException() throws Exception { public void queryLengthWarnLimitBreachLogsWarning() throws Exception { String generatedString = RandomStringUtils.random(queryLengthWarnLimit, true, false); - LogCustomizer customLogs = LogCustomizer.forLogger(QueryEngineImpl.class.getName()).enable(Level.WARN).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(QueryEngineImpl.class).enable(Level.WARN).create(); try { customLogs.starting(); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryValidatorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryValidatorTest.java index 4e957cd98ec..05d99d028eb 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryValidatorTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryValidatorTest.java @@ -63,7 +63,7 @@ public void warning() throws ParseException { ",\"executedLast\":\"\"\n" + ",\"executedCount\":0\n" + "}]", v.getJson()); - LogCustomizer customLogs = LogCustomizer.forLogger(QueryValidator.class.getName()).enable(Level.WARN).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(QueryValidator.class).enable(Level.WARN).create(); try { customLogs.starting(); v.checkStatement("x1"); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/stats/QuerySimilarCostTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/stats/QuerySimilarCostTest.java index 8a479a197a4..3e999696d4e 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/stats/QuerySimilarCostTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/stats/QuerySimilarCostTest.java @@ -71,7 +71,7 @@ protected ContentRepository createRepository() { */ @Test public void testSimilarCostIndices() throws Exception { - LogCustomizer customLogs = LogCustomizer.forLogger(QueryImpl.class.getName()).enable(Level.DEBUG).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(QueryImpl.class).enable(Level.DEBUG).create(); try { customLogs.starting(); diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java index aa768aca476..64105eec2ad 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java @@ -30,7 +30,6 @@ import java.util.Set; import java.util.concurrent.ScheduledFuture; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -60,6 +59,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import static java.lang.String.valueOf; import static java.util.concurrent.Executors.newSingleThreadExecutor; @@ -484,7 +484,7 @@ private void clusterGCInternal(Cluster cluster1, Cluster cluster2, boolean same) // Capture logs for the second round of gc LogCustomizer customLogs = LogCustomizer - .forLogger(MarkSweepGarbageCollector.class.getName()) + .forLogger(MarkSweepGarbageCollector.class) .enable(Level.WARN) .filter(Level.WARN) .contains("Error occurred while deleting blob with id") diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java index 30d70c9e466..654b7650369 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java @@ -92,7 +92,7 @@ public void testInvalidNamespace() throws Exception { final Root root = session.getLatestRoot(); NamespaceRegistry r = getNamespaceRegistry(session, root); - LogCustomizer customLogs = LogCustomizer.forLogger("org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry").enable(Level.ERROR).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry.class).enable(Level.ERROR).create(); try { customLogs.starting(); r.registerNamespace("foo", "example.com"); diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java index f09e2eb21ba..825a7333556 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.api.JackrabbitRepository; import org.apache.jackrabbit.api.JackrabbitSession; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; @@ -35,6 +34,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.Repository; diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java index b5fe06ba21c..717cfed5cce 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java @@ -36,9 +36,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import ch.qos.logback.classic.Level; - +import org.slf4j.event.Level; @RunWith(Parameterized.class) public class ConflictResolutionTest extends AbstractRepositoryTest { diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java index 4e5a3866197..dd57ef0922a 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java @@ -220,7 +220,7 @@ public void trivialUpdates() throws Exception { ntt.add(nt); } - logCustomizer = LogCustomizer.forLogger(TypeEditorProvider.class.getName()).enable(Level.INFO) + logCustomizer = LogCustomizer.forLogger(TypeEditorProvider.class).enable(Level.INFO) .contains("appear to be trivial, repository will not be scanned").create(); try { logCustomizer.starting(); @@ -254,7 +254,7 @@ public void trivialUpdates() throws Exception { } // but update both node types - logCustomizer = LogCustomizer.forLogger(TypeEditorProvider.class.getName()).enable(Level.INFO) + logCustomizer = LogCustomizer.forLogger(TypeEditorProvider.class).enable(Level.INFO) .contains("appear not to be trivial, starting repository scan").create(); try { logCustomizer.starting(); diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java index 404eca87087..89d6a66a31d 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.jcr.observation; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.api.JackrabbitRepository; import org.apache.jackrabbit.api.observation.JackrabbitEvent; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -35,6 +34,7 @@ import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -111,7 +111,7 @@ public void tearDown() { @Test public void warnOnQueueFull() throws RepositoryException, InterruptedException, ExecutionException { - LogCustomizer customLogs = LogCustomizer.forLogger(ChangeProcessor.class.getName()) + LogCustomizer customLogs = LogCustomizer.forLogger(ChangeProcessor.class) .filter(Level.WARN) .contains(OBS_QUEUE_FULL_WARN) .create(); @@ -129,15 +129,15 @@ public void warnOnQueueFull() throws RepositoryException, InterruptedException, @Test public void warnOnRepeatedQueueFull() throws RepositoryException, InterruptedException, ExecutionException { - LogCustomizer warnLogs = LogCustomizer.forLogger(ChangeProcessor.class.getName()) + LogCustomizer warnLogs = LogCustomizer.forLogger(ChangeProcessor.class) .filter(Level.WARN) .contains(OBS_QUEUE_FULL_WARN) .create(); - LogCustomizer debugLogs = LogCustomizer.forLogger(ChangeProcessor.class.getName()) + LogCustomizer debugLogs = LogCustomizer.forLogger(ChangeProcessor.class) .filter(Level.DEBUG) .contains(OBS_QUEUE_FULL_WARN) .create(); - LogCustomizer logLevelSetting = LogCustomizer.forLogger(ChangeProcessor.class.getName()) + LogCustomizer logLevelSetting = LogCustomizer.forLogger(ChangeProcessor.class) .enable(Level.DEBUG) .create(); logLevelSetting.starting(); diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/WarnLogStringPropertySizeTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/WarnLogStringPropertySizeTest.java index 7521987153c..1477e172b69 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/WarnLogStringPropertySizeTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/WarnLogStringPropertySizeTest.java @@ -16,9 +16,7 @@ */ package org.apache.jackrabbit.oak.jcr.session; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.read.ListAppender; +import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.commons.junit.TemporarySystemProperty; import org.apache.jackrabbit.oak.fixture.NodeStoreFixture; import org.apache.jackrabbit.oak.jcr.AbstractRepositoryTest; @@ -28,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.Session; @@ -37,7 +35,7 @@ import static org.junit.Assert.assertTrue; /** - * {@code WarnLogStringPropertySizeTest} checks if Warn log is bein added on adding + * {@code WarnLogStringPropertySizeTest} checks if WARN log is being added on adding * large string properties */ @RunWith(Parameterized.class) @@ -49,25 +47,22 @@ public class WarnLogStringPropertySizeTest extends AbstractRepositoryTest { private final static String testStringPropertyKey = "testStringPropertyKey"; private final static String testLargeStringPropertyValue = "a".repeat(OakJcrConstants.DEFAULT_WARN_LOG_STRING_SIZE_THRESHOLD_VALUE + 1); private final static String testSmallStringPropertyValue = "a".repeat(OakJcrConstants.DEFAULT_WARN_LOG_STRING_SIZE_THRESHOLD_VALUE); - private final static String nodeImplLogger = NodeImpl.class.getName(); - private final static String warnMessage = "String length: {} for property: {} at Node: {} is greater than configured value {}"; - private static ListAppender listAppender = null; + private final static String warnMessage = "String length: .* for property: .* at Node: .* is greater than configured value .*"; + private final LogCustomizer logger; public WarnLogStringPropertySizeTest(NodeStoreFixture fixture) { super(fixture); + logger = LogCustomizer.forLogger(NodeImpl.class).enable(Level.WARN).matchesRegex(warnMessage).create(); } @Before public void loggingAppenderStart() { - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - listAppender = new ListAppender<>(); - listAppender.start(); - context.getLogger(nodeImplLogger).addAppender(listAppender); + logger.starting(); } @After public void loggingAppenderStop() { - listAppender.stop(); + logger.finished(); } @Test @@ -75,7 +70,7 @@ public void noWarnLogOnAddingSmallStringProperties() throws Exception { Session s = getAdminSession(); Node test = s.getRootNode().addNode("testSmall"); test.setProperty(testStringPropertyKey, testSmallStringPropertyValue); - assertFalse(isWarnMessagePresent(listAppender)); + assertFalse(isWarnMessagePresent(logger)); } @Test @@ -83,15 +78,10 @@ public void warnLogOnAddingLargeStringPropertiesWithCustomThreshold() throws Exc Session s = getAdminSession(); Node test = s.getRootNode().addNode("testLarge"); test.setProperty(testStringPropertyKey, testLargeStringPropertyValue); - assertTrue(isWarnMessagePresent(listAppender)); + assertTrue(logger.getLogs().toString(), isWarnMessagePresent(logger)); } - private boolean isWarnMessagePresent(ListAppender listAppender) { - for (ILoggingEvent loggingEvent : listAppender.list) { - if (loggingEvent.getMessage().contains(warnMessage)) { - return true; - } - } - return false; + private boolean isWarnMessagePresent(LogCustomizer logger) { + return !logger.getLogs().isEmpty(); } } diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java index cb8349bb5d4..41be8c64e2a 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; @@ -39,6 +38,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +import org.slf4j.event.Level; import java.io.IOException; import java.util.List; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java index c8d163d93bd..fe4badef3bf 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -47,6 +46,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import java.util.List; import java.util.Properties; @@ -81,7 +81,7 @@ public void before() throws Exception { ContentSession session = createRepository().login(null, null); root = session.getLatestRoot(); customLogger = LogCustomizer - .forLogger(AsyncIndexUpdate.class.getName()) + .forLogger(AsyncIndexUpdate.class) .enable(Level.INFO).create(); customLogger.starting(); } diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java index 9ebd35c1578..7c2e41e1b6b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.index.lucene; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.*; @@ -42,6 +41,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import java.util.List; import java.util.concurrent.TimeUnit; @@ -77,7 +77,7 @@ public void before() throws Exception { ContentSession session = createRepository().login(null, null); root = session.getLatestRoot(); customLogger = LogCustomizer - .forLogger(IndexUpdate.class.getName()) + .forLogger(IndexUpdate.class) .enable(Level.WARN).create(); customLogger.starting(); } diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextAnalyzerTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextAnalyzerTest.java index 48a4ff323be..1d7bbb70fd8 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextAnalyzerTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextAnalyzerTest.java @@ -58,7 +58,7 @@ public void shutdownExecutor() { @Override protected LogCustomizer setupLogCustomizer() { - return LogCustomizer.forLogger(LucenePropertyIndex.class.getName()).enable(Level.WARN).create(); + return LogCustomizer.forLogger(LucenePropertyIndex.class).enable(Level.WARN).create(); } @Override diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionCommonTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionCommonTest.java index 4b04dd2825b..4f51441df64 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionCommonTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionCommonTest.java @@ -77,6 +77,6 @@ protected String getExpectedLogEntryForPostPathFiltering(String path, boolean sh @Override protected LogCustomizer getLogCustomizer() { - return LogCustomizer.forLogger(LucenePropertyIndex.class.getName()).enable(Level.TRACE).contains("Matched path").create(); + return LogCustomizer.forLogger(LucenePropertyIndex.class).enable(Level.TRACE).contains("Matched path").create(); } } diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java index 23e9d1183c0..489caaf6cad 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java @@ -60,7 +60,6 @@ import javax.jcr.PropertyType; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -115,6 +114,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; +import org.slf4j.event.Level; @SuppressWarnings("ConstantConditions") public class LuceneIndexTest { @@ -834,7 +834,7 @@ public void indexNameIsIndexPath() throws Exception { */ @Test public void testConfigErrorInIndexDefintion() throws Exception { - LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class.getName()).enable(Level.ERROR).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class).enable(Level.ERROR).create(); // Create 2 index def - one with config related error and one without NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneLargeStringPropertyTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneLargeStringPropertyTest.java index 52fca50fe41..710d426eccb 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneLargeStringPropertyTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneLargeStringPropertyTest.java @@ -97,7 +97,7 @@ public class LuceneLargeStringPropertyTest extends AbstractQueryTest { @Before public void setup() { - customizer = LogCustomizer.forLogger(LuceneDocumentMaker.class.getName()).filter(Level.INFO).create(); + customizer = LogCustomizer.forLogger(LuceneDocumentMaker.class).filter(Level.INFO).create(); customizer.starting(); } diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java index 324fde77c79..f004aaabb2b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java @@ -45,7 +45,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.testing.CIHelper; @@ -64,6 +63,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.internal.util.collections.Sets; +import org.slf4j.event.Level; public class ActiveDeletedBlobCollectorTest { @Rule @@ -366,7 +366,7 @@ public void resumeCancelledPurge() throws Exception { @Test public void dontWarnWhileErrorsWhileDeletingBlobs() throws Exception { LogCustomizer warnLogCustomizer = - LogCustomizer.forLogger(ActiveDeletedBlobCollectorFactory.class.getName()).enable(Level.WARN) + LogCustomizer.forLogger(ActiveDeletedBlobCollectorFactory.class).enable(Level.WARN) .contains("Exception occurred while ") .create(); @@ -424,7 +424,7 @@ public void dontWarnWhileErrorsWhileDeletingBlobs() throws Exception { @Test public void doDebugLogWhileErrorsWhileDeletingBlobs() throws Exception { LogCustomizer warnLogCustomizer = - LogCustomizer.forLogger(ActiveDeletedBlobCollectorFactory.class.getName()).enable(Level.DEBUG) + LogCustomizer.forLogger(ActiveDeletedBlobCollectorFactory.class).enable(Level.DEBUG) .contains("Exception occurred while ") .create(); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java index 1549b1d3f0e..691405d18ce 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java @@ -23,8 +23,6 @@ import java.util.Random; import java.util.Set; -import ch.qos.logback.classic.Level; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.collections.SetUtils; @@ -38,6 +36,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.junit.Test; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.BufferedOakDirectory.DELETE_THRESHOLD_UNTIL_REOPEN; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.BufferedOakDirectory.ENABLE_WRITING_SINGLE_BLOB_INDEX_FILE_PARAM; @@ -332,7 +331,7 @@ public void settingConfigDifferentFromCLIWarns() { String oldVal = System.getProperty(ENABLE_WRITING_SINGLE_BLOB_INDEX_FILE_PARAM); final LogCustomizer custom = LogCustomizer - .forLogger(BufferedOakDirectory.class.getName()) + .forLogger(BufferedOakDirectory.class) .contains("Ignoring configuration ") .enable(Level.WARN).create(); @@ -362,7 +361,7 @@ public void dontWarnUnnecesarily() { String oldVal = System.getProperty(ENABLE_WRITING_SINGLE_BLOB_INDEX_FILE_PARAM); final LogCustomizer custom = LogCustomizer - .forLogger(BufferedOakDirectory.class.getName()) + .forLogger(BufferedOakDirectory.class) .contains("Ignoring configuration ") .enable(Level.WARN).create(); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java index b925cfa7587..178a54e6257 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.directory; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; @@ -27,6 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.slf4j.event.Level; import java.io.IOException; import java.io.InputStream; @@ -246,7 +246,7 @@ public void logWarnWhenSeekingBackAfterRead() throws Exception { byte[] fileBytes = writeFile(); LogCustomizer logRecorder = LogCustomizer - .forLogger(OakStreamingIndexFile.class.getName()).enable(Level.WARN) + .forLogger(OakStreamingIndexFile.class).enable(Level.WARN) .contains("Seeking back on streaming index file").create(); NodeBuilder fooBuilder = builder.child("foo"); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java index 1a745bced61..69eb5b36e52 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.dynamicBoost; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -44,6 +43,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java index a69525864fb..789d3db57b2 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; @@ -62,6 +61,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import javax.jcr.GuestCredentials; import javax.jcr.Repository; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java index fcad988f6e4..e5ad5fec582 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java @@ -37,7 +37,6 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import ch.qos.logback.classic.Level; import org.apache.commons.exec.CommandLine; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.PumpStreamHandler; @@ -98,6 +97,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.api.QueryEngine.NO_BINDINGS; import static org.apache.jackrabbit.oak.spi.mount.Mounts.defaultMountInfoProvider; @@ -434,7 +434,7 @@ public void paging() throws Exception{ } createTestData("/content2", 5); - LogCustomizer lc = LogCustomizer.forLogger(LucenePropertyIndex.class.getName()) + LogCustomizer lc = LogCustomizer.forLogger(LucenePropertyIndex.class) .filter(Level.WARN) .create(); lc.starting(); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java index 2fc3c9bf440..6f9843f49b8 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java @@ -52,8 +52,7 @@ import org.apache.lucene.codecs.Codec; import org.hamcrest.core.IsCollectionContaining; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class InvalidIndexDefinitionTest extends AbstractQueryTest { @@ -165,7 +164,7 @@ public void invalidIncludedPaths() throws CommitFailedException { // ERROR o.a.j.o.p.i.search.IndexDefinition - Config error for index definition at /oak:index/... . // Please correct the index definition and reindex after correction. Additional Info : No valid include provided. Includes [/tmp], Excludes [/tmp] // java.lang.IllegalStateException: No valid include provided. Includes [/tmp], Excludes [/tmp] - LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class.getName()).enable(Level.ERROR).create(); + LogCustomizer customLogs = LogCustomizer.forLogger(IndexUpdate.class).enable(Level.ERROR).create(); Tree def = createIndexNodeAndData(); def.setProperty(PathFilter.PROP_INCLUDED_PATHS, List.of("/tmp/testNode"), Type.STRINGS); def.setProperty(PathFilter.PROP_EXCLUDED_PATHS, List.of("/tmp"), Type.STRINGS); diff --git a/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java b/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java index 6922d3240a1..570514733cd 100644 --- a/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java +++ b/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.indexversion; -import ch.qos.logback.classic.Level; import co.elastic.clients.elasticsearch._types.ExpandWildcard; import co.elastic.clients.elasticsearch.cat.IndicesResponse; import co.elastic.clients.elasticsearch.cat.indices.IndicesRecord; @@ -39,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.Assert; import org.junit.Test; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -161,7 +161,7 @@ public void noDeleteForDisabledIndexes() throws Exception { @Test public void noDeleteIfActiveIndexTimeThresholdNotMeet() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -202,7 +202,7 @@ public void noDeleteIfActiveIndexTimeThresholdNotMeet() throws Exception { // but before which is fixed, the purging will not do deletion in that case @Test public void noDeleteIfActiveIndexTimeMissing() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -252,7 +252,7 @@ public void noDeleteIfActiveIndexTimeMissing() throws Exception { @Test public void noDeleteIfInvalidIndexOperationVersion() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -347,7 +347,7 @@ public void onlyDeleteVersionIndexesMentionedUnderIndexPaths() throws Exception @Test public void noDeleteIfNonReadWriteMode() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.run.PurgeOldIndexVersionCommand") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.run.PurgeOldIndexVersionCommand.class) .enable(Level.INFO) .create(); try { diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java index 8bfca47635d..9f82a9139f5 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java @@ -53,8 +53,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.Assert; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class LucenePurgeOldIndexVersionTest extends LuceneAbstractIndexCommandTest { private final static String FOO1_INDEX_PATH = "/oak:index/fooIndex1"; @@ -112,7 +111,7 @@ public void deleteOldIndexCompletely() throws Exception { @Test public void noDeleteIfActiveIndexTimeThresholdNotMeet() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -146,7 +145,7 @@ public void noDeleteIfActiveIndexTimeThresholdNotMeet() throws Exception { } @Test public void noDeleteIfNoActiveIndex() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -180,7 +179,7 @@ public void noDeleteIfNoActiveIndex() throws Exception { // Verify that the lower versioned index that is being used for queries should not get purged. @Test public void noDeleteIfLatestOOBIndexIsDisabled() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -241,7 +240,7 @@ public void noDeleteIfLatestOOBIndexIsDisabled() throws Exception { // but before which is fixed, the purging will not do deletion in that case @Test public void noDeleteIfActiveIndexTimeMissing() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -285,7 +284,7 @@ public void noDeleteIfActiveIndexTimeMissing() throws Exception { @Test public void noDeleteIfInvalidIndexOperationVersion() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.indexversion.IndexVersionOperation.class) .enable(Level.INFO) .create(); try { @@ -420,7 +419,7 @@ public void onlyDeleteVersionIndexesMentionedUnderIndexPaths() throws Exception @Test public void noDeleteIfNonReadWriteMode() throws Exception { - LogCustomizer custom = LogCustomizer.forLogger("org.apache.jackrabbit.oak.run.PurgeOldIndexVersionCommand") + LogCustomizer custom = LogCustomizer.forLogger(org.apache.jackrabbit.oak.run.PurgeOldIndexVersionCommand.class) .enable(Level.INFO) .create(); try { diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java index 0b19ebd9145..c42bc9356b0 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.indexversion; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.composite.blueGreen.IndexUtils; import org.apache.jackrabbit.oak.composite.blueGreen.Persistence; @@ -29,6 +28,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import java.io.File; import java.io.IOException; @@ -49,7 +49,7 @@ public class PurgeOldIndexVersionIT { @Before public void setup() { - purgeOldIndexVersionLogger = LogCustomizer.forLogger(PurgeOldIndexVersion.class.getName()) + purgeOldIndexVersionLogger = LogCustomizer.forLogger(PurgeOldIndexVersion.class) .enable(Level.INFO).contains("Found some index need to be purged over base").create(); } diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java index 5bdc3fa0b82..2bb694e1826 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java @@ -40,7 +40,6 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import ch.qos.logback.classic.Level; import org.apache.commons.lang3.StringUtils; import joptsimple.OptionException; import org.apache.commons.io.FileUtils; @@ -95,6 +94,7 @@ import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort; @@ -297,7 +297,7 @@ public void testNoSensitiveParams() throws Exception { log.info("Running testNoSensitiveParams: {}", argsList); LogCustomizer customLogs = LogCustomizer - .forLogger(DataStoreCommand.class.getName()) + .forLogger(DataStoreCommand.class) .enable(Level.INFO) .filter(Level.INFO) .matchesRegex(".*mongodb:.*|.*az:.*") diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAnalyzerTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAnalyzerTest.java index 1b56e803f8c..c44896ba881 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAnalyzerTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAnalyzerTest.java @@ -52,7 +52,7 @@ protected void createTestIndexNode() { @Override protected LogCustomizer setupLogCustomizer() { - return LogCustomizer.forLogger(ElasticResultRowAsyncIterator.class.getName()).enable(Level.ERROR).create(); + return LogCustomizer.forLogger(ElasticResultRowAsyncIterator.class).enable(Level.ERROR).create(); } @Override diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPathRestrictionCommonTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPathRestrictionCommonTest.java index 32eac70ec42..8f59332c99a 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPathRestrictionCommonTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPathRestrictionCommonTest.java @@ -103,7 +103,7 @@ protected String getExpectedLogEntryForPostPathFiltering(String path, boolean sh @Override protected LogCustomizer getLogCustomizer() { - return LogCustomizer.forLogger(ElasticResultRowAsyncIterator.class.getName()).enable(Level.TRACE).contains("hierarchy inclusion rules").create(); + return LogCustomizer.forLogger(ElasticResultRowAsyncIterator.class).enable(Level.TRACE).contains("hierarchy inclusion rules").create(); } } diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java index 6417986609e..a0503033dc3 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.elastic; -import ch.qos.logback.classic.Level; import org.apache.commons.lang3.RandomStringUtils; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Tree; @@ -33,6 +32,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.slf4j.event.Level; import java.util.List; @@ -93,7 +93,7 @@ public void bulkProcessorEventsFlushLimit() throws Exception { @Test public void bulkProcessorSizeFlushLimit() throws Exception { LogCustomizer customLogger = LogCustomizer - .forLogger("org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticBulkProcessorHandler") + .forLogger(org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticBulkProcessorHandler.class) .enable(Level.DEBUG).create(); try { customLogger.starting(); diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java index 13b0c3f1b5f..8ce4d5b421b 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.elastic.query.inference; -import ch.qos.logback.classic.Level; import co.elastic.clients.elasticsearch._types.ElasticsearchException; import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.SearchResponse; @@ -58,6 +57,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import java.io.IOException; import java.net.URL; @@ -293,7 +293,7 @@ private void hybridSearch(String inferenceConfigInQuery) throws Exception { // Setup log customizer to capture InferenceServiceMetrics logs LogCustomizer logCustomizer = LogCustomizer - .forLogger(InferenceServiceMetrics.class.getName()) + .forLogger(InferenceServiceMetrics.class) .enable(Level.INFO) .enable(Level.DEBUG) .contains("Inference service metrics") diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java index 2ecf579b0e6..ed3191e4199 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.elastic.query.inference; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; @@ -29,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import java.util.List; import java.util.UUID; @@ -54,7 +54,7 @@ public class InferenceServiceMetricsTest { @Before public void setUp() { logCustomizer = LogCustomizer - .forLogger(InferenceServiceMetrics.class.getName()) + .forLogger(InferenceServiceMetrics.class) .enable(Level.INFO) .enable(Level.DEBUG) .create(); diff --git a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexQueryCommonTest.java b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexQueryCommonTest.java index 7d48f41df32..b527f021d03 100644 --- a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexQueryCommonTest.java +++ b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexQueryCommonTest.java @@ -66,7 +66,7 @@ public abstract class IndexQueryCommonTest extends AbstractQueryTest { @Before public void setupLogger(){ - logCustomizer = LogCustomizer.forLogger(SQL2Parser.class.getName()).enable(Level.WARN) + logCustomizer = LogCustomizer.forLogger(SQL2Parser.class).enable(Level.WARN) .contains(nativeWarnLog).create(); logCustomizer.starting(); } diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java index 09e8ee82a5c..00dc66147bd 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java @@ -41,7 +41,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -75,6 +74,7 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; /** * Tests for SegmentNodeStore DataStore GC @@ -276,7 +276,7 @@ public void gc() throws Exception { @Test public void checkMark() throws Exception { LogCustomizer customLogs = LogCustomizer - .forLogger(MarkSweepGarbageCollector.class.getName()) + .forLogger(MarkSweepGarbageCollector.class) .enable(Level.TRACE) .filter(Level.TRACE) .create(); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java index 2297b45e1fb..d8af76ad24a 100755 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java @@ -36,8 +36,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class BulkCreateOrUpdateClusterTest extends AbstractMultiDocumentStoreTest { @@ -208,7 +207,7 @@ public void run() { @Test public void testSimpleConflictHandling() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.DEBUG) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.DEBUG) .contains("invalidating cache and retrying").create(); logCustomizer.starting(); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java index ae505a6049c..82f774a2df4 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java @@ -33,8 +33,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.CoreMatchers.is; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java index 6a7ad6ce40e..779d20916be 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; @@ -34,6 +33,7 @@ import org.junit.After; import org.junit.Test; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL; import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; @@ -295,6 +295,6 @@ private Timer getTimer(String name) { private static void enableLevel(String logName, Level level){ ((LoggerContext)LoggerFactory.getILoggerFactory()) - .getLogger(logName).setLevel(level); + .getLogger(logName).setLevel(ch.qos.logback.classic.Level.valueOf(level.toString())); } } \ No newline at end of file diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java index 6000a950737..3e611810373 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java @@ -33,7 +33,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import ch.qos.logback.classic.Level; import org.apache.commons.lang3.StringUtils; import com.mongodb.BasicDBObject; import com.mongodb.ReadPreference; @@ -67,6 +66,7 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -213,7 +213,7 @@ public void gcDirectMongoDelete() throws Exception { public void checkMark() throws Exception { String rootFolder = folder.newFolder().getAbsolutePath(); LogCustomizer customLogs = LogCustomizer - .forLogger(MarkSweepGarbageCollector.class.getName()) + .forLogger(MarkSweepGarbageCollector.class) .enable(Level.TRACE) .filter(Level.TRACE) .create(); @@ -362,7 +362,7 @@ public void gcLongRunningBlobCollection() throws Exception { public void checkGcPathLogging() throws Exception { String rootFolder = folder.newFolder().getAbsolutePath(); LogCustomizer customLogs = LogCustomizer - .forLogger(MarkSweepGarbageCollector.class.getName()) + .forLogger(MarkSweepGarbageCollector.class) .enable(Level.TRACE) .filter(Level.TRACE) .create(); @@ -381,7 +381,7 @@ public void checkGcPathLogging() throws Exception { public void checkConsistencyPathLogging() throws Exception { String rootFolder = folder.newFolder().getAbsolutePath(); LogCustomizer customLogs = LogCustomizer - .forLogger(MarkSweepGarbageCollector.class.getName()) + .forLogger(MarkSweepGarbageCollector.class) .enable(Level.TRACE) .filter(Level.TRACE) .create(); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java index ba60c3edd2e..6f0d5243ab1 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java @@ -385,10 +385,10 @@ public void testTraceLoggingForBulkUpdates() { } ds.createOrUpdate(NODES, ops); - LogCustomizer logCustomizerJDBC = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class.getName()).enable(Level.TRACE) + LogCustomizer logCustomizerJDBC = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class).enable(Level.TRACE) .matchesRegex("update: batch result.*").create(); logCustomizerJDBC.starting(); - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.TRACE) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.TRACE) .matchesRegex("bulkUpdate: success.*").create(); logCustomizer.starting(); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java index 2a59d69a92c..3a225f368f1 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java @@ -32,8 +32,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java index d6e7cb264e1..fc5f5189b8c 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java @@ -144,7 +144,7 @@ public void idInExceptionMessage() { @Test public void createOrUpdate16MBDoc() { - LogCustomizer customizer = LogCustomizer.forLogger(MongoDocumentStore.class.getName()).create(); + LogCustomizer customizer = LogCustomizer.forLogger(MongoDocumentStore.class).create(); customizer.starting(); String id = "/foo"; UpdateOp updateOp = new UpdateOp(id, true); @@ -163,7 +163,7 @@ public void createOrUpdate16MBDoc() { @Test public void createOrUpdate16MBBatchWithMultiDocs() { - LogCustomizer log = LogCustomizer.forLogger(MongoDocumentStore.class.getName()). + LogCustomizer log = LogCustomizer.forLogger(MongoDocumentStore.class). enable(Level.ERROR). matchesRegex("bulkUpdate.*biggest update.*approximate.*"). create(); @@ -238,7 +238,7 @@ public void update16MBDoc() { public void multiCreateOrUpdate16MBDoc() { List updateOps = new ArrayList<>(); - LogCustomizer customizer = LogCustomizer.forLogger(MongoDocumentStore.class.getName()).create(); + LogCustomizer customizer = LogCustomizer.forLogger(MongoDocumentStore.class).create(); customizer.starting(); String id1 = "/test"; String id2 = "/foo"; @@ -272,7 +272,7 @@ public void multiCreateOrUpdate16MBDoc() { public void create16MBDoc() { List updateOps = new ArrayList<>(); - LogCustomizer customizer = LogCustomizer.forLogger(MongoDocumentStore.class.getName()).create(); + LogCustomizer customizer = LogCustomizer.forLogger(MongoDocumentStore.class).create(); customizer.starting(); String id1 = "/test"; String id2 = "/foo"; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java index db559835591..9bdc02adc6d 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document.mongo; -import ch.qos.logback.classic.Level; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; @@ -31,6 +30,7 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; +import org.slf4j.event.Level; import java.util.concurrent.TimeUnit; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java index 985bd763ffe..af980e18238 100755 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java @@ -58,8 +58,7 @@ import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; /** * Tests checking certain JDBC related features. @@ -326,7 +325,7 @@ public void queryIteratorNotStartedTest() throws SQLException { public void queryIteratorConsumedTest() throws SQLException { insertTestResource(this.getClass().getName() + "." + name.getMethodName()); - LogCustomizer customLogs = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class.getName()).enable(Level.DEBUG) + LogCustomizer customLogs = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class).enable(Level.DEBUG) .contains("Query on ").create(); customLogs.starting(); @@ -352,7 +351,7 @@ public void queryIteratorConsumedTest() throws SQLException { @Test public void queryIteratorNotConsumedTest() throws SQLException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - LogCustomizer customLogs = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class.getName()).enable(Level.DEBUG).contains("finalizing unclosed").create(); + LogCustomizer customLogs = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class).enable(Level.DEBUG).contains("finalizing unclosed").create(); customLogs.starting(); insertTestResource(this.getClass().getName() + "." + name.getMethodName()); @@ -434,7 +433,7 @@ public void queryMinLastModifiedTest() throws SQLException { assertTrue(super.ds.create(Collection.NODES, Collections.singletonList(op))); removeMe.add(baseName5ModifiedNoDeletedOnce); - LogCustomizer customLogs = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class.getName()).enable(Level.DEBUG) + LogCustomizer customLogs = LogCustomizer.forLogger(RDBDocumentStoreJDBC.class).enable(Level.DEBUG) .contains("Aggregate query").contains("min(MODIFIED)").create(); customLogs.starting(); Connection con = super.rdbDataSource.getConnection(); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java index abd2eac7421..8a980a34c03 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java @@ -46,8 +46,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; @RunWith(Parameterized.class) public class RDBDocumentStoreSchemaUpgradeTest { @@ -108,7 +107,7 @@ public void initDefaultRO() { @Test public void init01() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.INFO) .contains("to DB level 1").create(); logCustomizer.starting(); @@ -184,7 +183,7 @@ public void init0then2() { @Test public void init12() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.INFO) .contains("to DB level 2").create(); logCustomizer.starting(); @@ -208,7 +207,7 @@ public void init12() { @Test public void init01fail() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.INFO) .contains("Attempted to upgrade").create(); logCustomizer.starting(); @@ -238,7 +237,7 @@ public void init01fail() { @Test public void init11() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.INFO) .contains("to DB level 1").create(); logCustomizer.starting(); @@ -260,7 +259,7 @@ public void init11() { @Test public void init22() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.INFO) .contains("to DB level").create(); logCustomizer.starting(); @@ -283,7 +282,7 @@ public void init22() { @Test public void init12fail() { - LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO) + LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class).enable(Level.INFO) .contains("Attempted to upgrade").create(); logCustomizer.starting(); diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java index 066a0619b8e..075dc6ccafd 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java @@ -18,7 +18,6 @@ import java.io.IOException; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.plugins.blob.UploadStagingCache; import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest; @@ -30,6 +29,7 @@ import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import static org.junit.Assert.assertEquals; @@ -76,7 +76,7 @@ protected boolean supportsCheckpointMigration() { public void prepare() throws Exception { // Capture logs customLogs = LogCustomizer - .forLogger(UploadStagingCache.class.getName()) + .forLogger(UploadStagingCache.class) .enable(Level.INFO) .filter(Level.INFO) .contains("Uploads in progress on close [0]") diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java index c32163fe75c..9fd402db53c 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java @@ -18,7 +18,6 @@ import java.io.IOException; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.plugins.blob.UploadStagingCache; import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest; @@ -29,6 +28,7 @@ import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import static org.junit.Assert.assertEquals; @@ -75,7 +75,7 @@ protected boolean supportsCheckpointMigration() { public void prepare() throws Exception { // Capture logs customLogs = LogCustomizer - .forLogger(UploadStagingCache.class.getName()) + .forLogger(UploadStagingCache.class) .enable(Level.INFO) .filter(Level.INFO) .contains("Uploads in progress on close [0]")