This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
The following commit(s) were added to refs/heads/main by this push:
new 3489c7e Reformat using Palantir formatter
3489c7e is described below
commit 3489c7ed74e8ccc28ff767c128ef93553b2faf3c
Author: Spotless <[email protected]>
AuthorDate: Mon Dec 4 10:42:33 2023 +0100
Reformat using Palantir formatter
---
.../log4j/samples/async/Log4J2AsyncLogger.java | 11 ++-
.../async/Log4J2AsyncLoggerExceptionExample.java | 1 -
.../samples/configuration/CustomConfiguration.java | 8 +-
.../configuration/CustomConfigurationFactory.java | 6 +-
.../logging/log4j/samples/app/LogEventFactory.java | 16 ++--
.../logging/log4j/samples/app/LoggingApp.java | 6 +-
.../log4j/samples/app/LoggingController.java | 98 +++++++++++-----------
.../log4j/samples/app/MockEventsSupplier.java | 9 +-
.../logging/log4j/samples/dto/Constraint.java | 1 -
.../logging/log4j/samples/dto/RequestContext.java | 19 ++---
.../apache/logging/log4j/samples/events/Alert.java | 1 -
.../log4j/samples/events/ChangePassword.java | 1 -
.../apache/logging/log4j/samples/events/Login.java | 2 -
.../log4j/samples/events/ScheduledTransaction.java | 3 -
.../logging/log4j/samples/events/Transfer.java | 3 -
.../apache/logging/log4j/samples/jlink/Main.java | 1 -
.../apache/logging/log4j/lookup/CustomLookup.java | 3 -
.../logging/log4j/lookup/CustomMapMessage.java | 2 -
.../logging/log4j/lookup/MapMessageLookup.java | 3 -
.../apache/logging/log4j/CustomPropertiesTest.java | 3 -
.../apache/logging/log4j/MapMessageLookupTest.java | 18 ++--
.../log4j/server/AbstractLogEventBridge.java | 2 -
.../logging/log4j/server/AbstractSocketServer.java | 32 ++++---
.../log4j/server/InputStreamLogEventBridge.java | 7 +-
.../org/apache/logging/log4j/server/JmsServer.java | 34 +++++---
.../server/JsonInputStreamLogEventBridge.java | 41 +++++----
.../logging/log4j/server/LogEventBridge.java | 1 -
.../server/ObjectInputStreamLogEventBridge.java | 3 +-
.../log4j/server/SecureTcpSocketServer.java | 19 +++--
.../logging/log4j/server/TcpSocketServer.java | 51 ++++++-----
.../logging/log4j/server/UdpSocketServer.java | 15 ++--
.../log4j/server/XmlInputStreamLogEventBridge.java | 4 +-
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 9 +-
.../log4j/server/mom/jms/JmsQueueReceiver.java | 5 +-
.../log4j/server/mom/jms/JmsTopicReceiver.java | 5 +-
.../log4j/server/AbstractSocketServerTest.java | 60 ++++++-------
.../log4j/server/SslXmlSocketServerTest.java | 37 ++++----
.../log4j/server/TcpJsonSocketServerTest.java | 2 -
.../log4j/server/TcpXmlSocketServerTest.java | 6 +-
.../log4j/server/UdpJsonSocketServerTest.java | 2 -
.../log4j/server/UdpXmlSocketServerTest.java | 5 +-
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 2 -
.../mom/activemq/ActiveMqBrokerServiceRule.java | 20 +++--
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 19 +++--
.../cloud/config/sample/SampleApplication.java | 3 +-
.../sample/config/GlobalExceptionHandler.java | 2 -
.../cloud/config/sample/config/WebMvcConfig.java | 2 -
.../config/sample/controller/K8SController.java | 9 +-
.../config/sample/controller/SampleController.java | 13 ++-
.../utils/spring/SampleResponseErrorHandler.java | 5 +-
.../service/config/SecurityConfiguration.java | 4 +-
.../service/ConfigServiceApplicationTest.java | 4 +-
52 files changed, 305 insertions(+), 333 deletions(-)
diff --git
a/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLogger.java
b/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLogger.java
index 8c4d1af..124961f 100644
---
a/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLogger.java
+++
b/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLogger.java
@@ -27,25 +27,24 @@ public class Log4J2AsyncLogger {
Log4J2AsyncLogger myLog = new Log4J2AsyncLogger();
myLog.getLog("Log4j2 Log");
-
}
- private void getLog(String param){
+ private void getLog(String param) {
logger.info("This is a info log");
// Previously, need to check the log level log to increase performance
- if(logger.isDebugEnabled()){
+ if (logger.isDebugEnabled()) {
logger.debug("This is debug log with param : " + param);
}
- if(logger.isWarnEnabled()){
+ if (logger.isWarnEnabled()) {
logger.info("This is warn log with param : " + param);
}
// In Java 8, No need to check the log level, we can do this
- while (true) //for test rolling file
- logger.debug("Hello print {}", () -> getValue());
+ while (true) // for test rolling file
+ logger.debug("Hello print {}", () -> getValue());
}
static String getValue() {
diff --git
a/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLoggerExceptionExample.java
b/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLoggerExceptionExample.java
index a454566..033bcb0 100644
---
a/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLoggerExceptionExample.java
+++
b/log4j-samples-asynclogger/src/main/java/org/apache/logging/log4j/samples/async/Log4J2AsyncLoggerExceptionExample.java
@@ -35,5 +35,4 @@ public class Log4J2AsyncLoggerExceptionExample {
static int getException() throws IllegalArgumentException {
throw new IllegalArgumentException("Hello, Something Went Wrong.
Exception Occured!!");
}
-
}
diff --git
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
index 93fab21..880cf7d 100644
---
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
+++
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.samples.configuration;
import java.io.Serializable;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Layout;
@@ -73,12 +72,11 @@ public class CustomConfiguration extends
AbstractConfiguration {
root.addAppender(appender, null, null);
final String levelName =
PropertiesUtil.getProperties().getStringProperty(DEFAULT_LEVEL);
- final Level level = levelName != null && Level.valueOf(levelName) !=
null ?
- Level.valueOf(levelName) : Level.ERROR;
+ final Level level =
+ levelName != null && Level.valueOf(levelName) != null ?
Level.valueOf(levelName) : Level.ERROR;
root.setLevel(level);
}
@Override
- protected void doConfigure() {
- }
+ protected void doConfigure() {}
}
diff --git
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
index feefe6b..af5ee4a 100644
---
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
+++
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
@@ -16,9 +16,8 @@
*/
package org.apache.logging.log4j.samples.configuration;
-import java.net.URI;
-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.net.URI;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
@@ -49,7 +48,8 @@ public class CustomConfigurationFactory extends
ConfigurationFactory {
}
@Override
- public Configuration getConfiguration(final LoggerContext loggerContext,
final String name, final URI configLocation) {
+ public Configuration getConfiguration(
+ final LoggerContext loggerContext, final String name, final URI
configLocation) {
return new CustomConfiguration(loggerContext);
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
index 517cdf1..5e3a808 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-
import org.apache.logging.log4j.EventLogger;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.samples.dto.AuditEvent;
@@ -37,8 +36,8 @@ public class LogEventFactory {
final String eventId =
NamingUtils.lowerFirst(intrface.getSimpleName());
final StructuredDataMessage msg = new StructuredDataMessage(eventId,
null, "Audit");
- return (T)Proxy.newProxyInstance(intrface
- .getClassLoader(), new Class<?>[]{intrface}, new AuditProxy(msg,
intrface));
+ return (T) Proxy.newProxyInstance(
+ intrface.getClassLoader(), new Class<?>[] {intrface}, new
AuditProxy(msg, intrface));
}
private static class AuditProxy implements InvocationHandler {
@@ -52,8 +51,7 @@ public class LogEventFactory {
}
@Override
- public Object invoke(final Object o, final Method method, final
Object[] objects)
- throws Throwable {
+ public Object invoke(final Object o, final Method method, final
Object[] objects) throws Throwable {
if (method.getName().equals("logEvent")) {
final StringBuilder missing = new StringBuilder();
@@ -61,8 +59,7 @@ public class LogEventFactory {
final Method[] methods = intrface.getMethods();
for (final Method _method : methods) {
- final String name = NamingUtils.lowerFirst(NamingUtils
- .getMethodShortName(_method.getName()));
+ final String name =
NamingUtils.lowerFirst(NamingUtils.getMethodShortName(_method.getName()));
final Annotation[] annotations =
_method.getDeclaredAnnotations();
for (final Annotation annotation : annotations) {
@@ -78,8 +75,8 @@ public class LogEventFactory {
}
if (missing.length() > 0) {
- throw new IllegalStateException("Event " +
msg.getId().getName() +
- " is missing required attributes " + missing);
+ throw new IllegalStateException(
+ "Event " + msg.getId().getName() + " is missing
required attributes " + missing);
}
EventLogger.logEvent(msg);
}
@@ -99,6 +96,5 @@ public class LogEventFactory {
return null;
}
-
}
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
index b9e4c13..4d2b211 100644
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
@@ -16,17 +16,15 @@
*/
package org.apache.logging.log4j.samples.app;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.List;
import java.util.Random;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.samples.dto.AuditEvent;
import org.apache.logging.log4j.samples.dto.RequestContext;
-
/**
* The Class LoggingApp.
*/
@@ -85,7 +83,6 @@ public class LoggingApp {
}
}
-
public class Worker extends Thread {
private final String member;
@@ -128,7 +125,6 @@ public class LoggingApp {
logger.error("ERROR level logging.....");
}
}
-
}
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
index 6630089..a79f938 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
@@ -16,12 +16,10 @@
*/
package org.apache.logging.log4j.samples.app;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.List;
import java.util.Random;
-
import javax.servlet.http.HttpServletRequest;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
@@ -35,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
-
/**
* The Class LoggingController.
*/
@@ -57,10 +54,10 @@ public class LoggingController {
@RequestMapping(value = "/start.do", method = RequestMethod.GET)
public ModelAndView startLogging(
- @RequestParam(value = "member", required = false, defaultValue =
"fakemember") final String member,
- @RequestParam(value = "interval", required = false, defaultValue =
"1000") final String interval,
- @RequestParam(value = "threads", required = false, defaultValue = "1")
final String threadCount,
- final HttpServletRequest servletRequest) {
+ @RequestParam(value = "member", required = false, defaultValue =
"fakemember") final String member,
+ @RequestParam(value = "interval", required = false, defaultValue =
"1000") final String interval,
+ @RequestParam(value = "threads", required = false, defaultValue =
"1") final String threadCount,
+ final HttpServletRequest servletRequest) {
int numThreads = 1;
if (Strings.isNotEmpty(threadCount)) {
try {
@@ -87,50 +84,50 @@ public class LoggingController {
for (int i = 0; i < numThreads; ++i) {
(new Thread() {
- @Override
- public void run() {
- ThreadContext.clearMap();
-
- RequestContext.setSessionId("session1234");
- RequestContext.setIpAddress("127.0.0.1");
- RequestContext.setClientId("02121");
- RequestContext.setProductName("IB");
- RequestContext.setProductVersion("4.18.1");
- RequestContext.setLocale("en_US");
- RequestContext.setRegion("prod");
- while (generateLog) {
- // Generate rand number between 1 to 10
- final int rand = ran.nextInt(9) + 1;
-
- // Sleep for rand seconds
- try {
- Thread.sleep(rand * timeBase);
- } catch (final InterruptedException e) {
- logger.warn("WARN", e);
- }
-
- // Write rand number of logs
- for (int i = 0; i < rand; i++) {
- final int eventIndex = ran.nextInt(events.size());
- final AuditEvent event = events.get(eventIndex);
- RequestContext.setUserId(member);
- event.logEvent();
-
- if ((rand % 4) == 1) {
- logger.debug("DEBUG level logging.....");
- } else if ((rand % 4) == 2) {
- logger.info("INFO level logging.....");
- } else if ((rand % 4) == 3) {
- logger.warn("WARN level logging.....");
- } else {
- logger.error("ERROR level logging.....");
+ @Override
+ public void run() {
+ ThreadContext.clearMap();
+
+ RequestContext.setSessionId("session1234");
+ RequestContext.setIpAddress("127.0.0.1");
+ RequestContext.setClientId("02121");
+ RequestContext.setProductName("IB");
+ RequestContext.setProductVersion("4.18.1");
+ RequestContext.setLocale("en_US");
+ RequestContext.setRegion("prod");
+ while (generateLog) {
+ // Generate rand number between 1 to 10
+ final int rand = ran.nextInt(9) + 1;
+
+ // Sleep for rand seconds
+ try {
+ Thread.sleep(rand * timeBase);
+ } catch (final InterruptedException e) {
+ logger.warn("WARN", e);
+ }
+
+ // Write rand number of logs
+ for (int i = 0; i < rand; i++) {
+ final int eventIndex =
ran.nextInt(events.size());
+ final AuditEvent event =
events.get(eventIndex);
+ RequestContext.setUserId(member);
+ event.logEvent();
+
+ if ((rand % 4) == 1) {
+ logger.debug("DEBUG level
logging.....");
+ } else if ((rand % 4) == 2) {
+ logger.info("INFO level logging.....");
+ } else if ((rand % 4) == 3) {
+ logger.warn("WARN level logging.....");
+ } else {
+ logger.error("ERROR level
logging.....");
+ }
+ }
}
+ ThreadContext.cloneStack();
}
-
- }
- ThreadContext.cloneStack();
- }
- }).start();
+ })
+ .start();
}
return new ModelAndView("start.jsp");
@@ -141,5 +138,4 @@ public class LoggingController {
generateLog = false;
return new ModelAndView("stop.jsp");
}
-
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
index d9ec21c..382bed3 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
@@ -16,11 +16,10 @@
*/
package org.apache.logging.log4j.samples.app;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.logging.log4j.samples.dto.AuditEvent;
import org.apache.logging.log4j.samples.events.Alert;
import org.apache.logging.log4j.samples.events.ChangePassword;
@@ -38,7 +37,6 @@ public class MockEventsSupplier {
final List<AuditEvent> events = new ArrayList<>();
-
final Login login = LogEventFactory.getEvent(Login.class);
login.setStartPageOption("account summary");
login.setSource("online");
@@ -74,12 +72,11 @@ public class MockEventsSupplier {
alert.setMember(member);
events.add(alert);
- final ScheduledTransaction scheduledTransaction = LogEventFactory
- .getEvent(ScheduledTransaction.class);
+ final ScheduledTransaction scheduledTransaction =
LogEventFactory.getEvent(ScheduledTransaction.class);
scheduledTransaction.setAction("add");
scheduledTransaction.setFromAccount("REPLACE"); // getAccount(mbr,
- // accounts));
+ // accounts));
scheduledTransaction.setToAccount("REPLACE"); // "9200000214");
scheduledTransaction.setAmount("2541");
scheduledTransaction.setStartDate("20110105");
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
index 3567b2b..48aed58 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
@@ -20,7 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
import org.apache.logging.log4j.util.Strings;
@Target(ElementType.METHOD)
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
index 6632c1b..e2d1750 100644
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
@@ -24,8 +24,7 @@ import org.apache.logging.log4j.core.util.UuidUtil;
*/
public final class RequestContext {
- private RequestContext() {
- }
+ private RequestContext() {}
// Unique token to identify this request.
public static final String REQUEST_ID = "id";
// Token used to correlate multiple events within the request.
@@ -73,7 +72,7 @@ public final class RequestContext {
}
public static void setTransId(final String id) {
- ThreadContext.put(TRANSACTION_ID, id);
+ ThreadContext.put(TRANSACTION_ID, id);
}
public static String getTransId() {
@@ -81,7 +80,7 @@ public final class RequestContext {
}
public static void setRequestURI(final String URI) {
- ThreadContext.put(REQUEST_URI, URI);
+ ThreadContext.put(REQUEST_URI, URI);
}
public static String getRequestURI() {
@@ -89,7 +88,7 @@ public final class RequestContext {
}
public static void setLoginId(final String id) {
- ThreadContext.put(LOGIN_ID, id);
+ ThreadContext.put(LOGIN_ID, id);
}
public static String getLoginId() {
@@ -97,7 +96,7 @@ public final class RequestContext {
}
public static void setUserId(final String id) {
- ThreadContext.put(USER_ID, id);
+ ThreadContext.put(USER_ID, id);
}
public static String getUserId() {
@@ -105,7 +104,7 @@ public final class RequestContext {
}
public static void setUserType(final String type) {
- ThreadContext.put(USER_TYPE, type);
+ ThreadContext.put(USER_TYPE, type);
}
public static String getUserType() {
@@ -113,7 +112,7 @@ public final class RequestContext {
}
public static void setClientId(final String id) {
- ThreadContext.put(CLIENT_ID, id);
+ ThreadContext.put(CLIENT_ID, id);
}
public static String getClientId() {
@@ -121,7 +120,7 @@ public final class RequestContext {
}
public static void setIpAddress(final String addr) {
- ThreadContext.put(IP_ADDRESS, addr);
+ ThreadContext.put(IP_ADDRESS, addr);
}
public static String getIpAddress() {
@@ -136,7 +135,6 @@ public final class RequestContext {
return ThreadContext.get(PRODUCT_NAME);
}
-
public static void setProductVersion(final String productVersion) {
ThreadContext.put(PRODUCT_VERSION, productVersion);
}
@@ -168,5 +166,4 @@ public final class RequestContext {
public static String getUserAgent() {
return ThreadContext.get(USER_AGENT);
}
-
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
index 7c75628..fc476c0 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
@@ -22,7 +22,6 @@ import org.apache.logging.log4j.samples.dto.Constraint;
/**
* The user sets up account balance alerts.
*/
-
public interface Alert extends AuditEvent {
/**
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
index ca96ca7..c38b54b 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
@@ -22,7 +22,6 @@ import org.apache.logging.log4j.samples.dto.Constraint;
/**
* Member change their password.
*/
-
public interface ChangePassword extends AuditEvent {
/**
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
index 62f533c..826b056 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.samples.dto.AuditEvent;
/**
* Member logged in successfully.
*/
-
public interface Login extends AuditEvent {
/**
@@ -44,5 +43,4 @@ public interface Login extends AuditEvent {
* @param startPageOption Chosen start page destination for IB login.
*/
void setStartPageOption(String startPageOption);
-
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
index be8228e..70e13ec 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.samples.dto.AuditEvent;
/**
* Member set up scheduled transaction request.
*/
-
public interface ScheduledTransaction extends AuditEvent {
/**
@@ -125,6 +124,4 @@ public interface ScheduledTransaction extends AuditEvent {
* @param toAccount Target account or account that will receive funds in a
transfer.
*/
void setToAccount(String toAccount);
-
-
}
diff --git
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
index e679449..3cdf83c 100755
---
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
+++
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
@@ -22,7 +22,6 @@ import org.apache.logging.log4j.samples.dto.Constraint;
/**
* Member requested transfer.
*/
-
public interface Transfer extends AuditEvent {
/**
@@ -168,6 +167,4 @@ public interface Transfer extends AuditEvent {
* @param type Type of event, bill payment, balance, application, or
attribute. For bill pay, type of payment (check, electronic)
*/
void setType(String type);
-
-
}
diff --git
a/log4j-samples-jlink/src/main/java/org/apache/logging/log4j/samples/jlink/Main.java
b/log4j-samples-jlink/src/main/java/org/apache/logging/log4j/samples/jlink/Main.java
index f28dc76..9e5b8d5 100644
---
a/log4j-samples-jlink/src/main/java/org/apache/logging/log4j/samples/jlink/Main.java
+++
b/log4j-samples-jlink/src/main/java/org/apache/logging/log4j/samples/jlink/Main.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.samples.jlink;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git
a/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
b/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
index 5111454..f0b35a6 100644
---
a/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
+++
b/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.lookup;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
@@ -32,7 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
*
*/
-
@Plugin(name = "custom", category = StrLookup.CATEGORY)
public class CustomLookup extends AbstractLookup {
@@ -80,5 +78,4 @@ public class CustomLookup extends AbstractLookup {
public static void setLoggerProperties(final String loggerName, final
Map<String, String> properties) {
loggerProperties.put(loggerName, properties);
}
-
}
diff --git
a/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
b/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
index 075ccfd..4b64e05 100644
---
a/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
+++
b/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.lookup;
import java.util.Map;
import java.util.Objects;
-
import org.apache.logging.log4j.message.AsynchronouslyFormattable;
import org.apache.logging.log4j.message.StringMapMessage;
@@ -71,5 +70,4 @@ public class CustomMapMessage extends StringMapMessage {
public int hashCode() {
return Objects.hash(super.hashCode(), message);
}
-
}
diff --git
a/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
b/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
index b882a7a..a70e9ff 100644
---
a/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
+++
b/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.lookup;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
@@ -34,7 +33,6 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
*
*/
-
@Plugin(name = "mapMessage", category = StrLookup.CATEGORY)
public class MapMessageLookup extends AbstractLookup {
@@ -72,5 +70,4 @@ public class MapMessageLookup extends AbstractLookup {
public static void setLoggerProperties(final String loggerName, final
Map<String, String> properties) {
loggerProperties.put(loggerName, properties);
}
-
}
diff --git
a/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
b/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
index 812d1f8..9409987 100644
---
a/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
+++
b/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import org.apache.logging.log4j.lookup.CustomLookup;
import org.apache.logging.log4j.lookup.CustomMapMessage;
import org.junit.jupiter.api.Test;
@@ -46,6 +45,4 @@ public class CustomPropertiesTest {
loggerProperties.put("key2", "TestValue");
logger.debug(new CustomMapMessage("This is a test", loggerProperties));
}
-
-
}
diff --git
a/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
b/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
index 89af165..1ca6c37 100644
---
a/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
+++
b/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.logging.log4j;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.HashMap;
import java.util.Map;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.lookup.MapMessageLookup;
@@ -27,13 +28,10 @@ import org.apache.logging.log4j.message.StringMapMessage;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-
/**
* Tests {@link MapMessageLookup}
*/
-public class MapMessageLookupTest
-{
+public class MapMessageLookupTest {
@Test
public void testStructuredDataMessageLookup() {
// GIVEN: A StructuredDataMessage object
@@ -44,7 +42,10 @@ public class MapMessageLookupTest
message.put("C", "c");
// AND: An event with that message
- final LogEvent event =
Log4jLogEvent.newBuilder().setLevel(Level.DEBUG).setMessage(message).build();
+ final LogEvent event = Log4jLogEvent.newBuilder()
+ .setLevel(Level.DEBUG)
+ .setMessage(message)
+ .build();
// AND: A MapMessageLookup object
final MapMessageLookup lookup = new MapMessageLookup();
@@ -70,7 +71,10 @@ public class MapMessageLookupTest
final MapMessage message = new StringMapMessage(values);
// AND: An event with that message
- final LogEvent event =
Log4jLogEvent.newBuilder().setLevel(Level.DEBUG).setMessage(message).build();
+ final LogEvent event = Log4jLogEvent.newBuilder()
+ .setLevel(Level.DEBUG)
+ .setMessage(message)
+ .build();
// AND: A MapMessageLookup object
final MapMessageLookup lookup = new MapMessageLookup();
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractLogEventBridge.java
index afcb1ae..d3a917a 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractLogEventBridge.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
@@ -40,5 +39,4 @@ public abstract class AbstractLogEventBridge<T extends
InputStream> implements L
public T wrapStream(final InputStream inputStream) throws IOException {
return (T) inputStream;
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
index d1b0c7a..fe1e5e5 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
@@ -29,7 +29,6 @@ import java.net.URL;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEventListener;
@@ -55,19 +54,29 @@ public abstract class AbstractSocketServer<T extends
InputStream> extends LogEve
protected static class CommandLineArguments extends
BasicCommandLineArguments {
- @Option(names = { "--config", "-c" }, description = "Log4j
configuration file location (path or URL).")
+ @Option(
+ names = {"--config", "-c"},
+ description = "Log4j configuration file location (path or
URL).")
private String configLocation;
- @Option(names = { "--interactive", "-i" }, description = "Accepts
commands on standard input (\"exit\" is the only command).")
+ @Option(
+ names = {"--interactive", "-i"},
+ description = "Accepts commands on standard input (\"exit\" is
the only command).")
private boolean interactive;
- @Option(names = { "--port", "-p" }, description = "The server port
number, or 0 to automatically allocate a port number.")
+ @Option(
+ names = {"--port", "-p"},
+ description = "The server port number, or 0 to automatically
allocate a port number.")
private int port;
- @Option(names = { "--localbindaddress", "-a" }, description = "Server
socket local bind address.")
+ @Option(
+ names = {"--localbindaddress", "-a"},
+ description = "Server socket local bind address.")
private InetAddress localBindAddress;
- @Option(names = {"--classes", "-C"}, description = "Additional classes
to allow deserialization")
+ @Option(
+ names = {"--classes", "-C"},
+ description = "Additional classes to allow deserialization")
private List<String> allowedClasses;
String getConfigLocation() {
@@ -123,8 +132,8 @@ public abstract class AbstractSocketServer<T extends
InputStream> extends LogEve
}
@Override
- public Configuration getConfiguration(final LoggerContext
loggerContext, final String name,
- final URI configLocation) {
+ public Configuration getConfiguration(
+ final LoggerContext loggerContext, final String name, final
URI configLocation) {
if (Strings.isNotEmpty(path)) {
File file = null;
ConfigurationSource source = null;
@@ -204,14 +213,13 @@ public abstract class AbstractSocketServer<T extends
InputStream> extends LogEve
while (true) {
final String line = reader.readLine();
if (line == null
- || line.equalsIgnoreCase("quit")
- || line.equalsIgnoreCase("stop")
- || line.equalsIgnoreCase("exit")) {
+ || line.equalsIgnoreCase("quit")
+ || line.equalsIgnoreCase("stop")
+ || line.equalsIgnoreCase("exit")) {
this.shutdown();
serverThread.join();
break;
}
}
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
index cc2ffdd..99ac0e5 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.server;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
import org.apache.logging.log4j.core.parser.ParseException;
@@ -39,14 +38,15 @@ public abstract class InputStreamLogEventBridge extends
AbstractLogEventBridge<I
private final TextLogEventParser parser;
- public InputStreamLogEventBridge(final TextLogEventParser parser, final
int bufferSize, final Charset charset, final String eventEndMarker) {
+ public InputStreamLogEventBridge(
+ final TextLogEventParser parser, final int bufferSize, final
Charset charset, final String eventEndMarker) {
this.bufferSize = bufferSize;
this.charset = charset;
this.eventEndMarker = eventEndMarker;
this.parser = parser;
}
- abstract protected int[] getEventIndices(final String text, int
beginIndex);
+ protected abstract int[] getEventIndices(final String text, int
beginIndex);
@Override
public void logEvents(final InputStream inputStream, final
LogEventListener logEventListener)
@@ -104,5 +104,4 @@ public abstract class InputStreamLogEventBridge extends
AbstractLogEventBridge<I
return "InputStreamLogEventBridge [bufferSize=" + bufferSize + ",
charset=" + charset + ", eventEndMarker="
+ eventEndMarker + ", parser=" + parser + "]";
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index f586824..5c2b171 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -23,13 +23,11 @@ import java.nio.charset.Charset;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.ObjectMessage;
-
import org.apache.logging.log4j.LoggingException;
import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LifeCycle;
@@ -50,14 +48,26 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
private final JmsManager jmsManager;
private MessageConsumer messageConsumer;
- public JmsServer(final String connectionFactoryBindingName, final String
connectionFactoryName,
- final String providerURL, final String destinationBindingName,
final String username, final char[] password,
+ public JmsServer(
+ final String connectionFactoryBindingName,
+ final String connectionFactoryName,
+ final String providerURL,
+ final String destinationBindingName,
+ final String username,
+ final char[] password,
final Properties jndiProperties) {
final String managerName = JmsServer.class.getName() + '@' +
JmsServer.class.hashCode();
- final Properties jndiManager =
JndiManager.createProperties(connectionFactoryBindingName, providerURL, null,
- null, null, jndiProperties);
- jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryName, destinationBindingName,
- username, password, false,
JmsAppender.Builder.DEFAULT_RECONNECT_INTERVAL_MILLIS);
+ final Properties jndiManager = JndiManager.createProperties(
+ connectionFactoryBindingName, providerURL, null, null, null,
jndiProperties);
+ jmsManager = JmsManager.getJmsManager(
+ managerName,
+ jndiManager,
+ connectionFactoryName,
+ destinationBindingName,
+ username,
+ password,
+ false,
+ JmsAppender.Builder.DEFAULT_RECONNECT_INTERVAL_MILLIS);
}
@Override
@@ -76,7 +86,9 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
LOGGER.warn("Expected ObjectMessage to contain LogEvent.
Got type {} instead.", body.getClass());
}
} else {
- LOGGER.warn("Received message of type {} and JMSType {} which
cannot be handled.", message.getClass(),
+ LOGGER.warn(
+ "Received message of type {} and JMSType {} which
cannot be handled.",
+ message.getClass(),
message.getJMSType());
}
} catch (final JMSException e) {
@@ -85,8 +97,7 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
}
@Override
- public void initialize() {
- }
+ public void initialize() {}
@Override
public void start() {
@@ -144,5 +155,4 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
}
}
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
index 1cae6e6..aed03b3 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.InputStream;
import java.nio.charset.Charset;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.jackson.json.parser.JsonLogEventParser;
import org.apache.logging.log4j.util.Chars;
@@ -28,7 +27,7 @@ import org.apache.logging.log4j.util.Chars;
*/
public class JsonInputStreamLogEventBridge extends InputStreamLogEventBridge {
- private static final int[] END_PAIR = new int[] { END, END };
+ private static final int[] END_PAIR = new int[] {END, END};
private static final char EVENT_END_MARKER = '}';
private static final char EVENT_START_MARKER = '{';
private static final char JSON_ESC = '\\';
@@ -39,8 +38,7 @@ public class JsonInputStreamLogEventBridge extends
InputStreamLogEventBridge {
}
public JsonInputStreamLogEventBridge(final int bufferSize, final Charset
charset) {
- super(new JsonLogEventParser(), bufferSize, charset,
- String.valueOf(EVENT_END_MARKER));
+ super(new JsonLogEventParser(), bufferSize, charset,
String.valueOf(EVENT_END_MARKER));
}
@Override
@@ -61,29 +59,28 @@ public class JsonInputStreamLogEventBridge extends
InputStreamLogEventBridge {
inEsc = false;
} else {
switch (c) {
- case EVENT_START_MARKER:
- if (!inStr) {
- stack++;
- }
- break;
- case EVENT_END_MARKER:
- if (!inStr) {
- stack--;
- }
- break;
- case JSON_STR_DELIM:
- inStr = !inStr;
- break;
- case JSON_ESC:
- inEsc = true;
- break;
+ case EVENT_START_MARKER:
+ if (!inStr) {
+ stack++;
+ }
+ break;
+ case EVENT_END_MARKER:
+ if (!inStr) {
+ stack--;
+ }
+ break;
+ case JSON_STR_DELIM:
+ inStr = !inStr;
+ break;
+ case JSON_ESC:
+ inEsc = true;
+ break;
}
if (stack == 0) {
- return new int[] { start, i };
+ return new int[] {start, i};
}
}
}
return END_PAIR;
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/LogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/LogEventBridge.java
index b8d2b15..cb1384d 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/LogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/LogEventBridge.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
import org.apache.logging.log4j.core.parser.ParseException;
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index 0fc5096..a6d02ac 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.util.Collections;
import java.util.List;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
import org.apache.logging.log4j.util.FilteredObjectInputStream;
@@ -53,7 +52,7 @@ public class ObjectInputStreamLogEventBridge extends
AbstractLogEventBridge<Obje
@Override
public void logEvents(final ObjectInputStream inputStream, final
LogEventListener logEventListener)
- throws IOException {
+ throws IOException {
try {
logEventListener.log((LogEvent) inputStream.readObject());
} catch (final ClassNotFoundException e) {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
index 580d6b7..37df41a 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
/**
@@ -29,13 +28,21 @@ import
org.apache.logging.log4j.core.net.ssl.SslConfiguration;
*/
public class SecureTcpSocketServer<T extends InputStream> extends
TcpSocketServer<T> {
- public static SecureTcpSocketServer<InputStream> createJsonServer(final
int port, final SslConfiguration sslConfiguration) throws IOException {
+ public static SecureTcpSocketServer<InputStream> createJsonServer(
+ final int port, final SslConfiguration sslConfiguration) throws
IOException {
return new SecureTcpSocketServer<>(port, null, new
JsonInputStreamLogEventBridge(), sslConfiguration);
}
- public SecureTcpSocketServer(final int port, final String configLocation,
final LogEventBridge<T> logEventInput,
- final SslConfiguration sslConfig) throws IOException {
- super(port, configLocation, logEventInput,
sslConfig.getSslServerSocketFactory().createServerSocket(port));
+ public SecureTcpSocketServer(
+ final int port,
+ final String configLocation,
+ final LogEventBridge<T> logEventInput,
+ final SslConfiguration sslConfig)
+ throws IOException {
+ super(
+ port,
+ configLocation,
+ logEventInput,
+
sslConfig.getSslServerSocketFactory().createServerSocket(port));
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 9224f79..c54c947 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -26,7 +26,6 @@ import java.net.Socket;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.parser.ParseException;
import org.apache.logging.log4j.core.tools.picocli.CommandLine;
@@ -49,7 +48,9 @@ public class TcpSocketServer<T extends InputStream> extends
AbstractSocketServer
@Command(name = "TcpSocketServer")
protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
- @Option(names = { "--backlog", "-b" }, description = "Server socket
backlog. Must be a positive integer.")
+ @Option(
+ names = {"--backlog", "-b"},
+ description = "Server socket backlog. Must be a positive
integer.")
// Same default as ServerSocket
private int backlog = 50;
@@ -124,8 +125,8 @@ public class TcpSocketServer<T extends InputStream> extends
AbstractSocketServer
*/
public static TcpSocketServer<InputStream> createJsonSocketServer(final
int port) throws IOException {
LOGGER.traceEntry(null, port);
- final TcpSocketServer<InputStream> socketServer = new
TcpSocketServer<>(port,
- null, new JsonInputStreamLogEventBridge());
+ final TcpSocketServer<InputStream> socketServer =
+ new TcpSocketServer<>(port, null, new
JsonInputStreamLogEventBridge());
return LOGGER.traceExit(socketServer);
}
@@ -143,11 +144,12 @@ public class TcpSocketServer<T extends InputStream>
extends AbstractSocketServer
* if an I/O error occurs when opening the socket.
* @since 2.9
*/
- public static TcpSocketServer<InputStream> createJsonSocketServer(final
int port, final int backlog,
- final InetAddress localBindAddress, final String configLocation)
throws IOException {
+ public static TcpSocketServer<InputStream> createJsonSocketServer(
+ final int port, final int backlog, final InetAddress
localBindAddress, final String configLocation)
+ throws IOException {
LOGGER.traceEntry(null, port, backlog, localBindAddress);
- final TcpSocketServer<InputStream> socketServer = new
TcpSocketServer<>(port, backlog, localBindAddress,
- configLocation, new JsonInputStreamLogEventBridge());
+ final TcpSocketServer<InputStream> socketServer = new
TcpSocketServer<>(
+ port, backlog, localBindAddress, configLocation, new
JsonInputStreamLogEventBridge());
return LOGGER.traceExit(socketServer);
}
@@ -162,8 +164,8 @@ public class TcpSocketServer<T extends InputStream> extends
AbstractSocketServer
*/
public static TcpSocketServer<InputStream> createXmlSocketServer(final int
port) throws IOException {
LOGGER.traceEntry(null, port);
- final TcpSocketServer<InputStream> socketServer = new
TcpSocketServer<>(port,
- null, new XmlInputStreamLogEventBridge());
+ final TcpSocketServer<InputStream> socketServer =
+ new TcpSocketServer<>(port, null, new
XmlInputStreamLogEventBridge());
return LOGGER.traceExit(socketServer);
}
@@ -181,12 +183,11 @@ public class TcpSocketServer<T extends InputStream>
extends AbstractSocketServer
* if an I/O error occurs when opening the socket.
* @since 2.9
*/
- public static TcpSocketServer<InputStream> createXmlSocketServer(final int
port,
- final int backlog, final InetAddress localBindAddress
- ) throws IOException {
+ public static TcpSocketServer<InputStream> createXmlSocketServer(
+ final int port, final int backlog, final InetAddress
localBindAddress) throws IOException {
LOGGER.traceEntry(null, port);
- final TcpSocketServer<InputStream> socketServer = new
TcpSocketServer<>(port, backlog, localBindAddress, null,
- new XmlInputStreamLogEventBridge());
+ final TcpSocketServer<InputStream> socketServer =
+ new TcpSocketServer<>(port, backlog, localBindAddress, null,
new XmlInputStreamLogEventBridge());
return LOGGER.traceExit(socketServer);
}
@@ -239,7 +240,13 @@ public class TcpSocketServer<T extends InputStream>
extends AbstractSocketServer
* @since 2.7
*/
@SuppressWarnings("resource")
- public TcpSocketServer(final int port, final int backlog, final
InetAddress localBindAddress, final String configLocation, final
LogEventBridge<T> logEventInput) throws IOException {
+ public TcpSocketServer(
+ final int port,
+ final int backlog,
+ final InetAddress localBindAddress,
+ final String configLocation,
+ final LogEventBridge<T> logEventInput)
+ throws IOException {
this(port, configLocation, logEventInput, new ServerSocket(port,
backlog, localBindAddress));
}
@@ -254,7 +261,8 @@ public class TcpSocketServer<T extends InputStream> extends
AbstractSocketServer
* if an I/O error occurs when opening the socket.
*/
@SuppressWarnings("resource")
- public TcpSocketServer(final int port, final String configLocation, final
LogEventBridge<T> logEventInput) throws IOException {
+ public TcpSocketServer(final int port, final String configLocation, final
LogEventBridge<T> logEventInput)
+ throws IOException {
this(port, configLocation, logEventInput, new ServerSocket(port));
}
@@ -270,8 +278,11 @@ public class TcpSocketServer<T extends InputStream>
extends AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
- public TcpSocketServer(final int port, final String configLocation, final
LogEventBridge<T> logEventInput,
- final ServerSocket serverSocket)
+ public TcpSocketServer(
+ final int port,
+ final String configLocation,
+ final LogEventBridge<T> logEventInput,
+ final ServerSocket serverSocket)
throws IOException {
super(port, logEventInput);
this.serverSocket = serverSocket;
@@ -334,7 +345,7 @@ public class TcpSocketServer<T extends InputStream> extends
AbstractSocketServer
public void shutdown() throws IOException {
final EntryMessage entry = logger.traceEntry();
setActive(false);
- //Thread.currentThread().interrupt();
+ // Thread.currentThread().interrupt();
serverSocket.close();
logger.traceExit(entry);
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 4d93889..0e503e4 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.io.OptionalDataException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
-
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.parser.ParseException;
import org.apache.logging.log4j.core.tools.picocli.CommandLine;
@@ -47,7 +46,8 @@ public class UdpSocketServer<T extends InputStream> extends
AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
- public static UdpSocketServer<InputStream> createJsonSocketServer(final
int port, final String configLocation) throws IOException {
+ public static UdpSocketServer<InputStream> createJsonSocketServer(final
int port, final String configLocation)
+ throws IOException {
return new UdpSocketServer<>(port, configLocation, new
JsonInputStreamLogEventBridge());
}
@@ -60,7 +60,8 @@ public class UdpSocketServer<T extends InputStream> extends
AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
- public static UdpSocketServer<InputStream> createXmlSocketServer(final int
port, final String configLocation) throws IOException {
+ public static UdpSocketServer<InputStream> createXmlSocketServer(final int
port, final String configLocation)
+ throws IOException {
return new UdpSocketServer<>(port, configLocation, new
XmlInputStreamLogEventBridge());
}
@@ -107,7 +108,8 @@ public class UdpSocketServer<T extends InputStream> extends
AbstractSocketServer
* @throws IOException
* If an error occurs.
*/
- public UdpSocketServer(final int port, final String configLocation, final
LogEventBridge<T> logEventInput) throws IOException {
+ public UdpSocketServer(final int port, final String configLocation, final
LogEventBridge<T> logEventInput)
+ throws IOException {
super(port, logEventInput);
this.datagramSocket = new DatagramSocket(port);
this.configLocation = configLocation;
@@ -127,7 +129,8 @@ public class UdpSocketServer<T extends InputStream> extends
AbstractSocketServer
final byte[] buf = new byte[maxBufferSize];
final DatagramPacket packet = new DatagramPacket(buf,
buf.length);
datagramSocket.receive(packet);
- final ByteArrayInputStream bais = new
ByteArrayInputStream(packet.getData(), packet.getOffset(), packet.getLength());
+ final ByteArrayInputStream bais =
+ new ByteArrayInputStream(packet.getData(),
packet.getOffset(), packet.getLength());
logEventInput.logEvents(logEventInput.wrapStream(bais), this);
} catch (final OptionalDataException e) {
if (datagramSocket.isClosed()) {
@@ -159,7 +162,7 @@ public class UdpSocketServer<T extends InputStream> extends
AbstractSocketServer
@Override
public void shutdown() {
this.setActive(false);
- //Thread.currentThread().interrupt();
+ // Thread.currentThread().interrupt();
datagramSocket.close();
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
index f9c3a8f..8dcaf02 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.InputStream;
import java.nio.charset.Charset;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.jackson.xml.parser.XmlLogEventParser;
@@ -48,7 +47,6 @@ public class XmlInputStreamLogEventBridge extends
InputStreamLogEventBridge {
startLen = EVENT_START_NS_N.length();
}
final int end = start < 0 ? -1 : text.indexOf(EVENT_END, start +
startLen);
- return new int[] { start, end };
+ return new int[] {start, end};
}
-
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/AbstractJmsReceiver.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/AbstractJmsReceiver.java
index 7cc9cd3..93f4063 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/AbstractJmsReceiver.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/AbstractJmsReceiver.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.server.mom.jms;
import java.util.Properties;
-
import org.apache.logging.log4j.server.JmsServer;
/**
@@ -27,9 +26,7 @@ import org.apache.logging.log4j.server.JmsServer;
*/
public abstract class AbstractJmsReceiver {
- class CommandLineArgs {
-
- }
+ class CommandLineArgs {}
/**
* Prints out usage information to {@linkplain System#err standard error}.
@@ -58,8 +55,8 @@ public abstract class AbstractJmsReceiver {
for (int index = 5; index < args.length; index += 2) {
properties.put(args[index], args[index + 1]);
}
- final JmsServer server = new JmsServer(args[0], "ConnectionFactory",
args[1], args[2], args[3],
- args[4].toCharArray(), properties);
+ final JmsServer server = new JmsServer(
+ args[0], "ConnectionFactory", args[1], args[2], args[3],
args[4].toCharArray(), properties);
server.start();
if (interactive) {
server.commandLineLoop();
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiver.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiver.java
index 76839df..ee333d6 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiver.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiver.java
@@ -39,7 +39,8 @@ public class JmsQueueReceiver extends AbstractJmsReceiver {
@Override
protected void usage() {
System.err.println("Wrong number of arguments.");
- System.err.println("Usage: java " + JmsQueueReceiver.class.getName()
- + " QueueConnectionFactoryBindingName QueueBindingName username
password [jndiPropertyKey jndiPropertyValue]*");
+ System.err.println(
+ "Usage: java " + JmsQueueReceiver.class.getName()
+ + " QueueConnectionFactoryBindingName QueueBindingName
username password [jndiPropertyKey jndiPropertyValue]*");
}
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsTopicReceiver.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsTopicReceiver.java
index b769b9b..dcb634b 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsTopicReceiver.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/mom/jms/JmsTopicReceiver.java
@@ -39,7 +39,8 @@ public class JmsTopicReceiver extends AbstractJmsReceiver {
@Override
protected void usage() {
System.err.println("Wrong number of arguments.");
- System.err.println("Usage: java " + JmsTopicReceiver.class.getName()
- + " TopicConnectionFactoryBindingName TopicBindingName username
password [jndiPropertyKey jndiPropertyValue]*");
+ System.err.println(
+ "Usage: java " + JmsTopicReceiver.class.getName()
+ + " TopicConnectionFactoryBindingName TopicBindingName
username password [jndiPropertyKey jndiPropertyValue]*");
}
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 096950d..48e2149 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.logging.log4j.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
@@ -42,10 +45,6 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
/**
*
*/
@@ -82,17 +81,17 @@ public abstract class AbstractSocketServerTest {
protected Layout<String> createJsonLayout() {
// @formatter: off
return JsonLayout.newBuilder()
- .setLocationInfo(true)
- .setProperties(true)
- .setPropertiesAsList(false)
- .setComplete(false)
- .setCompact(false)
- .setEventEol(false)
- .setIncludeStacktrace(true)
- .build();
+ .setLocationInfo(true)
+ .setProperties(true)
+ .setPropertiesAsList(false)
+ .setComplete(false)
+ .setCompact(false)
+ .setEventEol(false)
+ .setIncludeStacktrace(true)
+ .build();
// @formatter: on
- //return JsonLayout.createLayout(null, true, true, false, false,
false, false, null, null, null, true);
+ // return JsonLayout.createLayout(null, true, true, false, false,
false, false, null, null, null, true);
}
protected abstract Layout<? extends Serializable> createLayout();
@@ -162,13 +161,11 @@ public abstract class AbstractSocketServerTest {
}
}
-
@Test
public void testMessagesWithSpecialChars() throws Exception {
testServer(MESSAGE_WITH_SPECIAL_CHARS);
}
-
private void testServer(final int size) throws Exception {
final String[] messages = new String[size];
for (int i = 0; i < messages.length; i++) {
@@ -185,7 +182,8 @@ public abstract class AbstractSocketServerTest {
socketAppender.start();
final ListAppender listAppender = new ListAppender("Events",
serverFilter, null, false, false);
listAppender.start();
- final PatternLayout layout = PatternLayout.newBuilder().setPattern("%m
%ex%n").build();
+ final PatternLayout layout =
+ PatternLayout.newBuilder().setPattern("%m %ex%n").build();
final ConsoleAppender console =
ConsoleAppender.createDefaultAppenderForLayout(layout);
final Logger serverLogger = ctx.getLogger(this.getClass().getName());
serverLogger.addAppender(console);
@@ -216,25 +214,27 @@ public abstract class AbstractSocketServerTest {
assertNotNull("No event retrieved", events);
assertEquals("Incorrect number of events received", messages.length,
events.size());
for (int i = 0; i < messages.length; i++) {
- assertTrue("Incorrect event",
events.get(i).getMessage().getFormattedMessage().equals(messages[i]));
+ assertTrue(
+ "Incorrect event",
+
events.get(i).getMessage().getFormattedMessage().equals(messages[i]));
}
}
- protected SocketAppender createSocketAppender(final Filter socketFilter,
- final Layout<? extends Serializable> socketLayout) {
+ protected SocketAppender createSocketAppender(
+ final Filter socketFilter, final Layout<? extends Serializable>
socketLayout) {
// @formatter:off
return SocketAppender.newBuilder()
- .setProtocol(this.protocol)
- .setHost("localhost")
- .setPort(this.port)
- .setReconnectDelayMillis(-1)
- .setName("test")
- .setImmediateFlush(true)
- .setImmediateFail(false)
- .setIgnoreExceptions(false)
- .setLayout(socketLayout).setFilter(socketFilter)
+ .setProtocol(this.protocol)
+ .setHost("localhost")
+ .setPort(this.port)
+ .setReconnectDelayMillis(-1)
+ .setName("test")
+ .setImmediateFlush(true)
+ .setImmediateFail(false)
+ .setIgnoreExceptions(false)
+ .setLayout(socketLayout)
+ .setFilter(socketFilter)
.build();
// @formatter:on
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 2844eda..d5838d5 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
import java.nio.charset.Charset;
-
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LoggerContext;
@@ -41,27 +40,28 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
private static SslConfiguration sslConfiguration;
private static void initServerSocketFactory() throws
StoreConfigurationException {
- final KeyStoreConfiguration ksc = new
KeyStoreConfiguration(TestConstants.KEYSTORE_FILE,
- TestConstants.KEYSTORE_PWD(), TestConstants.KEYSTORE_TYPE,
null);
- final TrustStoreConfiguration tsc = new
TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE,
- TestConstants.TRUSTSTORE_PWD(), null, null);
+ final KeyStoreConfiguration ksc = new KeyStoreConfiguration(
+ TestConstants.KEYSTORE_FILE, TestConstants.KEYSTORE_PWD(),
TestConstants.KEYSTORE_TYPE, null);
+ final TrustStoreConfiguration tsc =
+ new TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE,
TestConstants.TRUSTSTORE_PWD(), null, null);
sslConfiguration = SslConfiguration.createSSLConfiguration(null, ksc,
tsc);
}
@Override
- protected SocketAppender createSocketAppender(final Filter socketFilter,
- final Layout<? extends Serializable> socketLayout) {
+ protected SocketAppender createSocketAppender(
+ final Filter socketFilter, final Layout<? extends Serializable>
socketLayout) {
// @formatter:off
return SocketAppender.newBuilder()
- .setProtocol(this.protocol)
- .setHost("localhost")
- .setPort(this.port)
- .setReconnectDelayMillis(-1)
- .setName("test")
- .setImmediateFlush(true)
- .setImmediateFail(false)
- .setIgnoreExceptions(false)
- .setLayout(socketLayout).setFilter(socketFilter)
+ .setProtocol(this.protocol)
+ .setHost("localhost")
+ .setPort(this.port)
+ .setReconnectDelayMillis(-1)
+ .setName("test")
+ .setImmediateFlush(true)
+ .setImmediateFail(false)
+ .setIgnoreExceptions(false)
+ .setLayout(socketLayout)
+ .setFilter(socketFilter)
.setSslConfiguration(sslConfiguration)
.build();
// @formatter:on
@@ -72,8 +72,8 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
LoggerContext.getContext(false).reconfigure();
initServerSocketFactory();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
- server = new SecureTcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
- Charset.defaultCharset()), sslConfiguration);
+ server = new SecureTcpSocketServer<>(
+ PORT_NUM, new XmlInputStreamLogEventBridge(1024 * 100,
Charset.defaultCharset()), sslConfiguration);
thread = server.startNewThread();
}
@@ -99,5 +99,4 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
protected Layout<String> createLayout() {
return super.createXmlLayout();
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
index d08c71e..222bc43 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.net.Protocol;
@@ -58,5 +57,4 @@ public class TcpJsonSocketServerTest extends
AbstractSocketServerTest {
protected Layout<String> createLayout() {
return super.createJsonLayout();
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
index e243493..b4d343f 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.server;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
-
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.net.Protocol;
@@ -34,8 +33,8 @@ public class TcpXmlSocketServerTest extends
AbstractSocketServerTest {
public static void setupClass() throws Exception {
LoggerContext.getContext(false).reconfigure();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
- server = new TcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
- Charset.defaultCharset()));
+ server =
+ new TcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100, Charset.defaultCharset()));
thread = server.startNewThread();
}
@@ -61,5 +60,4 @@ public class TcpXmlSocketServerTest extends
AbstractSocketServerTest {
protected Layout<String> createLayout() {
return super.createXmlLayout();
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
index 6c7f873..fb06370 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.server;
import java.io.InputStream;
import java.io.Serializable;
-
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.net.Protocol;
@@ -54,5 +53,4 @@ public class UdpJsonSocketServerTest extends
AbstractSocketServerTest {
protected Layout<? extends Serializable> createLayout() {
return super.createJsonLayout();
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpXmlSocketServerTest.java
index 4fd1482..6c2e49e 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpXmlSocketServerTest.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.server;
import java.io.InputStream;
import java.io.Serializable;
import java.nio.charset.Charset;
-
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.net.Protocol;
@@ -34,8 +33,7 @@ public class UdpXmlSocketServerTest extends
AbstractSocketServerTest {
public static void setupClass() throws Exception {
LoggerContext.getContext(false).reconfigure();
// Use a tiny buffer just to test the code, the TCP test uses a large
buffer
- server = new UdpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(100,
- Charset.defaultCharset()));
+ server = new UdpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(100, Charset.defaultCharset()));
thread = server.startNewThread();
}
@@ -57,5 +55,4 @@ public class UdpXmlSocketServerTest extends
AbstractSocketServerTest {
protected Layout<? extends Serializable> createLayout() {
return super.createXmlLayout();
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceHelper.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceHelper.java
index 18da7d3..dc8ca7d 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceHelper.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceHelper.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.server.mom.activemq;
import java.io.IOException;
-
import org.apache.activemq.broker.BrokerService;
/**
@@ -46,5 +45,4 @@ public class ActiveMqBrokerServiceHelper {
brokerService.waitUntilStopped();
}
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
index a6c79ab..c6348af 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
@@ -55,19 +55,24 @@ public class ActiveMqBrokerServiceRule implements TestRule {
@Override
public void evaluate() throws Throwable {
- final BrokerService broker =
ActiveMqBrokerServiceHelper.startBrokerService(brokerName, brokerUrlString,
-
Integer.parseInt(System.getProperty(portPropertyName)));
- logger.debug(TestMarkers.TEST_RULE_LIFE_CYCLE, "{} started
Apache Active MQ {}",
- this.getClass().getSimpleName(), this);
+ final BrokerService broker =
ActiveMqBrokerServiceHelper.startBrokerService(
+ brokerName, brokerUrlString,
Integer.parseInt(System.getProperty(portPropertyName)));
+ logger.debug(
+ TestMarkers.TEST_RULE_LIFE_CYCLE,
+ "{} started Apache Active MQ {}",
+ this.getClass().getSimpleName(),
+ this);
try {
base.evaluate();
} finally {
ActiveMqBrokerServiceHelper.stopBrokerService(broker);
- logger.debug(TestMarkers.TEST_RULE_LIFE_CYCLE, "{} stopped
Apache Active MQ {}",
- this.getClass().getSimpleName(), this);
+ logger.debug(
+ TestMarkers.TEST_RULE_LIFE_CYCLE,
+ "{} stopped Apache Active MQ {}",
+ this.getClass().getSimpleName(),
+ this);
}
}
-
};
}
@@ -89,5 +94,4 @@ public class ActiveMqBrokerServiceRule implements TestRule {
builder.append("]");
return builder.toString();
}
-
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
index fa5838a..84fb54e 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
@@ -25,18 +25,25 @@ import org.junit.rules.RuleChain;
public class JmsQueueReceiverTest {
- private static final AvailablePortSystemPropertyTestRule portRule =
AvailablePortSystemPropertyTestRule
- .create(ActiveMqBrokerServiceRule.PORT_PROPERTY_NAME);
+ private static final AvailablePortSystemPropertyTestRule portRule =
+
AvailablePortSystemPropertyTestRule.create(ActiveMqBrokerServiceRule.PORT_PROPERTY_NAME);
- private static final ActiveMqBrokerServiceRule activeMqBrokerServiceRule =
new ActiveMqBrokerServiceRule(
- JmsQueueReceiverTest.class.getName(), portRule.getName());
+ private static final ActiveMqBrokerServiceRule activeMqBrokerServiceRule =
+ new
ActiveMqBrokerServiceRule(JmsQueueReceiverTest.class.getName(),
portRule.getName());
@ClassRule
public static RuleChain ruleChain = RuleChainFactory.create(portRule,
activeMqBrokerServiceRule);
@Test
public void testMain() throws Exception {
- new JmsQueueReceiver().doMain(false, new String[] {
"org.apache.activemq.jndi.ActiveMQInitialContextFactory",
- "tcp://localhost:" + portRule.getPort(), "testq", "admin",
"admin", "queue.testq", "testq" });
+ new JmsQueueReceiver().doMain(false, new String[] {
+ "org.apache.activemq.jndi.ActiveMQInitialContextFactory",
+ "tcp://localhost:" + portRule.getPort(),
+ "testq",
+ "admin",
+ "admin",
+ "queue.testq",
+ "testq"
+ });
}
}
diff --git
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
index 524e264..ccdc0cb 100644
---
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
+++
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
@@ -23,7 +23,6 @@ import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer
@SpringBootApplication
public class SampleApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
- SpringApplication.run(SampleApplication.class, args);
+ SpringApplication.run(SampleApplication.class, args);
}
-
}
diff --git
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
index 980c8b0..c731194 100644
---
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
+++
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
@@ -23,13 +23,11 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import
org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
-
@ControllerAdvice
public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
private static final Logger LOGGER =
LogManager.getLogger(GlobalExceptionHandler.class);
-
private ResponseEntity<Object> getResponseEntity(Object responseMessage,
HttpStatus httpStatus) {
return new ResponseEntity<>(responseMessage, httpStatus);
}
diff --git
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
index f1064c3..766dd35 100644
---
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
+++
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
@@ -34,6 +34,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
restTemplate.setErrorHandler(new SampleResponseErrorHandler());
return restTemplate;
}
-
-
}
diff --git
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
index 26dbf30..0c2d39a 100644
---
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
+++
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
@@ -16,13 +16,12 @@
*/
package org.apache.logging.log4j.spring.cloud.config.sample.controller;
-import java.nio.file.Paths;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.KubernetesClient;
+import java.nio.file.Paths;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.kubernetes.KubernetesClientBuilder;
@@ -42,6 +41,7 @@ public class K8SController {
private static final Logger LOGGER =
LogManager.getLogger(K8SController.class);
private static final String HOSTNAME = "HOSTNAME";
+
@Autowired
private ObjectMapper objectMapper;
@@ -76,7 +76,8 @@ public class K8SController {
private boolean isServiceAccount() {
return
Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_TOKEN_PATH).toFile().exists()
- &&
Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH).toFile().exists();
+ && Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH)
+ .toFile()
+ .exists();
}
-
}
diff --git
a/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-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
index c7292e0..2487734 100644
---
a/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-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
@@ -16,22 +16,18 @@
*/
package org.apache.logging.log4j.spring.cloud.config.sample.controller;
-
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.util.Timer;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-
-
@RestController
@SuppressFBWarnings({"DM_DEFAULT_ENCODING",
"INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE"})
public class SampleController {
@@ -40,8 +36,9 @@ public class SampleController {
private static int MAX_MESSAGES = 100000;
@GetMapping("/log")
- public ResponseEntity<String> get(@RequestParam(name="threads",
defaultValue="1") int threads,
- @RequestParam(name="messages", defaultValue="100000") int count) {
+ public ResponseEntity<String> get(
+ @RequestParam(name = "threads", defaultValue = "1") int threads,
+ @RequestParam(name = "messages", defaultValue = "100000") int
count) {
if (threads < 1) {
threads = 1;
}
@@ -94,7 +91,7 @@ public class SampleController {
String stackTrace = os.toString();
stackTrace = stackTrace.replaceAll("\n", "<br>");
- //LOGGER.info("Hello, World");
+ // LOGGER.info("Hello, World");
return ResponseEntity.ok(stackTrace);
}
diff --git
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
index 0d45df1..5f95309 100644
---
a/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
+++
b/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.spring.cloud.config.sample.utils.spring;
import java.io.IOException;
-
import org.springframework.http.client.ClientHttpResponse;
/**
@@ -30,7 +29,5 @@ public class SampleResponseErrorHandler implements
org.springframework.web.clien
}
@Override
- public void handleError(ClientHttpResponse clientHttpResponse) throws
IOException {
-
- }
+ public void handleError(ClientHttpResponse clientHttpResponse) throws
IOException {}
}
diff --git
a/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
b/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
index 07a3df0..30b5b89 100644
---
a/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
+++
b/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
@@ -29,8 +29,6 @@ import
org.springframework.security.config.annotation.web.configuration.WebSecur
public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Override
public void configure(WebSecurity web) throws Exception {
- web.ignoring().antMatchers("/health")
- .antMatchers("/metrics")
- .antMatchers("/info");
+
web.ignoring().antMatchers("/health").antMatchers("/metrics").antMatchers("/info");
}
}
diff --git
a/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
b/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
index 5c1b4f0..84483d3 100644
---
a/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
+++
b/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
@@ -23,7 +23,5 @@ import org.springframework.boot.test.context.SpringBootTest;
public class ConfigServiceApplicationTest {
@Test
- public void contextLoads() {
- }
-
+ public void contextLoads() {}
}
