diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java index 82d7e2dbe486..3b1bdc019bc9 100644 --- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java +++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java @@ -38,7 +38,7 @@ @Named public class EventSpyDispatcher { - private final Logger logger = LoggerFactory.getLogger(getClass()); + private static final Logger LOGGER = LoggerFactory.getLogger(EventSpyDispatcher.class); private final List eventSpies; @@ -107,10 +107,10 @@ public void close() { private void logError(String action, Throwable e, EventSpy spy) { String msg = "Failed to " + action + " spy " + spy.getClass().getName() + ": " + e.getMessage(); - if (logger.isDebugEnabled()) { - logger.warn(msg, e); + if (LOGGER.isDebugEnabled()) { + LOGGER.warn(msg, e); } else { - logger.warn(msg); + LOGGER.warn(msg); } } } diff --git a/maven-core/src/test/java/org/apache/maven/eventspy/internal/EventSpyDispatcherTest.java b/maven-core/src/test/java/org/apache/maven/eventspy/internal/EventSpyDispatcherTest.java new file mode 100644 index 000000000000..a67b75e9f0f3 --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/eventspy/internal/EventSpyDispatcherTest.java @@ -0,0 +1,39 @@ +/* + * 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.eventspy.internal; + +import java.lang.reflect.Modifier; +import java.util.Arrays; + +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; + +import static org.junit.jupiter.api.Assertions.assertFalse; + +class EventSpyDispatcherTest { + + @Test + void doesNotExposeFinalInstanceLoggerFieldForInjection() { + boolean hasFinalInstanceLogger = Arrays.stream(EventSpyDispatcher.class.getDeclaredFields()) + .filter(field -> Logger.class.equals(field.getType())) + .anyMatch(field -> !Modifier.isStatic(field.getModifiers()) && Modifier.isFinal(field.getModifiers())); + + assertFalse(hasFinalInstanceLogger); + } +}