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/16 15:04:38 UTC
[logging-log4j2] 02/04: Add missing @Override.
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 2dd6ecae70440017232c63141c6240282a749b17
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 16 09:56:21 2020 -0500
Add missing @Override.
---
log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java | 5 +++++
.../main/java/org/apache/log4j/config/PropertiesConfiguration.java | 2 ++
.../src/main/java/org/apache/log4j/helpers/QuietWriter.java | 2 ++
.../src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java | 1 +
.../src/main/java/org/apache/log4j/or/jms/MessageRenderer.java | 1 +
.../src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java | 1 +
.../main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java | 1 +
.../src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java | 1 +
.../src/main/java/org/apache/log4j/xml/XmlConfiguration.java | 5 +++++
9 files changed, 19 insertions(+)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
index 147990f..cd7b649 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
@@ -124,6 +124,7 @@ public class WriterAppender extends AppenderSkeleton {
/**
* Does nothing.
*/
+ @Override
public void activateOptions() {
}
@@ -139,6 +140,7 @@ public class WriterAppender extends AppenderSkeleton {
* <p>The format of the output will depend on this appender's
* layout.
*/
+ @Override
public void append(LoggingEvent event) {
// Reminder: the nesting of calls is:
@@ -192,6 +194,7 @@ public class WriterAppender extends AppenderSkeleton {
* @see #setWriter
* @since 0.8.4
*/
+ @Override
public
synchronized void close() {
if (this.closed) {
@@ -263,6 +266,7 @@ public class WriterAppender extends AppenderSkeleton {
* Set the {@link ErrorHandler} for this WriterAppender and also the
* underlying {@link QuietWriter} if any.
*/
+ @Override
public synchronized void setErrorHandler(ErrorHandler eh) {
if (eh == null) {
LOGGER.warn("You have tried to set a null error-handler.");
@@ -329,6 +333,7 @@ public class WriterAppender extends AppenderSkeleton {
* The WriterAppender requires a layout. Hence, this method returns
* <code>true</code>.
*/
+ @Override
public boolean requiresLayout() {
return true;
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
index fd5a749..a6541b4 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
@@ -76,6 +76,7 @@ public class PropertiesConfiguration extends Log4j1Configuration {
registry = new HashMap<>();
}
+ @Override
public void doConfigure() {
InputStream is = getConfigurationSource().getInputStream();
Properties props = new Properties();
@@ -582,6 +583,7 @@ public class PropertiesConfiguration extends Log4j1Configuration {
this.value = value;
}
+ @Override
public String toString() {
return key + "=" + value;
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
index 6af9aca..f05ba64 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
@@ -37,6 +37,7 @@ public class QuietWriter extends FilterWriter {
setErrorHandler(errorHandler);
}
+ @Override
public void write(String string) {
if (string != null) {
try {
@@ -48,6 +49,7 @@ public class QuietWriter extends FilterWriter {
}
}
+ @Override
public void flush() {
try {
out.flush();
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
index bd5d6e9..959d927 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
@@ -22,6 +22,7 @@ import org.apache.log4j.Layout;
*/
public class ThreadGroupRenderer implements ObjectRenderer {
+ @Override
public
String doRender(Object obj) {
if(obj instanceof ThreadGroup) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
index 129b0b1..5cb78fa 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
@@ -33,6 +33,7 @@ public class MessageRenderer implements ObjectRenderer {
/**
Render a {@link javax.jms.Message}.
*/
+ @Override
public
String doRender(Object obj) {
if (obj instanceof Message) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
index 7ebfd68..763990d 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
@@ -49,6 +49,7 @@ public class MapRewritePolicy implements RewritePolicy {
/**
* {@inheritDoc}
*/
+ @Override
public LoggingEvent rewrite(final LoggingEvent source) {
Object msg = source.getMessage();
if (msg instanceof MapMessage || msg instanceof Map) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
index d320d89..4d6dc2e 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
@@ -67,6 +67,7 @@ public class PropertyRewritePolicy implements RewritePolicy {
/**
* {@inheritDoc}
*/
+ @Override
public LoggingEvent rewrite(final LoggingEvent source) {
if (!properties.isEmpty()) {
Map<String, String> rewriteProps = source.getProperties() != null ? new HashMap<>(source.getProperties())
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
index 0896dd8..1417b7d 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
@@ -34,6 +34,7 @@ public class Log4jEntityResolver implements EntityResolver {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final String PUBLIC_ID = "-//APACHE//DTD LOG4J 1.2//EN";
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
if (systemId.endsWith("log4j.dtd") || PUBLIC_ID.equals(publicId)) {
Class clazz = getClass();
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
index 59b0cba..640f1e5 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
@@ -122,12 +122,14 @@ public class XmlConfiguration extends Log4j1Configuration {
public void doConfigure() throws FactoryConfigurationError {
ConfigurationSource source = getConfigurationSource();
ParseAction action = new ParseAction() {
+ @Override
public Document parse(final DocumentBuilder parser) throws SAXException, IOException {
InputSource inputSource = new InputSource(source.getInputStream());
inputSource.setSystemId("dummy://log4j.dtd");
return parser.parse(inputSource);
}
+ @Override
public String toString() {
return getConfigurationSource().getLocation();
}
@@ -746,14 +748,17 @@ public class XmlConfiguration extends Log4j1Configuration {
private static class SAXErrorHandler implements org.xml.sax.ErrorHandler {
private static final org.apache.logging.log4j.Logger LOGGER = StatusLogger.getLogger();
+ @Override
public void error(final SAXParseException ex) {
emitMessage("Continuable parsing error ", ex);
}
+ @Override
public void fatalError(final SAXParseException ex) {
emitMessage("Fatal parsing error ", ex);
}
+ @Override
public void warning(final SAXParseException ex) {
emitMessage("Parsing warning ", ex);
}