gnodet-bot commented on code in PR #13832: URL: https://github.com/apache/maven/pull/13832#discussion_r4540373767
########## impl/maven-logging-slf4j/src/main/java/org/apache/maven/logging/slf4j/MavenSimpleLogger.java: ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.slf4j; + +import java.util.Arrays; +import java.util.Map; + +import org.apache.maven.api.MonotonicClock; +import org.apache.maven.api.logging.LogLevel; +import org.apache.maven.api.logging.LogSink; +import org.apache.maven.api.logging.LoggerManager; +import org.apache.maven.logging.impl.DefaultLogEvent; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.slf4j.Marker; +import org.slf4j.event.Level; +import org.slf4j.helpers.LegacyAbstractLogger; +import org.slf4j.spi.LocationAwareLogger; + +/** + * Thin SLF4J logger that dispatches events to the Maven unified logging API + * via {@link LoggerManager}. Level checks are delegated to + * {@link DefaultLoggerManager}; formatting is deferred to the {@link LogSink}. + * + * @since 3.5.0 Review Comment: 🟡 **Wrong `@since` — this is a new class for 4.2.0, not 3.5.0.** `org.apache.maven.logging.slf4j.MavenSimpleLogger` is a brand-new class in a brand-new module (`maven-logging-slf4j`). The `@since 3.5.0` annotation was copied from the deleted `org.apache.maven.slf4j.MavenSimpleLogger`. The new class only exists from Maven 4.2.0 onwards. ```suggestion * @since 4.2.0 ``` ########## impl/maven-logging-slf4j/src/main/java/org/apache/maven/logging/slf4j/MavenLoggerFactory.java: ########## @@ -0,0 +1,121 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.slf4j; + +import java.util.Objects; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.apache.maven.api.logging.LoggerManager; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; + +/** + * LogFactory for Maven which creates SLF4J loggers that delegate level checks + * and severity recording to the shared {@link DefaultLoggerManager}. + */ Review Comment: 🟡 **Missing `@since 4.2.0`** on the class-level Javadoc. `MavenLoggerFactory` is a new public class in a new module. All other new types in this PR carry `@since 4.2.0`; this class doesn't. ```suggestion /** * LogFactory for Maven which creates SLF4J loggers that delegate level checks * and severity recording to the shared {@link DefaultLoggerManager}. * * @since 4.2.0 */ ``` ########## impl/maven-logging-jul/src/test/java/org/apache/maven/logging/jul/MavenJulHandlerTest.java: ########## @@ -0,0 +1,189 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.jul; + +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; +import java.util.logging.LogRecord; + +import org.apache.maven.api.logging.LogEvent; +import org.apache.maven.api.logging.LogLevel; +import org.apache.maven.api.logging.LogSink; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +@Timeout(10) +class MavenJulHandlerTest { + + private DefaultLoggerManager testManager; + + @BeforeEach + void installTestManager() { + testManager = new DefaultLoggerManager(); + testManager.setRootLoggerLevel(LogLevel.TRACE); + testManager.install(); + } + + @AfterEach + void clearTestManager() { + testManager.uninstall(); + testManager = null; + } + + @ParameterizedTest(name = "JUL {0} -> LogLevel.{1}") + @CsvSource({ + "FINEST, TRACE", + "FINER, DEBUG", + "FINE, DEBUG", + "CONFIG, INFO", + "INFO, INFO", + "WARNING, WARN", + "SEVERE, ERROR", + }) + void julLevelMapsToCorrectLogLevel(String julLevelName, String expectedLogLevel) { + Level julLevel = Level.parse(julLevelName); + LogLevel actual = MavenJulHandler.julLevelToLogLevel(julLevel); + assertEquals(LogLevel.valueOf(expectedLogLevel), actual); + } + + @Test + void finestMapsToTrace() { + assertEquals(LogLevel.TRACE, MavenJulHandler.julLevelToLogLevel(Level.FINEST)); + } + + @Test + void configMapsToInfo() { + assertEquals(LogLevel.INFO, MavenJulHandler.julLevelToLogLevel(Level.CONFIG)); + } + + @Test + void publishIsReentrantSafe() { + MavenJulHandler handler = new MavenJulHandler(); + LogRecord record = new LogRecord(Level.INFO, "nested"); + + MavenJulHandler.setInPublishForTest(true); + try { + handler.publish(record); + } finally { + MavenJulHandler.setInPublishForTest(false); + } + } Review Comment: 🟡 **`publishIsReentrantSafe()` still lacks a happy-path assertion.** The test only verifies that the re-entrant call doesn't throw. A guard that silently swallows _all_ events (including non-re-entrant ones) would still pass. Add a normal publish before setting the flag to confirm the base path delivers events: ```suggestion void publishIsReentrantSafe() { // 1. Confirm the normal publish path works and delivers an event AtomicReference<LogEvent> delivered = new AtomicReference<>(); testManager.setLogSink(new LogSink() { @Override public void accept(LogEvent e) { delivered.set(e); } @Override public boolean needsMetadata() { return false; } }); MavenJulHandler handler = new MavenJulHandler(); handler.publish(new LogRecord(Level.INFO, "normal")); assertNotNull(delivered.get(), "normal publish must deliver an event"); // 2. Re-entrant call must return silently without throwing MavenJulHandler.setInPublishForTest(true); try { handler.publish(new LogRecord(Level.INFO, "nested")); } finally { MavenJulHandler.setInPublishForTest(false); } } ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
