You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/11/21 21:33:30 UTC
[logging-log4j2] 01/04: Add missing @Override annotations.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f41ef86fbba6fa0eef2728dd07e37f602ffde9d0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 14:52:41 2020 -0500
Add missing @Override annotations.
---
.../java/org/apache/logging/log4j/internal/DefaultLogBuilder.java | 4 ++++
.../src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java | 1 +
.../src/main/java/org/apache/logging/log4j/core/LoggerContext.java | 2 ++
.../apache/logging/log4j/core/config/ConfigurationFileWatcher.java | 1 +
.../main/java/org/apache/logging/log4j/core/config/LoggerConfig.java | 1 +
.../org/apache/logging/log4j/core/layout/AbstractStringLayout.java | 1 +
.../main/java/org/apache/logging/log4j/core/util/AbstractWatcher.java | 2 ++
.../java/org/apache/logging/log4j/core/util/WrappedFileWatcher.java | 1 +
.../log4j/spring/cloud/config/sample/controller/SampleController.java | 1 +
9 files changed, 14 insertions(+)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
index 838ff84..9ac592d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
@@ -72,21 +72,25 @@ public class DefaultLogBuilder implements LogBuilder {
return this;
}
+ @Override
public LogBuilder withMarker(Marker marker) {
this.marker = marker;
return this;
}
+ @Override
public LogBuilder withThrowable(Throwable throwable) {
this.throwable = throwable;
return this;
}
+ @Override
public LogBuilder withLocation() {
location = StackLocatorUtil.getStackTraceElement(2);
return this;
}
+ @Override
public LogBuilder withLocation(StackTraceElement location) {
this.location = location;
return this;
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index b6e5b4a..2e755f0 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -2092,6 +2092,7 @@ public abstract class AbstractLogger implements ExtendedLogger, LocationAwareLog
logMessageSafely(fqcn, level, marker, msg, msg.getThrowable());
}
+ @Override
public void logMessage(final Level level, final Marker marker, final String fqcn, final StackTraceElement location,
final Message message, final Throwable throwable) {
try {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 894254d..b5cc60d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -170,6 +170,7 @@ public class LoggerContext extends AbstractLifeCycle
CompletableFuture.runAsync(ThreadContextDataInjector::initServiceProviders);
}
+ @Override
public void addShutdownListener(LoggerContextShutdownAware listener) {
if (listeners == null) {
synchronized(this) {
@@ -181,6 +182,7 @@ public class LoggerContext extends AbstractLifeCycle
listeners.add(listener);
}
+ @Override
public List<LoggerContextShutdownAware> getListeners() {
return listeners;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java
index e777fbf..93324b4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java
@@ -38,6 +38,7 @@ public class ConfigurationFileWatcher extends AbstractWatcher implements FileWat
this.lastModifiedMillis = lastModifiedMillis;
}
+ @Override
public long getLastModified() {
return file != null ? file.lastModified() : 0;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index d0fd84e..be54d42 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -504,6 +504,7 @@ public class LoggerConfig extends AbstractFilterable implements LocationAware {
logParent(event, predicate);
}
+ @Override
public boolean requiresLocation() {
if (!includeLocation) {
return false;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index bd3d17a..4557c51 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -88,6 +88,7 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
}
+ @Override
public boolean requiresLocation() {
return false;
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/AbstractWatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/AbstractWatcher.java
index 60cb53f..b1708b8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/AbstractWatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/AbstractWatcher.java
@@ -59,8 +59,10 @@ public abstract class AbstractWatcher implements Watcher {
return configuration;
}
+ @Override
public abstract long getLastModified();
+ @Override
public abstract boolean isModified();
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WrappedFileWatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WrappedFileWatcher.java
index 54933b2..b2c7b2b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WrappedFileWatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WrappedFileWatcher.java
@@ -46,6 +46,7 @@ public class WrappedFileWatcher extends AbstractWatcher implements FileWatcher {
this.watcher = watcher;
}
+ @Override
public long getLastModified() {
return lastModifiedMillis;
}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
index 3d47218..a0d6da7 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
@@ -107,6 +107,7 @@ public class SampleController {
this.count = count;
}
+ @Override
public void run() {
String prefix = "Thread " + id + " record ";
for (int i = 0; i < count; ++i) {