Skip to content

Commit c8d5b55

Browse files
committed
updated log4j library from 1.x to 2.x version
1 parent e88268d commit c8d5b55

6 files changed

Lines changed: 44 additions & 23 deletions

File tree

pom.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<!-- base library details -->
8-
98
<groupId>com.wildbit.java</groupId>
109
<artifactId>postmark</artifactId>
1110
<version>${postmark.version}</version>
@@ -96,6 +95,18 @@
9695
<version>2.1.3</version>
9796
</dependency>
9897

98+
<!-- Logging dependencies -->
99+
<dependency>
100+
<groupId>org.apache.logging.log4j</groupId>
101+
<artifactId>log4j-api</artifactId>
102+
<version>2.9.1</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.apache.logging.log4j</groupId>
106+
<artifactId>log4j-core</artifactId>
107+
<version>2.9.1</version>
108+
</dependency>
109+
99110
<!-- Testing dependencies -->
100111
<dependency>
101112
<groupId>org.junit.jupiter</groupId>
@@ -125,13 +136,6 @@
125136
<version>2.11.0</version>
126137
<scope>test</scope>
127138
</dependency>
128-
129-
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
130-
<dependency>
131-
<groupId>log4j</groupId>
132-
<artifactId>log4j</artifactId>
133-
<version>1.2.17</version>
134-
</dependency>
135139
</dependencies>
136140

137141
<!-- all of the below is needed for releasing -->

src/main/java/com/wildbit/java/postmark/Postmark.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import com.wildbit.java.postmark.client.AccountApiClient;
44
import com.wildbit.java.postmark.client.ApiClient;
5-
import org.apache.log4j.Logger;
65

76
import javax.ws.rs.core.MultivaluedHashMap;
87
import javax.ws.rs.core.MultivaluedMap;
98
import java.io.InputStream;
109
import java.util.Properties;
1110

11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1213
/**
1314
* Top level class allowing simple access to API clients for doing Postmark API calls.
1415
*/
@@ -92,7 +93,7 @@ public static AccountApiClient getAccountApiClient(String apiToken, Boolean secu
9293

9394
private Postmark() {}
9495

95-
private static Logger log = Logger.getLogger(Postmark.class);
96+
private static Logger log = LogManager.getLogger(Postmark.class);
9697

9798
private static MultivaluedMap<String,Object> getHeadersWithAuth(DEFAULTS authType, String apiToken) {
9899
MultivaluedMap headers = DefaultHeaders.headers();

src/main/java/com/wildbit/java/postmark/client/HttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ClientResponse execute(REQUEST_TYPES requestType, String url, String data
7171
break;
7272

7373
case PATCH:
74-
// client doesn't have PATCH method, therefore workaround has to be used
74+
// Jersey client doesn't have PATCH method, therefore workaround has to be used by using reflection
7575
// https://stackoverflow.com/questions/55778145/how-to-use-patch-method-with-jersey-invocation-builder
7676
target.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
7777
response = target.request().headers(headers).method("PATCH", Entity.json(data), Response.class);

src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
import com.wildbit.java.postmark.client.data.DataHandler;
44
import com.wildbit.java.postmark.client.exception.*;
5-
import org.apache.log4j.spi.RootLogger;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Level;
7+
import org.apache.logging.log4j.core.LoggerContext;
8+
import org.apache.logging.log4j.core.config.Configuration;
9+
import org.apache.logging.log4j.core.config.LoggerConfig;
610

711
import javax.ws.rs.core.MultivaluedMap;
812
import java.io.IOException;
9-
import org.apache.log4j.Level;
1013

1114
/**
1215
* Client class acts as handler between HTTP requests handler class (HttpClient) and class which provides access to all endpoints to call.
@@ -86,7 +89,12 @@ public void setDebugMode() {
8689
* @param level - debugging level - OFF, DEBUG, ERROR etc.
8790
*/
8891
public void setLoggingLevel(Level level) {
89-
RootLogger.getRootLogger().setLevel(level);
92+
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
93+
Configuration config = ctx.getConfiguration();
94+
95+
LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
96+
loggerConfig.setLevel(level);
97+
ctx.updateLoggers();
9098
}
9199

92100
public void setSecureConnection(boolean secureConnection) {

src/main/resources/log4j.properties

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name=PropertiesConfig
2+
appenders = console
3+
4+
appender.console.type = Console
5+
appender.console.name = STDOUT
6+
appender.console.layout.type = PatternLayout
7+
appender.console.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n
8+
9+
loggers=console
10+
logger.console.name = postmark.java
11+
logger.console.level = debug
12+
logger.console.appenderRef.console.ref = STDOUT
13+
logger.rolling.level = info
14+
15+
rootLogger.level = off
16+
rootLogger.appenderRefs = stdout
17+
rootLogger.appenderRef.stdout.ref = STDOUT

0 commit comments

Comments
 (0)