Skip to content

Commit 400c65b

Browse files
committed
Apply Palantir formatter
1 parent ab813d7 commit 400c65b

File tree

2,112 files changed

+33597
-25737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,112 files changed

+33597
-25737
lines changed

log4j-1.2-api/src/main/java/org/apache/log4j/Appender.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ public interface Appender {
6969
*/
7070
void doAppend(LoggingEvent event);
7171

72-
7372
/**
7473
* Get the name of this appender.
7574
*
7675
* @return name, may be null.
7776
*/
7877
String getName();
7978

80-
8179
/**
8280
* Set the {@link ErrorHandler} for this appender.
8381
* @param errorHandler The error handler.
@@ -110,7 +108,6 @@ public interface Appender {
110108
*/
111109
Layout getLayout();
112110

113-
114111
/**
115112
* Set the name of this appender. The name is used by other
116113
* components to identify this appender.

log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,16 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
4343
/**
4444
* Create new instance.
4545
*/
46-
public AppenderSkeleton() {
47-
}
46+
public AppenderSkeleton() {}
4847

49-
protected AppenderSkeleton(final boolean isActive) {
50-
}
48+
protected AppenderSkeleton(final boolean isActive) {}
5149

5250
@Override
53-
public void activateOptions() {
54-
}
51+
public void activateOptions() {}
5552

5653
@Override
5754
public void addFilter(final Filter newFilter) {
58-
if(headFilter == null) {
55+
if (headFilter == null) {
5956
headFilter = tailFilter = newFilter;
6057
} else {
6158
tailFilter.setNext(newFilter);
@@ -71,8 +68,7 @@ public void clearFilters() {
7168
}
7269

7370
@Override
74-
public void finalize() {
75-
}
71+
public void finalize() {}
7672

7773
@Override
7874
public ErrorHandler getErrorHandler() {
@@ -140,33 +136,21 @@ public void setThreshold(final Priority threshold) {
140136

141137
public static class NoOpErrorHandler implements ErrorHandler {
142138
@Override
143-
public void setLogger(final Logger logger) {
144-
145-
}
139+
public void setLogger(final Logger logger) {}
146140

147141
@Override
148-
public void error(final String message, final Exception e, final int errorCode) {
149-
150-
}
142+
public void error(final String message, final Exception e, final int errorCode) {}
151143

152144
@Override
153-
public void error(final String message) {
154-
155-
}
145+
public void error(final String message) {}
156146

157147
@Override
158-
public void error(final String message, final Exception e, final int errorCode, final LoggingEvent event) {
159-
160-
}
148+
public void error(final String message, final Exception e, final int errorCode, final LoggingEvent event) {}
161149

162150
@Override
163-
public void setAppender(final Appender appender) {
164-
165-
}
151+
public void setAppender(final Appender appender) {}
166152

167153
@Override
168-
public void setBackupAppender(final Appender appender) {
169-
170-
}
154+
public void setBackupAppender(final Appender appender) {}
171155
}
172156
}

log4j-1.2-api/src/main/java/org/apache/log4j/BasicConfigurator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ public static void resetConfiguration() {
6060
/**
6161
* Constructs a new instance.
6262
*/
63-
protected BasicConfigurator() {
64-
}
63+
protected BasicConfigurator() {}
6564
}

log4j-1.2-api/src/main/java/org/apache/log4j/Category.java

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Vector;
2525
import java.util.concurrent.ConcurrentMap;
2626
import java.util.stream.Collectors;
27-
2827
import org.apache.log4j.bridge.AppenderAdapter;
2928
import org.apache.log4j.bridge.AppenderWrapper;
3029
import org.apache.log4j.bridge.LogEventWrapper;
@@ -141,12 +140,12 @@ public static void shutdown() {
141140
* The assigned level of this category. The <code>level</code> variable need not be assigned a value in which case it is
142141
* inherited form the hierarchy.
143142
*/
144-
volatile protected Level level;
143+
protected volatile Level level;
145144

146145
/**
147146
* The parent of this category. All categories have at least one ancestor which is the root category.
148147
*/
149-
volatile protected Category parent;
148+
protected volatile Category parent;
150149

151150
/**
152151
* Resource bundle for localized messages.
@@ -355,8 +354,8 @@ public boolean getAdditivity() {
355354
@SuppressWarnings("unchecked")
356355
public Enumeration getAllAppenders() {
357356
if (LogManager.isLog4jCorePresent()) {
358-
final Collection<org.apache.logging.log4j.core.Appender> appenders = CategoryUtil.getAppenders(logger)
359-
.values();
357+
final Collection<org.apache.logging.log4j.core.Appender> appenders =
358+
CategoryUtil.getAppenders(logger).values();
360359
return Collections.enumeration(appenders.stream()
361360
// omit native Log4j 2.x appenders
362361
.filter(AppenderAdapter.Adapter.class::isInstance)
@@ -386,23 +385,23 @@ public Priority getChainedPriority() {
386385

387386
public Level getEffectiveLevel() {
388387
switch (logger.getLevel().getStandardLevel()) {
389-
case ALL:
390-
return Level.ALL;
391-
case TRACE:
392-
return Level.TRACE;
393-
case DEBUG:
394-
return Level.DEBUG;
395-
case INFO:
396-
return Level.INFO;
397-
case WARN:
398-
return Level.WARN;
399-
case ERROR:
400-
return Level.ERROR;
401-
case FATAL:
402-
return Level.FATAL;
403-
default:
404-
// TODO Should this be an IllegalStateException?
405-
return Level.OFF;
388+
case ALL:
389+
return Level.ALL;
390+
case TRACE:
391+
return Level.TRACE;
392+
case DEBUG:
393+
return Level.DEBUG;
394+
case INFO:
395+
return Level.INFO;
396+
case WARN:
397+
return Level.WARN;
398+
case ERROR:
399+
return Level.ERROR;
400+
case FATAL:
401+
return Level.FATAL;
402+
default:
403+
// TODO Should this be an IllegalStateException?
404+
return Level.OFF;
406405
}
407406
}
408407

@@ -566,7 +565,11 @@ public void log(final String fqcn, final Priority priority, final Object message
566565
}
567566
}
568567

569-
void maybeLog(final String fqcn, final org.apache.logging.log4j.Level level, final Object message, final Throwable throwable) {
568+
void maybeLog(
569+
final String fqcn,
570+
final org.apache.logging.log4j.Level level,
571+
final Object message,
572+
final Throwable throwable) {
570573
if (logger.isEnabled(level)) {
571574
final Message msg = createMessage(message);
572575
if (logger instanceof ExtendedLogger) {
@@ -587,7 +590,7 @@ void maybeLog(final String fqcn, final org.apache.logging.log4j.Level level, fin
587590
public void removeAllAppenders() {
588591
if (aai != null) {
589592
final Vector appenders = new Vector();
590-
for (final Enumeration iter = aai.getAllAppenders(); iter != null && iter.hasMoreElements();) {
593+
for (final Enumeration iter = aai.getAllAppenders(); iter != null && iter.hasMoreElements(); ) {
591594
appenders.add(iter.nextElement());
592595
}
593596
aai.removeAllAppenders();
@@ -672,5 +675,4 @@ public void warn(final Object message) {
672675
public void warn(final Object message, final Throwable t) {
673676
maybeLog(FQCN, org.apache.logging.log4j.Level.WARN, message, t);
674677
}
675-
676678
}

log4j-1.2-api/src/main/java/org/apache/log4j/CategoryKey.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ class CategoryKey {
3030
}
3131

3232
@Override
33-
final public int hashCode() {
33+
public final int hashCode() {
3434
return hashCache;
3535
}
3636

3737
@Override
38-
final public boolean equals(final Object rArg) {
38+
public final boolean equals(final Object rArg) {
3939
if (this == rArg) {
4040
return true;
4141
}

log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ public class ConsoleAppender extends WriterAppender {
3737
/**
3838
* Constructs a non-configured appender.
3939
*/
40-
public ConsoleAppender() {
41-
}
40+
public ConsoleAppender() {}
4241

4342
/**
4443
* Constructs a configured appender.
@@ -136,5 +135,4 @@ void targetWarn(final String val) {
136135
StatusLogger.getLogger().warn("[" + val + "] should be System.out or System.err.");
137136
StatusLogger.getLogger().warn("Using previously set target, System.out by default.");
138137
}
139-
140138
}

log4j-1.2-api/src/main/java/org/apache/log4j/DefaultCategoryFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
class DefaultCategoryFactory implements LoggerFactory {
2222

23-
DefaultCategoryFactory() {
24-
}
23+
DefaultCategoryFactory() {}
2524

2625
@Override
2726
public Logger makeNewLoggerInstance(final String name) {

log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
*/
1717
package org.apache.log4j;
1818

19+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1920
import java.io.IOException;
2021
import java.io.InterruptedIOException;
2122
import java.io.LineNumberReader;
2223
import java.io.PrintWriter;
2324
import java.io.StringReader;
2425
import java.io.StringWriter;
2526
import java.util.ArrayList;
26-
27-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2827
import org.apache.log4j.spi.ThrowableRenderer;
2928

3029
/**
@@ -42,8 +41,7 @@ public final class DefaultThrowableRenderer implements ThrowableRenderer {
4241
*/
4342
@SuppressFBWarnings(
4443
value = "INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE",
45-
justification = "The throwable is formatted into a log file, which should be private."
46-
)
44+
justification = "The throwable is formatted into a log file, which should be private.")
4745
public static String[] render(final Throwable throwable) {
4846
final StringWriter sw = new StringWriter();
4947
final PrintWriter pw = new PrintWriter(sw);

log4j-1.2-api/src/main/java/org/apache/log4j/FileAppender.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
*/
1717
package org.apache.log4j;
1818

19+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1920
import java.io.BufferedWriter;
2021
import java.io.File;
2122
import java.io.FileNotFoundException;
2223
import java.io.FileOutputStream;
2324
import java.io.IOException;
2425
import java.io.InterruptedIOException;
2526
import java.io.Writer;
26-
27-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2827
import org.apache.log4j.helpers.LogLog;
2928
import org.apache.log4j.helpers.QuietWriter;
3029
import org.apache.log4j.spi.ErrorCode;
@@ -65,8 +64,7 @@ public class FileAppender extends WriterAppender {
6564
/**
6665
* The default constructor does not do anything.
6766
*/
68-
public FileAppender() {
69-
}
67+
public FileAppender() {}
7068

7169
/**
7270
* Constructs a FileAppender and open the file designated by <code>filename</code>. The opened filename will become the
@@ -104,7 +102,13 @@ public FileAppender(final Layout layout, final String filename, final boolean ap
104102
* file.
105103
* </p>
106104
*/
107-
public FileAppender(final Layout layout, final String filename, final boolean append, final boolean bufferedIO, final int bufferSize) throws IOException {
105+
public FileAppender(
106+
final Layout layout,
107+
final String filename,
108+
final boolean append,
109+
final boolean bufferedIO,
110+
final int bufferSize)
111+
throws IOException {
108112
this.layout = layout;
109113
this.setFile(filename, append, bufferedIO, bufferSize);
110114
}
@@ -120,7 +124,8 @@ public void activateOptions() {
120124
try {
121125
setFile(fileName, fileAppend, bufferedIO, bufferSize);
122126
} catch (java.io.IOException e) {
123-
errorHandler.error("setFile(" + fileName + "," + fileAppend + ") call failed.", e, ErrorCode.FILE_OPEN_FAILURE);
127+
errorHandler.error(
128+
"setFile(" + fileName + "," + fileAppend + ") call failed.", e, ErrorCode.FILE_OPEN_FAILURE);
124129
}
125130
} else {
126131
// LogLog.error("File option not set for appender ["+name+"].");
@@ -251,9 +256,9 @@ public void setFile(final String file) {
251256
*/
252257
@SuppressFBWarnings(
253258
value = {"PATH_TRAVERSAL_IN", "PATH_TRAVERSAL_OUT"},
254-
justification = "The file name comes from a configuration file."
255-
)
256-
public synchronized void setFile(String fileName, boolean append, boolean bufferedIO, int bufferSize) throws IOException {
259+
justification = "The file name comes from a configuration file.")
260+
public synchronized void setFile(String fileName, boolean append, boolean bufferedIO, int bufferSize)
261+
throws IOException {
257262
LogLog.debug("setFile called: " + fileName + ", " + append);
258263

259264
// It does not make sense to have immediate flush and bufferedIO.

0 commit comments

Comments
 (0)