Skip to content

Commit a7b513c

Browse files
author
Dennis Labordus
authored
Merge pull request #286 from com-pas/replace-slf4j-with-log4j2
Replace SLF4J with Log4j2
2 parents 3d67af6 + 96f1dbf commit a7b513c

File tree

22 files changed

+197
-99
lines changed

22 files changed

+197
-99
lines changed

‎app/pom.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ SPDX-License-Identifier: Apache-2.0
107107
<groupId>io.quarkus</groupId>
108108
<artifactId>quarkus-jdbc-postgresql</artifactId>
109109
</dependency>
110+
111+
<dependency>
112+
<groupId>org.jboss.logmanager</groupId>
113+
<artifactId>log4j2-jboss-logmanager</artifactId>
114+
</dependency>
115+
110116
<dependency>
111117
<groupId>io.quarkus</groupId>
112118
<artifactId>quarkus-container-image-docker</artifactId>
@@ -148,11 +154,6 @@ SPDX-License-Identifier: Apache-2.0
148154
<artifactId>openpojo</artifactId>
149155
<scope>test</scope>
150156
</dependency>
151-
<dependency>
152-
<groupId>org.slf4j</groupId>
153-
<artifactId>slf4j-simple</artifactId>
154-
<scope>test</scope>
155-
</dependency>
156157
</dependencies>
157158

158159
<build>

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasCommonResource.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55

66
import io.quarkus.security.Authenticated;
77
import io.smallrye.mutiny.Uni;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.eclipse.microprofile.jwt.JsonWebToken;
911
import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
1012
import org.lfenergy.compas.scl.data.rest.v1.model.Type;
1113
import org.lfenergy.compas.scl.data.rest.v1.model.TypeListResponse;
1214
import org.lfenergy.compas.scl.data.rest.v1.model.UserInfoResponse;
1315
import org.lfenergy.compas.scl.extensions.model.SclFileType;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
1616

