This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git
The following commit(s) were added to refs/heads/master by this push:
new 0e1dc0e Reformat using Palantir formatter
0e1dc0e is described below
commit 0e1dc0e55a63e630509f688ff978bdb5c48e931a
Author: Spotless <[email protected]>
AuthorDate: Mon Dec 4 10:46:06 2023 +0100
Reformat using Palantir formatter
---
.../apache/logging/log4j/audit/service/RequestContext.java | 14 +++++++++++++-
.../audit/service/config/RequestContextInitializer.java | 1 -
.../java/org/apache/logging/log4j/audit/AuditService.java | 8 +++-----
.../main/java/org/apache/logging/audit/RequestContext.java | 7 ++++++-
.../src/main/java/org/apache/logging/audit/SampleApp.java | 1 -
5 files changed, 22 insertions(+), 9 deletions(-)
diff --git
a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java
b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java
index 4671d27..f0ee354 100644
---
a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java
+++
b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.service;
import java.util.UUID;
import java.util.function.Supplier;
-
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.annotation.Chained;
import org.apache.logging.log4j.audit.annotation.ClientServer;
@@ -35,24 +34,37 @@ import org.apache.logging.log4j.core.util.UuidUtil;
public final class RequestContext {
@ClientServer
public static final String REQUEST_ID = "requestId";
+
private String requestId;
+
@ClientServer
public static final String SESSION_ID = "sessionId";
+
private String sessionId;
+
@ClientServer
public static final String ACCOUNT_NUMBER = "accountNumber";
+
private Long accountNumber;
+
@ClientServer
public static final String IP_ADDRESS = "ipAddress";
+
private String ipAddress;
+
@ClientServer
public static final String USER_ID = "userId";
+
private String userId;
+
@ClientServer
public static final String LOGIN_ID = "loginId";
+
private String loginId;
+
@Local
public static final String CALLING_HOST = "callingHost";
+
private String callingHost;
public static final String HOST_NAME = "hostName";
diff --git
a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java
b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java
index 8c0dfaa..37402bf 100644
---
a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java
+++
b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.service.config;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-
import org.apache.logging.log4j.audit.rest.RequestContextFilter;
import org.apache.logging.log4j.audit.service.RequestContext;
import org.springframework.web.WebApplicationInitializer;
diff --git
a/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java
b/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java
index ee97086..bea579d 100644
---
a/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java
+++
b/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.audit;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-
import org.apache.logging.log4j.catalog.api.util.ProfileUtil;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -33,8 +32,8 @@ public class AuditService extends
SpringBootServletInitializer {
private static final String SPRING_PROFILE = "spring.profiles.active";
public static void main(String[] args) {
- SpringApplicationBuilder builder = new
SpringApplicationBuilder().profiles(getActiveProfile())
- .sources(AuditService.class);
+ SpringApplicationBuilder builder =
+ new
SpringApplicationBuilder().profiles(getActiveProfile()).sources(AuditService.class);
builder.run(args);
}
@@ -72,10 +71,9 @@ public class AuditService extends
SpringBootServletInitializer {
try {
props.load(is);
} catch (IOException ioe) {
- //Ignore the error.
+ // Ignore the error.
}
}
return props;
}
-
}
diff --git
a/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java
b/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java
index 7f5fba5..5cf1a46 100644
--- a/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java
+++ b/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java
@@ -18,7 +18,6 @@ package org.apache.logging.audit;
import java.util.UUID;
import java.util.function.Supplier;
-
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.annotation.Chained;
import org.apache.logging.log4j.audit.annotation.ClientServer;
@@ -35,16 +34,22 @@ import org.apache.logging.log4j.core.util.UuidUtil;
public final class RequestContext {
@ClientServer
public static final String REQUEST_ID = "requestId";
+
@ClientServer
public static final String SESSION_ID = "sessionId";
+
@ClientServer
public static final String ACCOUNT_NUMBER = "accountNumber";
+
@ClientServer
public static final String IP_ADDRESS = "ipAddress";
+
@ClientServer
public static final String USER_ID = "userId";
+
@ClientServer
public static final String LOGIN_ID = "loginId";
+
@Local
public static final String CALLING_HOST = "callingHost";
diff --git a/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java
b/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java
index db5c797..fbcbd42 100644
--- a/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java
+++ b/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java
@@ -18,7 +18,6 @@ package org.apache.logging.audit;
import java.math.BigDecimal;
import java.net.InetAddress;
-
import org.apache.logging.log4j.audit.LogEventFactory;
import org.apache.logging.log4j.audit.event.Deposit;
import org.apache.logging.log4j.audit.event.Login;
