From d535429a2f18c82de7716076a8065f6ad95f0483 Mon Sep 17 00:00:00 2001
From: Joaquín Reñé <jrene@curisit.net>
Date: Thu, 10 Mar 2022 12:33:56 +0000
Subject: [PATCH] #4255 - Update log4j version and clean project
---
securis/src/main/java/net/curisit/securis/utils/GZipServletResponseWrapper.java | 1 +
securis/pom.xml | 10 ++++++----
securis/src/main/java/net/curisit/securis/db/listeners/CreationTimestampListener.java | 5 ++---
securis/src/main/java/net/curisit/securis/db/listeners/ModificationTimestampListener.java | 5 ++---
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 2 +-
securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java | 3 ++-
securis/src/main/java/net/curisit/securis/DevFilter.java | 5 +++--
securis/src/main/java/net/curisit/securis/services/PackResource.java | 2 +-
8 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index bba52d0..995cda6 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -1,10 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+
+ <name>SeCuris</name>
<groupId>net.curisit</groupId>
<artifactId>securis-server</artifactId>
- <version>2.0.0</version>
- <name>SeCuris</name>
+ <version>2.0.1</version>
+ <modelVersion>4.0.0</modelVersion>
+
<description>CurisTEC Server Licenses</description>
<dependencies>
<dependency>
@@ -101,7 +103,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
- <version>2.1</version>
+ <version>2.17.2</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
diff --git a/securis/src/main/java/net/curisit/securis/DevFilter.java b/securis/src/main/java/net/curisit/securis/DevFilter.java
index 1e049c0..4889e10 100644
--- a/securis/src/main/java/net/curisit/securis/DevFilter.java
+++ b/securis/src/main/java/net/curisit/securis/DevFilter.java
@@ -20,7 +20,8 @@
@WebFilter(urlPatterns = "/*")
public class DevFilter implements Filter {
- private static final Logger LOG = LogManager.getLogger(DevFilter.class);
+ @SuppressWarnings("unused")
+ private static final Logger log = LogManager.getLogger(DevFilter.class);
@Override
public void init(FilterConfig fc) throws ServletException {
@@ -37,7 +38,7 @@
res.addHeader("Access-Control-Allow-Headers", "X-SECURIS-TOKEN, Content-Type");
res.addHeader("Access-Control-Expose-Headers", "X-SECURIS-ERROR-MSG, X-SECURIS-ERROR-CODE, Content-Type, Content-Disposition");
- // LOG.info("Added header to: " + res.getHeaderNames());
+ // log.info("Added header to: " + res.getHeaderNames());
if (!req.getMethod().equals("OPTIONS")) {
fc.doFilter(sreq, sres);
}
diff --git a/securis/src/main/java/net/curisit/securis/db/listeners/CreationTimestampListener.java b/securis/src/main/java/net/curisit/securis/db/listeners/CreationTimestampListener.java
index 23fa941..0b2c88a 100644
--- a/securis/src/main/java/net/curisit/securis/db/listeners/CreationTimestampListener.java
+++ b/securis/src/main/java/net/curisit/securis/db/listeners/CreationTimestampListener.java
@@ -11,12 +11,11 @@
public class CreationTimestampListener {
- @SuppressWarnings("unused")
- private static final Logger LOG = LogManager.getLogger(CreationTimestampListener.class);
+ private static final Logger log = LogManager.getLogger(CreationTimestampListener.class);
@PrePersist
public void updateTimestamp(CreationTimestampEntity p) {
- LOG.info("Settings creation timestmap date");
+ log.info("Settings creation timestmap date");
p.setCreationTimestamp(new Date());
}
diff --git a/securis/src/main/java/net/curisit/securis/db/listeners/ModificationTimestampListener.java b/securis/src/main/java/net/curisit/securis/db/listeners/ModificationTimestampListener.java
index 208fddb..df53613 100644
--- a/securis/src/main/java/net/curisit/securis/db/listeners/ModificationTimestampListener.java
+++ b/securis/src/main/java/net/curisit/securis/db/listeners/ModificationTimestampListener.java
@@ -12,13 +12,12 @@
public class ModificationTimestampListener {
- @SuppressWarnings("unused")
- private static final Logger LOG = LogManager.getLogger(ModificationTimestampListener.class);
+ private static final Logger log = LogManager.getLogger(ModificationTimestampListener.class);
@PreUpdate
@PrePersist
public void updateTimestamp(ModificationTimestampEntity p) {
- LOG.info("Settings modification timestmap date");
+ log.info("Settings modification timestmap date");
p.setModificationTimestamp(new Date());
}
diff --git a/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java b/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
index e80c9b8..6678530 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
@@ -10,7 +10,8 @@
@ApplicationScoped
public class EntityManagerProvider {
- private static final Logger LOG = LogManager.getLogger(EntityManagerProvider.class);
+ @SuppressWarnings("unused")
+ private static final Logger log = LogManager.getLogger(EntityManagerProvider.class);
private final EntityManagerFactory entityManagerFactory = javax.persistence.Persistence.createEntityManagerFactory("localdb");
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index 452413b..f7eb23a 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -592,7 +592,7 @@
}
private License getCurrentLicense(Integer licId, BasicSecurityContext bsc, EntityManager em) throws SeCurisServiceException {
- if (licId == null || "".equals(licId)) {
+ if (licId == null || "".equals(Integer.toString(licId))) {
LOG.error("License ID is mandatory");
throw new SeCurisServiceException(Status.NOT_FOUND.getStatusCode(), "Missing license ID");
}
diff --git a/securis/src/main/java/net/curisit/securis/services/PackResource.java b/securis/src/main/java/net/curisit/securis/services/PackResource.java
index 5868d73..dcdf6e6 100644
--- a/securis/src/main/java/net/curisit/securis/services/PackResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/PackResource.java
@@ -157,7 +157,7 @@
@Produces({ MediaType.APPLICATION_JSON })
public Response get(@PathParam("packId") Integer packId, @Context BasicSecurityContext bsc) {
LOG.info("Getting pack data for id: {}: ", packId);
- if (packId == null || "".equals(packId)) {
+ if (packId == null || "".equals(Integer.toString(packId))) {
LOG.error("Pack ID is mandatory");
return Response.status(Status.NOT_FOUND).build();
}
diff --git a/securis/src/main/java/net/curisit/securis/utils/GZipServletResponseWrapper.java b/securis/src/main/java/net/curisit/securis/utils/GZipServletResponseWrapper.java
index 331165c..11fc895 100644
--- a/securis/src/main/java/net/curisit/securis/utils/GZipServletResponseWrapper.java
+++ b/securis/src/main/java/net/curisit/securis/utils/GZipServletResponseWrapper.java
@@ -131,6 +131,7 @@
this.gzipStream.flush();
}
+ @SuppressWarnings("unused")
public void finish() throws IOException {
this.gzipStream.finish();
}
--
Gitblit v1.3.2