1717
import javax.enterprise.context.RequestScoped;
1818
import javax.inject.Inject;
1919
import javax.ws.rs.GET;
20-
import javax.ws.rs.HeaderParam;
2120
import javax.ws.rs.Path;
2221
import javax.ws.rs.Produces;
2322
import javax.ws.rs.core.MediaType;
@@ -30,7 +29,7 @@
3029
@RequestScoped
3130
@Path("/common/v1/")
3231
public class CompasCommonResource {
33-
private static final Logger LOGGER = LoggerFactory.getLogger(CompasCommonResource.class);
32+
private static final Logger LOGGER = LogManager.getLogger(CompasCommonResource.class);
3433

3534
@Inject
3635
JsonWebToken jsonWebToken;
@@ -41,8 +40,8 @@ public class CompasCommonResource {
4140
@GET
4241
@Path("/type/list")
4342
@Produces(MediaType.APPLICATION_XML)
44-
public Uni<TypeListResponse> list(@HeaderParam("Authorization") String authHeader) {
45-
LOGGER.trace("Authorization Header '{}'", authHeader);
43+
public Uni<TypeListResponse> list() {
44+
LOGGER.info("Retrieving list of the types of SCL Files");
4645

4746
// Retrieve the roles the logged-in user has.
4847
var roles = jsonWebToken.getGroups();
@@ -61,9 +60,8 @@ public Uni<TypeListResponse> list(@HeaderParam("Authorization") String authHeade
6160
@GET
6261
@Path("/userinfo")
6362
@Produces(MediaType.APPLICATION_XML)
64-
public Uni<UserInfoResponse> getUserInfo(@HeaderParam("Authorization") String authHeader) {
65-
LOGGER.trace("Authorization Header '{}'", authHeader);
66-
63+
public Uni<UserInfoResponse> getUserInfo() {
64+
LOGGER.info("Retrieving user information about {}", jsonWebToken.getName());
6765
var response = new UserInfoResponse();
6866
response.setName(jsonWebToken.getClaim(userInfoProperties.name()));
6967
response.setSessionWarning(userInfoProperties.sessionWarning());

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import io.quarkus.security.Authenticated;
77
import io.smallrye.common.annotation.Blocking;
88
import io.smallrye.mutiny.Uni;
9+
import org.apache.logging.log4j.LogManager;
10+
import org.apache.logging.log4j.Logger;
911
import org.eclipse.microprofile.jwt.JsonWebToken;
1012
import org.lfenergy.compas.scl.data.model.Version;
1113
import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
1214
import org.lfenergy.compas.scl.data.rest.v1.model.*;
1315
import org.lfenergy.compas.scl.data.service.CompasSclDataService;
1416
import org.lfenergy.compas.scl.extensions.model.SclFileType;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
1717

1818
import javax.enterprise.context.RequestScoped;
1919
import javax.inject.Inject;
@@ -28,7 +28,7 @@
2828
@RequestScoped
2929
@Path("/scl/v1/{" + TYPE_PATH_PARAM + "}")
3030
public class CompasSclDataResource {
31-
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclDataResource.class);
31+
private static final Logger LOGGER = LogManager.getLogger(CompasSclDataResource.class);
3232

3333
private final CompasSclDataService compasSclDataService;
3434

@@ -49,6 +49,7 @@ public CompasSclDataResource(CompasSclDataService compasSclDataService) {
4949
@Produces(MediaType.APPLICATION_XML)
5050
public Uni<CreateResponse> create(@PathParam(TYPE_PATH_PARAM) SclFileType type,
5151
@Valid CreateRequest request) {
52+
LOGGER.info("Adding new SCL File for type {} to storage.", type);
5253
String who = jsonWebToken.getClaim(userInfoProperties.who());
5354
LOGGER.trace("Username used for Who {}", who);
5455

@@ -62,6 +63,7 @@ public Uni<CreateResponse> create(@PathParam(TYPE_PATH_PARAM) SclFileType type,
6263
@Path("/list")
6364
@Produces(MediaType.APPLICATION_XML)
6465
public Uni<ListResponse> list(@PathParam(TYPE_PATH_PARAM) SclFileType type) {
66+
LOGGER.info("Listing SCL Files for type {} from storage.", type);
6567
var response = new ListResponse();
6668
response.setItems(compasSclDataService.list(type));
6769
return Uni.createFrom().item(response);
@@ -72,6 +74,7 @@ public Uni<ListResponse> list(@PathParam(TYPE_PATH_PARAM) SclFileType type) {
7274
@Produces(MediaType.APPLICATION_XML)
7375
public Uni<VersionsResponse> listVersionsByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
7476
@PathParam(ID_PATH_PARAM) UUID id) {
77+
LOGGER.info("Listing versions of SCL File {} for type {} from storage.", id, type);
7578
var response = new VersionsResponse();
7679
response.setItems(compasSclDataService.listVersionsByUUID(type, id));
7780
return Uni.createFrom().item(response);
@@ -82,6 +85,7 @@ public Uni<VersionsResponse> listVersionsByUUID(@PathParam(TYPE_PATH_PARAM) SclF
8285
@Produces(MediaType.APPLICATION_XML)
8386
public Uni<GetResponse> findByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
8487
@PathParam(ID_PATH_PARAM) UUID id) {
88+
LOGGER.info("Retrieving latest version of SCL File {} for type {} from storage.", id, type);
8589
var response = new GetResponse();
8690
response.setSclData(compasSclDataService.findByUUID(type, id));
8791
return Uni.createFrom().item(response);
@@ -93,6 +97,7 @@ public Uni<GetResponse> findByUUID(@PathParam(TYPE_PATH_PARAM) SclFileType type,
9397
public Uni<GetResponse> findByUUIDAndVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
9498
@PathParam(ID_PATH_PARAM) UUID id,
9599
@PathParam(VERSION_PATH_PARAM) Version version) {
100+
LOGGER.info("Retrieving version {} of SCL File {} for type {} from storage.", version, id, type);
96101
var response = new GetResponse();
97102
response.setSclData(compasSclDataService.findByUUID(type, id, version));
98103
return Uni.createFrom().item(response);
@@ -106,6 +111,7 @@ public Uni<GetResponse> findByUUIDAndVersion(@PathParam(TYPE_PATH_PARAM) SclFile
106111
public Uni<UpdateResponse> update(@PathParam(TYPE_PATH_PARAM) SclFileType type,
107112
@PathParam(ID_PATH_PARAM) UUID id,
108113
@Valid UpdateRequest request) {
114+
LOGGER.info("Updating SCL File {} for type {} to storage.", id, type);
109115
String who = jsonWebToken.getClaim(userInfoProperties.who());
110116
LOGGER.trace("Username used for Who {}", who);
111117

@@ -121,6 +127,7 @@ public Uni<UpdateResponse> update(@PathParam(TYPE_PATH_PARAM) SclFileType type,
121127
@Produces(MediaType.APPLICATION_XML)
122128
public Uni<Void> deleteAll(@PathParam(TYPE_PATH_PARAM) SclFileType type,
123129
@PathParam(ID_PATH_PARAM) UUID id) {
130+
LOGGER.info("Removing all versions of SCL File {} for type {} from storage.", id, type);
124131
compasSclDataService.delete(type, id);
125132
return Uni.createFrom().nullItem();
126133
}
@@ -132,6 +139,7 @@ public Uni<Void> deleteAll(@PathParam(TYPE_PATH_PARAM) SclFileType type,
132139
public Uni<Void> deleteVersion(@PathParam(TYPE_PATH_PARAM) SclFileType type,
133140
@PathParam(ID_PATH_PARAM) UUID id,
134141
@PathParam(VERSION_PATH_PARAM) Version version) {
142+
LOGGER.info("Removing version {} of SCL File {} for type {} from storage.", version, id, type);
135143
compasSclDataService.delete(type, id, version);
136144
return Uni.createFrom().nullItem();
137145
}

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import io.quarkus.security.Authenticated;
77
import io.vertx.mutiny.core.eventbus.EventBus;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.eclipse.microprofile.jwt.JsonWebToken;
911
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
1012
import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
@@ -13,8 +15,6 @@
1315
import org.lfenergy.compas.scl.data.websocket.v1.encoder.CreateWsResponseEncoder;
1416
import org.lfenergy.compas.scl.data.websocket.v1.model.CreateWsRequest;
1517
import org.lfenergy.compas.scl.extensions.model.SclFileType;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
1818

1919
import javax.enterprise.context.ApplicationScoped;
2020
import javax.inject.Inject;
@@ -31,7 +31,7 @@
3131
decoders = {CreateWsRequestDecoder.class},
3232
encoders = {CreateWsResponseEncoder.class, ErrorResponseEncoder.class})
3333
public class CompasSclCreateServerEndpoint {
34-
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclCreateServerEndpoint.class);
34+
private static final Logger LOGGER = LogManager.getLogger(CompasSclCreateServerEndpoint.class);
3535

3636
private final EventBus eventBus;
3737
private final JsonWebToken jsonWebToken;

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
import io.quarkus.security.Authenticated;
77
import io.vertx.mutiny.core.eventbus.EventBus;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
911
import org.lfenergy.compas.scl.data.websocket.event.model.GetEventRequest;
1012
import org.lfenergy.compas.scl.data.websocket.v1.decoder.GetWsRequestDecoder;
1113
import org.lfenergy.compas.scl.data.websocket.v1.encoder.GetWsResponseEncoder;
1214
import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsRequest;
1315
import org.lfenergy.compas.scl.extensions.model.SclFileType;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
1616

1717
import javax.enterprise.context.ApplicationScoped;
1818
import javax.inject.Inject;
@@ -29,7 +29,7 @@
2929
decoders = {GetWsRequestDecoder.class},
3030
encoders = {GetWsResponseEncoder.class, ErrorResponseEncoder.class})
3131
public class CompasSclGetServerEndpoint {
32-
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclGetServerEndpoint.class);
32+
private static final Logger LOGGER = LogManager.getLogger(CompasSclGetServerEndpoint.class);
3333

3434
private final EventBus eventBus;
3535

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
import io.quarkus.security.Authenticated;
77
import io.vertx.mutiny.core.eventbus.EventBus;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
911
import org.lfenergy.compas.scl.data.model.Version;
1012
import org.lfenergy.compas.scl.data.websocket.event.model.GetVersionEventRequest;
1113
import org.lfenergy.compas.scl.data.websocket.v1.decoder.GetVersionWsRequestDecoder;
1214
import org.lfenergy.compas.scl.data.websocket.v1.encoder.GetWsResponseEncoder;
1315
import org.lfenergy.compas.scl.data.websocket.v1.model.GetVersionWsRequest;
1416
import org.lfenergy.compas.scl.extensions.model.SclFileType;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
1717

1818
import javax.enterprise.context.ApplicationScoped;
1919
import javax.inject.Inject;
@@ -30,7 +30,7 @@
3030
decoders = {GetVersionWsRequestDecoder.class},
3131
encoders = {GetWsResponseEncoder.class, ErrorResponseEncoder.class})
3232
public class CompasSclGetVersionServerEndpoint {
33-
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclGetVersionServerEndpoint.class);
33+
private static final Logger LOGGER = LogManager.getLogger(CompasSclGetVersionServerEndpoint.class);
3434

3535
private final EventBus eventBus;
3636

‎app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import io.quarkus.security.Authenticated;
77
import io.vertx.mutiny.core.eventbus.EventBus;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.eclipse.microprofile.jwt.JsonWebToken;
911
import org.lfenergy.compas.core.websocket.ErrorResponseEncoder;
1012
import org.lfenergy.compas.scl.data.rest.UserInfoProperties;
@@ -13,8 +15,6 @@
1315
import org.lfenergy.compas.scl.data.websocket.v1.encoder.UpdateWsResponseEncoder;
1416
import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateWsRequest;
1517
import org.lfenergy.compas.scl.extensions.model.SclFileType;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
1818

1919
import javax.enterprise.context.ApplicationScoped;
2020
import javax.inject.Inject;
@@ -31,7 +31,7 @@
3131
decoders = {UpdateWsRequestDecoder.class},
3232
encoders = {UpdateWsResponseEncoder.class, ErrorResponseEncoder.class})
3333
public class CompasSclUpdateServerEndpoint {
34-
private static final Logger LOGGER = LoggerFactory.getLogger(CompasSclUpdateServerEndpoint.class);
34+
private static final Logger LOGGER = LogManager.getLogger(CompasSclUpdateServerEndpoint.class);
3535

3636
private final EventBus eventBus;
3737
private final JsonWebToken jsonWebToken;

‎app/src/test/resources/simplelogger.properties‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ SPDX-License-Identifier: Apache-2.0
2323
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

26-
<compas.core.version>0.10.2</compas.core.version>
26+
<compas.core.version>0.11.0</compas.core.version>
2727

2828
<quarkus.platform.version>2.14.1.Final</quarkus.platform.version>
2929
<jaxb-impl.version>2.3.7</jaxb-impl.version>
3030
<microprofile-openapi-api.version>3.0</microprofile-openapi-api.version>
31-
<slf4j.version>2.0.4</slf4j.version>
31+
<log4j2.version>2.19.0</log4j2.version>
3232
<openpojo.version>0.9.1</openpojo.version>
3333
</properties>
3434

@@ -121,14 +121,20 @@ SPDX-License-Identifier: Apache-2.0
121121
</dependency>
122122

123123
<dependency>
124-
<groupId>org.slf4j</groupId>
125-
<artifactId>slf4j-api</artifactId>
126-
<version>${slf4j.version}</version>
124+
<groupId>org.apache.logging.log4j</groupId>
125+
<artifactId>log4j-api</artifactId>
126+
<version>${log4j2.version}</version>
127127
</dependency>
128128
<dependency>
129-
<groupId>org.slf4j</groupId>
130-
<artifactId>slf4j-simple</artifactId>
131-
<version>${slf4j.version}</version>
129+
<groupId>org.apache.logging.log4j</groupId>
130+
<artifactId>log4j-core</artifactId>
131+
<version>${log4j2.version}</version>
132+
</dependency>
133+
<!-- Bridge is needed for other dependency -->
134+
<dependency>
135+
<groupId>org.apache.logging.log4j</groupId>
136+
<artifactId>log4j-slf4j-impl</artifactId>
137+
<version>${log4j2.version}</version>
132138
</dependency>
133139

134140
<!-- Test -->

‎repository-basex/pom.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ SPDX-License-Identifier: Apache-2.0
4242
<scope>provided</scope>
4343
</dependency>
4444

45+
<dependency>
46+
<groupId>org.apache.logging.log4j</groupId>
47+
<artifactId>log4j-api</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.logging.log4j</groupId>
51+
<artifactId>log4j-core</artifactId>
52+
<scope>provided</scope>
53+
</dependency>
54+
4555
<!-- Test Dependencies -->
4656
<dependency>
4757
<groupId>org.lfenergy.compas.scl.data</groupId>
@@ -71,11 +81,6 @@ SPDX-License-Identifier: Apache-2.0
7181
<artifactId>junit-jupiter-engine</artifactId>
7282
<scope>test</scope>
7383
</dependency>
74-
<dependency>
75-
<groupId>org.slf4j</groupId>
76-
<artifactId>slf4j-simple</artifactId>
77-
<scope>test</scope>
78-
</dependency>
7984
</dependencies>
8085

8186
<build>

0 commit comments

Comments
 (0)