You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sh...@apache.org on 2019/05/28 13:04:35 UTC
[logging-log4j-audit] branch master updated (da288c6 -> b4da24f)
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git.
from da288c6 LOG4J2-2579: add missing license
new 28de0df Cleanup imports
new 0c84ffe Remove redundant modifiers
new dd0fa24 Trivial cleanups and improvements
new 87c6255 Mark fields as final where possible
new 4a32859 Fix trivial bugs reported by the IDE
new b4da24f Fix trivial warnings reported by the IDE
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../logging/log4j/audit/AbstractEventLogger.java | 17 ++++----
.../apache/logging/log4j/audit/ActivityLogger.java | 2 +-
.../apache/logging/log4j/audit/AuditLogger.java | 2 +-
.../apache/logging/log4j/audit/AuditMessage.java | 2 +-
.../logging/log4j/audit/LogEventFactory.java | 6 +--
.../logging/log4j/audit/annotation/Chained.java | 2 -
.../log4j/audit/annotation/ClientServer.java | 1 -
.../log4j/audit/catalog/CatalogManagerImpl.java | 12 ++----
.../log4j/audit/generator/AccessorDefinition.java | 11 ++----
.../log4j/audit/generator/ClassGenerator.java | 45 ++++++++++------------
.../audit/generator/ConstructorDefinition.java | 11 ++----
.../log4j/audit/generator/InterfacesGenerator.java | 4 +-
.../log4j/audit/generator/MethodDefinition.java | 8 +---
.../audit/request/RequestContextMappings.java | 1 -
.../logging/log4j/audit/rest/ElapsedUtil.java | 9 ++---
.../log4j/audit/rest/RequestContextFilter.java | 24 +++++-------
.../rest/RequestContextHandlerInterceptor.java | 18 ++++-----
.../rest/RequestContextHeaderInterceptor.java | 2 +-
.../logging/log4j/audit/util/NamingUtils.java | 4 +-
.../logging/log4j/audit/AuditLoggerTest.java | 6 +--
.../apache/logging/log4j/audit/BaseEventTest.java | 2 +-
.../apache/logging/log4j/audit/TransferTest.java | 2 +-
.../apache/logging/log4j/audit/event/Transfer.java | 9 +++--
.../audit/generator/TestInterfacesGenerator.java | 4 +-
.../audit/service/catalog/AuditCatalogManager.java | 3 +-
.../audit/service/config/WebAppInitializer.java | 3 +-
.../audit/service/config/WebMvcAppContext.java | 30 +++------------
.../audit/service/controller/AuditController.java | 9 +----
.../service/controller/CatalogController.java | 18 ++++-----
.../RestResponseEntityExceptionHandler.java | 4 +-
.../logging/log4j/catalog/api/Attribute.java | 2 +
.../logging/log4j/catalog/api/Constraint.java | 5 +--
.../logging/log4j/catalog/api/ConstraintType.java | 2 +-
.../api/annotation/ConditionOnPropertyExists.java | 6 +--
.../log4j/catalog/api/annotation/JdbcUrl.java | 6 +--
.../catalog/api/annotation/JdbcUrlCondition.java | 2 +-
.../catalog/api/dao/ClassPathCatalogReader.java | 12 +++---
.../catalog/api/plugins/ConstraintPlugins.java | 4 +-
.../api/plugins/ConstraintTypeDeserializer.java | 2 +-
.../api/plugins/ConstraintTypeSerializer.java | 6 ---
.../log4j/catalog/api/plugins/EnumConstraint.java | 2 +-
.../catalog/api/plugins/PatternConstraint.java | 1 -
.../log4j/catalog/config/WebAppInitializer.java | 41 +++++++-------------
.../log4j/catalog/config/WebMvcAppContext.java | 12 ------
.../catalog/controller/AttributeController.java | 29 +++++++-------
.../catalog/controller/CatalogController.java | 23 +++--------
.../catalog/controller/CategoryController.java | 27 ++++++-------
.../catalog/controller/ConstraintController.java | 19 ++++-----
.../log4j/catalog/controller/EventController.java | 26 ++++++-------
.../catalog/controller/ProductController.java | 16 +++-----
.../RequestContextHeaderInterceptor.java | 1 -
.../log4j/catalog/git/dao/GitCatalogDao.java | 32 +++++++--------
.../logging/log4j/catalog/git/CatalogTest.java | 10 ++---
.../git/config/ApplicationConfiguration.java | 2 -
.../catalog/jpa/config/EclipseLinkConfig.java | 2 +-
.../log4j/catalog/jpa/config/HibernateConfig.java | 3 --
.../catalog/jpa/converter/AttributeConverter.java | 2 +-
.../catalog/jpa/converter/EventConverter.java | 10 ++---
.../jpa/dao/PagingAndSortingRepository.java | 1 -
.../log4j/catalog/jpa/model/CategoryModel.java | 1 -
.../log4j/catalog/jpa/model/ConstraintModel.java | 2 +-
.../log4j/catalog/jpa/model/ProductModel.java | 3 --
.../catalog/jpa/service/AttributeServiceImpl.java | 9 ++---
.../catalog/jpa/service/CatalogServiceImpl.java | 1 -
.../catalog/jpa/service/CategoryServiceImpl.java | 9 ++---
.../catalog/jpa/service/ConstraintServiceImpl.java | 11 ++----
.../catalog/jpa/service/EventServiceImpl.java | 13 +++----
.../catalog/jpa/service/ProductServiceImpl.java | 9 ++---
.../logging/log4j/catalog/jpa/CatalogTest.java | 25 ++++++------
69 files changed, 253 insertions(+), 407 deletions(-)
[logging-log4j-audit] 05/06: Fix trivial bugs reported by the IDE
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
commit 4a32859e1d2f26191277b90d010fba70d70f6fed
Author: Andrei Ivanov <an...@gmail.com>
AuthorDate: Tue May 28 15:49:37 2019 +0300
Fix trivial bugs reported by the IDE
---
.../service/controller/CatalogController.java | 2 +-
.../logging/log4j/catalog/api/Attribute.java | 2 ++
.../catalog/controller/AttributeController.java | 2 +-
.../catalog/controller/CategoryController.java | 2 +-
.../log4j/catalog/controller/EventController.java | 2 +-
.../catalog/controller/ProductController.java | 2 +-
.../log4j/catalog/git/dao/GitCatalogDao.java | 26 +++++++++++++---------
7 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
index 716dc11..4af4d0d 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
@@ -454,7 +454,7 @@ public class CatalogController {
private String validateSortDirection(String sortDirection) {
if (sortDirection == null) {
sortDirection = "ASC";
- } else if (sortDirection != "ASC" && sortDirection != "DESC") {
+ } else if (!sortDirection.equals("ASC") && !sortDirection.equals("DESC")) {
LOGGER.warn("Invalid sort direction {}, defaulting to ascending", sortDirection);
sortDirection = "ASC";
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Attribute.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Attribute.java
index 2c8b8f8..c315bf0 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Attribute.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Attribute.java
@@ -302,6 +302,8 @@ public class Attribute implements Serializable {
for (Constraint constraint : constraints) {
if (!first) {
sb.append(" ");
+ } else {
+ first = false;
}
sb.append("name=\"").append(constraint.getConstraintType().getName()).append("\"");
sb.append("value=\"").append(constraint.getValue()).append("\"");
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
index 5f3bfbc..2be6dfb 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
@@ -91,7 +91,7 @@ public class AttributeController {
if (sorting != null) {
String[] sortInfo = sorting.split(" ");
sortColumn = sortInfo[0];
- if (sortInfo.length > 0) {
+ if (sortInfo.length > 1) {
sortDirection = sortInfo[1];
}
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
index 16ef136..7a937d5 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
@@ -84,7 +84,7 @@ public class CategoryController {
if (sorting != null) {
String[] sortInfo = sorting.split(" ");
sortColumn = sortInfo[0];
- if (sortInfo.length > 0) {
+ if (sortInfo.length > 1) {
sortDirection = sortInfo[1];
}
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
index 89b9a94..2381200 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
@@ -87,7 +87,7 @@ public class EventController {
if (sorting != null) {
String[] sortInfo = sorting.split(" ");
sortColumn = sortInfo[0];
- if (sortInfo.length > 0) {
+ if (sortInfo.length > 1) {
sortDirection = sortInfo[1];
}
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
index f24d8a5..f8ff531 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
@@ -83,7 +83,7 @@ public class ProductController {
if (sorting != null) {
String[] sortInfo = sorting.split(" ");
sortColumn = sortInfo[0];
- if (sortInfo.length > 0) {
+ if (sortInfo.length > 1) {
sortDirection = sortInfo[1];
}
}
diff --git a/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java b/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java
index 9467a1a..7d1c012 100644
--- a/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java
+++ b/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java
@@ -16,13 +16,6 @@
*/
package org.apache.logging.log4j.catalog.git.dao;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,8 +27,8 @@ import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.dao.AbstractCatalogReader;
import org.apache.logging.log4j.catalog.api.dao.CatalogDao;
import org.apache.logging.log4j.catalog.api.exception.CatalogModificationException;
-import org.apache.logging.log4j.catalog.api.exception.CatalogReadException;
import org.apache.logging.log4j.catalog.api.exception.CatalogNotFoundException;
+import org.apache.logging.log4j.catalog.api.exception.CatalogReadException;
import org.apache.logging.log4j.catalog.api.util.CatalogEventFilter;
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
@@ -47,6 +40,13 @@ import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.CredentialsProvider;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
private static final Logger LOGGER = LogManager.getLogger();
private static final String DEFAULT_CATALOG_PATH = "src/main/resources/catalog.json";
@@ -133,8 +133,12 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
@Override
public synchronized CatalogData read() {
updateRepo();
- if (catalogFile == null || !catalogFile.exists() || !catalogFile.canRead()) {
- throw new IllegalStateException("Catalog " + catalogFile.getAbsolutePath() + " is not readable.");
+ if (catalogFile == null) {
+ throw new CatalogNotFoundException();
+ }
+
+ if (!catalogFile.exists() || !catalogFile.canRead()) {
+ throw new CatalogReadException("Catalog " + catalogFile.getAbsolutePath() + " is not readable.");
}
try {
@@ -149,7 +153,7 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
public void write(CatalogData data) {
File localRepoFile = new File(localRepoPath);
if (!localRepoFile.exists() || !localRepoFile.canWrite()) {
- throw new IllegalStateException("Catalog is not writable.");
+ throw new CatalogModificationException("Catalog is not writable: " + localRepoFile.getAbsolutePath());
}
FileWriter writer = null;
[logging-log4j-audit] 01/06: Cleanup imports
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
commit 28de0df9705fa521638e72f7040ca0f89ab7a6cb
Author: Andrei Ivanov <an...@gmail.com>
AuthorDate: Tue May 28 11:25:53 2019 +0300
Cleanup imports
---
.../logging/log4j/audit/AbstractEventLogger.java | 1 -
.../logging/log4j/audit/annotation/Chained.java | 2 --
.../logging/log4j/audit/annotation/ClientServer.java | 1 -
.../logging/log4j/audit/generator/ClassGenerator.java | 2 --
.../log4j/audit/request/RequestContextMappings.java | 1 -
.../log4j/audit/rest/RequestContextFilter.java | 1 -
.../log4j/audit/service/config/WebMvcAppContext.java | 19 -------------------
.../catalog/api/plugins/ConstraintTypeSerializer.java | 6 ------
.../log4j/catalog/api/plugins/PatternConstraint.java | 1 -
.../log4j/catalog/config/WebAppInitializer.java | 6 ------
.../log4j/catalog/config/WebMvcAppContext.java | 12 ------------
.../log4j/catalog/controller/CatalogController.java | 7 -------
.../interceptor/RequestContextHeaderInterceptor.java | 1 -
.../catalog/git/config/ApplicationConfiguration.java | 2 --
.../log4j/catalog/jpa/config/HibernateConfig.java | 3 ---
.../catalog/jpa/dao/PagingAndSortingRepository.java | 1 -
.../log4j/catalog/jpa/model/CategoryModel.java | 1 -
.../logging/log4j/catalog/jpa/model/ProductModel.java | 3 ---
.../log4j/catalog/jpa/service/CatalogServiceImpl.java | 1 -
19 files changed, 71 deletions(-)
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
index c6e5e0e..a17a4fa 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.catalog.CatalogManager;
import org.apache.logging.log4j.audit.exception.AuditException;
-import org.apache.logging.log4j.audit.util.NamingUtils;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.api.Event;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Chained.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Chained.java
index 0678a0b..f2936c7 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Chained.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Chained.java
@@ -20,8 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/ClientServer.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/ClientServer.java
index c988b67..b724a8d 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/ClientServer.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/ClientServer.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.audit.annotation;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
index 50aa034..9065bcc 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
@@ -24,10 +24,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.TreeSet;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMappings.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMappings.java
index 61a9154..7d9121c 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMappings.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMappings.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.function.Supplier;
import org.apache.logging.log4j.audit.annotation.Chained;
-import org.apache.logging.log4j.audit.annotation.ChainedSupplier;
import org.apache.logging.log4j.audit.annotation.ClientServer;
import org.apache.logging.log4j.audit.annotation.HeaderPrefix;
import org.apache.logging.log4j.audit.annotation.Local;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
index f60263b..cde500f 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.audit.rest;
import java.io.IOException;
-import java.text.DecimalFormat;
import java.util.Enumeration;
import javax.servlet.Filter;
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java
index 8bcb7e1..184552a 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.audit.service.config;
-import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -24,35 +23,18 @@ import java.util.List;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.UserInfo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.audit.AuditLogger;
-import org.apache.logging.log4j.audit.catalog.CatalogManager;
import org.apache.logging.log4j.audit.service.catalog.AuditCatalogManager;
import org.apache.logging.log4j.audit.service.catalog.AuditManager;
import org.apache.logging.log4j.audit.service.security.LocalAuthorizationInterceptor;
import org.apache.logging.log4j.audit.util.JsonObjectMapperFactory;
-import org.apache.logging.log4j.catalog.api.dao.CatalogDao;
import org.apache.logging.log4j.catalog.api.CatalogReader;
import org.apache.logging.log4j.catalog.api.dao.ClassPathCatalogReader;
import org.apache.logging.log4j.catalog.api.util.CatalogEventFilter;
-import org.apache.logging.log4j.catalog.git.dao.GitCatalogDao;
-import org.eclipse.jgit.api.TransportConfigCallback;
-import org.eclipse.jgit.transport.CredentialsProvider;
-import org.eclipse.jgit.transport.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.OpenSshConfig;
-import org.eclipse.jgit.transport.SshSessionFactory;
-import org.eclipse.jgit.transport.SshTransport;
-import org.eclipse.jgit.transport.Transport;
-import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
-import org.eclipse.jgit.util.FS;
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -71,7 +53,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
@Configuration
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeSerializer.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeSerializer.java
index 95ef645..ab24d27 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeSerializer.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeSerializer.java
@@ -18,15 +18,9 @@ package org.apache.logging.log4j.catalog.api.plugins;
import java.io.IOException;
import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.apache.logging.log4j.catalog.api.ConstraintType;
-import org.apache.logging.log4j.catalog.api.exception.NameNotFoundException;
/**
*
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/PatternConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/PatternConstraint.java
index b983d4b..576514d 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/PatternConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/PatternConstraint.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.api.plugins;
import org.apache.logging.log4j.catalog.api.ConstraintType;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import static org.apache.logging.log4j.catalog.api.util.StringUtils.*;
-import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
/**
*
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
index 1e6f884..d4c8206 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
@@ -21,15 +21,9 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.util.ProfileUtil;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
public class WebAppInitializer {
private static final String APPLICATION_NAME = "AuditCatalog";
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java
index cdddb07..2da8f2c 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.config;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Collections;
import java.util.List;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -53,24 +52,13 @@ import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.Scope;
import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.core.annotation.Order;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring4.view.ThymeleafView;
-import org.thymeleaf.spring4.view.ThymeleafViewResolver;
-import org.thymeleaf.templatemode.TemplateMode;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java
index 3c97177..640bd29 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java
@@ -16,12 +16,9 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.dao.CatalogDao;
@@ -44,11 +41,7 @@ import org.apache.logging.log4j.catalog.jpa.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.springframework.web.bind.annotation.RestController;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/interceptor/RequestContextHeaderInterceptor.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/interceptor/RequestContextHeaderInterceptor.java
index 520fb1a..c17b3b8 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/interceptor/RequestContextHeaderInterceptor.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/interceptor/RequestContextHeaderInterceptor.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.interceptor;
import java.io.IOException;
-import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
diff --git a/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/config/ApplicationConfiguration.java b/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/config/ApplicationConfiguration.java
index 6a7c786..68acce4 100644
--- a/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/config/ApplicationConfiguration.java
+++ b/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/config/ApplicationConfiguration.java
@@ -20,8 +20,6 @@ import javax.annotation.PreDestroy;
import java.io.File;
import org.apache.logging.log4j.catalog.git.dao.GitCatalogDao;
-import org.eclipse.jgit.transport.CredentialsProvider;
-import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HibernateConfig.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HibernateConfig.java
index 6855e62..c1e1c64 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HibernateConfig.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HibernateConfig.java
@@ -20,8 +20,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
@@ -30,7 +28,6 @@ import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
@Configuration
@EnableJpaRepositories("org.apache.logging.log4j.catalog.jpa.dao")
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/PagingAndSortingRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/PagingAndSortingRepository.java
index ee76265..c970fd2 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/PagingAndSortingRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/PagingAndSortingRepository.java
@@ -19,7 +19,6 @@ import java.io.Serializable;
import java.util.List;
import java.util.Optional;
-import org.apache.logging.log4j.catalog.jpa.model.EventModel;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CategoryModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CategoryModel.java
index 8c03be2..70b2097 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CategoryModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CategoryModel.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.model;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ProductModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ProductModel.java
index 17e42cb..993a976 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ProductModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ProductModel.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.model;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -31,8 +30,6 @@ import javax.persistence.UniqueConstraint;
import java.io.Serializable;
import java.util.List;
-import org.apache.logging.log4j.catalog.api.Product;
-
/**
* Definition of a ProductDto.
*/
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CatalogServiceImpl.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CatalogServiceImpl.java
index d9a40b1..77ceefe 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CatalogServiceImpl.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CatalogServiceImpl.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
[logging-log4j-audit] 03/06: Trivial cleanups and improvements
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
commit dd0fa24cfb6cf5361bfe7fafb8910f7dd105a735
Author: Andrei Ivanov <an...@gmail.com>
AuthorDate: Tue May 28 13:50:42 2019 +0300
Trivial cleanups and improvements
---
.../logging/log4j/audit/AbstractEventLogger.java | 14 ++++-----
.../logging/log4j/audit/LogEventFactory.java | 2 +-
.../log4j/audit/catalog/CatalogManagerImpl.java | 8 ++----
.../log4j/audit/generator/AccessorDefinition.java | 11 +++-----
.../log4j/audit/generator/ClassGenerator.java | 16 +++++------
.../audit/generator/ConstructorDefinition.java | 11 ++------
.../log4j/audit/generator/InterfacesGenerator.java | 4 +--
.../log4j/audit/generator/MethodDefinition.java | 6 +---
.../logging/log4j/audit/rest/ElapsedUtil.java | 3 +-
.../log4j/audit/rest/RequestContextFilter.java | 23 ++++++---------
.../rest/RequestContextHandlerInterceptor.java | 14 ++++-----
.../rest/RequestContextHeaderInterceptor.java | 2 +-
.../logging/log4j/audit/AuditLoggerTest.java | 6 ++--
.../apache/logging/log4j/audit/BaseEventTest.java | 2 +-
.../audit/generator/TestInterfacesGenerator.java | 2 +-
.../audit/service/config/WebAppInitializer.java | 3 +-
.../audit/service/config/WebMvcAppContext.java | 11 ++++----
.../audit/service/controller/AuditController.java | 9 ++----
.../service/controller/CatalogController.java | 8 +++---
.../RestResponseEntityExceptionHandler.java | 4 +--
.../catalog/api/annotation/JdbcUrlCondition.java | 2 +-
.../catalog/api/dao/ClassPathCatalogReader.java | 1 -
.../log4j/catalog/api/plugins/EnumConstraint.java | 2 +-
.../log4j/catalog/config/WebAppInitializer.java | 33 +++++++++-------------
.../catalog/controller/AttributeController.java | 23 +++++++--------
.../catalog/controller/CatalogController.java | 16 ++++-------
.../catalog/controller/CategoryController.java | 23 +++++++--------
.../catalog/controller/ConstraintController.java | 17 +++++------
.../log4j/catalog/controller/EventController.java | 2 +-
.../catalog/controller/ProductController.java | 12 +++-----
.../logging/log4j/catalog/git/CatalogTest.java | 10 ++-----
.../log4j/catalog/jpa/model/ConstraintModel.java | 2 +-
.../catalog/jpa/service/AttributeServiceImpl.java | 9 ++----
.../catalog/jpa/service/CategoryServiceImpl.java | 9 ++----
.../catalog/jpa/service/ConstraintServiceImpl.java | 11 +++-----
.../catalog/jpa/service/EventServiceImpl.java | 13 ++++-----
.../catalog/jpa/service/ProductServiceImpl.java | 9 ++----
.../logging/log4j/catalog/jpa/CatalogTest.java | 25 ++++++++--------
38 files changed, 149 insertions(+), 229 deletions(-)
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
index a17a4fa..472b2b9 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
@@ -16,30 +16,30 @@
*/
package org.apache.logging.log4j.audit;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.catalog.CatalogManager;
import org.apache.logging.log4j.audit.exception.AuditException;
+import org.apache.logging.log4j.audit.exception.ConstraintValidationException;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.api.Event;
import org.apache.logging.log4j.catalog.api.EventAttribute;
-import org.apache.logging.log4j.audit.exception.ConstraintValidationException;
import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins;
import org.apache.logging.log4j.message.StructuredDataMessage;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
-import static java.util.Collections.*;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
/**
* This class is used to log events generated remotely.
*/
public abstract class AbstractEventLogger {
- private static final Logger logger = LogManager.getLogger(AbstractEventLogger.class);
-
private static final int DEFAULT_MAX_LENGTH = 32;
private static ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java
index e3b2e48..2bd0051 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java
@@ -411,7 +411,7 @@ public class LogEventFactory {
public Property(String name, boolean isRequired, List<Constraint> constraints) {
this.name = name;
- this.constraints = constraints.toArray(new Constraint[constraints.size()]);
+ this.constraints = constraints.toArray(new Constraint[0]);
this.isRequired = isRequired;
}
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java
index 1cd9831..2c921a2 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java
@@ -32,8 +32,8 @@ import org.apache.logging.log4j.audit.exception.AuditException;
import org.apache.logging.log4j.audit.util.NamingUtils;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.CatalogData;
-import org.apache.logging.log4j.catalog.api.Event;
import org.apache.logging.log4j.catalog.api.CatalogReader;
+import org.apache.logging.log4j.catalog.api.Event;
import org.apache.logging.log4j.catalog.api.EventAttribute;
import static java.util.Collections.emptyList;
@@ -142,11 +142,7 @@ public class CatalogManagerImpl implements CatalogManager {
if (attr.isRequestContext()) {
requestContextAttributes.put(attr.getName(), attr);
}
- Map<String, Attribute> attrMap = attributeMap.get(attr.getCatalogId());
- if (attrMap == null) {
- attrMap = new HashMap<>();
- attributeMap.put(attr.getCatalogId(), attrMap);
- }
+ Map<String, Attribute> attrMap = attributeMap.computeIfAbsent(attr.getCatalogId(), k -> new HashMap<>());
attrMap.put(attr.getName(), attr);
}
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/AccessorDefinition.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/AccessorDefinition.java
index cf812ae..d12165a 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/AccessorDefinition.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/AccessorDefinition.java
@@ -28,9 +28,7 @@ public class AccessorDefinition {
if (getterContent != null) {
setContent("\t" + StringUtil.filterContent(getterContent, name, type));
} else {
- StringBuilder sb = new StringBuilder();
- sb.append("\treturn ").append(beanDefinition.getName()).append(";");
- setContent(sb.toString());
+ setContent("\treturn " + beanDefinition.getName() + ";");
}
}
}
@@ -44,10 +42,9 @@ public class AccessorDefinition {
setContent("\t"
+ StringUtil.filterContent(setterContent, name, type));
} else {
- StringBuilder sb = new StringBuilder();
- sb.append("\tthis.").append(beanDefinition.getName())
- .append(" = ").append(beanDefinition.getName()).append(";");
- setContent(sb.toString());
+ String sb = "\tthis." + beanDefinition.getName() +
+ " = " + beanDefinition.getName() + ";";
+ setContent(sb);
}
getParameters().add(new Parameter(beanDefinition.getName(), beanDefinition.getType(), ""));
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
index 9065bcc..8de80c8 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
@@ -16,6 +16,10 @@
*/
package org.apache.logging.log4j.audit.generator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.audit.util.NamingUtils;
+
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -27,11 +31,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.audit.util.NamingUtils;
-
-import static org.apache.logging.log4j.audit.generator.Constants.*;
+import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
/**
* Generates the Classes and Interfaces for Audit Logging based on data in the Catalog.
@@ -39,7 +39,7 @@ import static org.apache.logging.log4j.audit.generator.Constants.*;
public final class ClassGenerator {
private static final Logger LOGGER = LogManager.getLogger(ClassGenerator.class);
- protected List<AccessorDefinition> beanMethods = new ArrayList<AccessorDefinition>();
+ protected List<AccessorDefinition> beanMethods = new ArrayList<>();
private boolean isClass = true;
private String className;
private String parentClassName;
@@ -49,7 +49,7 @@ public final class ClassGenerator {
private boolean verbose;
private List<String> implementsDeclarations = new ArrayList<>();
- private Set<String> importsDeclarations = new HashSet<String>();
+ private Set<String> importsDeclarations = new HashSet<>();
private List<VariableDefinition> localVariables = new ArrayList<>();
@@ -236,7 +236,7 @@ public final class ClassGenerator {
StringBuilder sb = new StringBuilder();
sb.append("package ").append(getPackageName()).append(";\n\n");
if (getImports() != null) {
- List<String> list = new ArrayList<String>(getImports());
+ List<String> list = new ArrayList<>(getImports());
Collections.sort(list);
for (String element : list) {
sb.append("import ").append(element).append(";\n");
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ConstructorDefinition.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ConstructorDefinition.java
index b9989cb..548d4d9 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ConstructorDefinition.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ConstructorDefinition.java
@@ -17,10 +17,9 @@
package org.apache.logging.log4j.audit.generator;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import static org.apache.logging.log4j.audit.generator.Constants.*;
+import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
public class ConstructorDefinition implements Comparable<ConstructorDefinition> {
private String visability = PUBLIC;
@@ -84,9 +83,7 @@ public class ConstructorDefinition implements Comparable<ConstructorDefinition>
sb.append(getName()).append("(");
if (getParameters() != null) {
boolean first = true;
- for (Iterator<Parameter> iter = getParameters().iterator(); iter
- .hasNext(); ) {
- Parameter element = iter.next();
+ for (Parameter element : getParameters()) {
if (!first) {
sb.append(", ");
}
@@ -98,9 +95,7 @@ public class ConstructorDefinition implements Comparable<ConstructorDefinition>
if (getExceptions() != null && getExceptions().size() > 0) {
sb.append(" throws ");
boolean first = true;
- for (Iterator<String> iter = getExceptions().iterator(); iter
- .hasNext(); ) {
- String element = iter.next();
+ for (String element : getExceptions()) {
if (!first) {
sb.append(", ");
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
index 78aba9b..023c847 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/InterfacesGenerator.java
@@ -242,9 +242,7 @@ public class InterfacesGenerator {
}
}
if (importedTypes.size() > 0) {
- for (String className : importedTypes.values()) {
- imports.add(className);
- }
+ imports.addAll(importedTypes.values());
}
if (anyRequired) {
imports.add(REQUIRED_IMPORT);
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java
index 0d8f0b3..7fa29d1 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.generator;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.logging.log4j.audit.util.NamingUtils;
@@ -67,8 +66,7 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
.append("(");
boolean first = true;
if (parameters != null) {
- for (Iterator<String> iter = parameters.iterator(); iter.hasNext(); ) {
- String element = iter.next();
+ for (String element : parameters) {
if (!first) {
sb.append(", ");
}
@@ -118,8 +116,6 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
setContent(content + "return 0;");
} else if (returnType.equals("float")) {
setContent(content + "return 0.0;");
- } else if (returnType.equals("float")) {
- setContent(content + "return 0.0;");
} else if (returnType.equals("char")) {
setContent(content + "return ' ';");
} else if (returnType.equals("short")) {
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java
index 46f7c89..71f899d 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java
@@ -46,8 +46,7 @@ public class ElapsedUtil {
msg.append(minutes).append(" minutes ");
}
- DecimalFormat numFormat = null;
- numFormat = new DecimalFormat("#0");
+ DecimalFormat numFormat = new DecimalFormat("#0");
msg.append(numFormat.format(seconds)).append('.');
numFormat = new DecimalFormat("000000000");
msg.append(numFormat.format(nanoseconds)).append(" seconds");
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
index cde500f..af19979 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
@@ -16,24 +16,21 @@
*/
package org.apache.logging.log4j.audit.rest;
-import java.io.IOException;
-import java.util.Enumeration;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.audit.request.ChainedMapping;
+import org.apache.logging.log4j.audit.request.RequestContextMapping;
+import org.apache.logging.log4j.audit.request.RequestContextMappings;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.audit.request.ChainedMapping;
-import org.apache.logging.log4j.audit.request.RequestContextMapping;
-import org.apache.logging.log4j.audit.request.RequestContextMappings;
+import java.util.Enumeration;
/**
* Filter to initialize and clear the RequestContext.
@@ -54,10 +51,9 @@ public class RequestContextFilter implements Filter {
/**
* @param filterConfig
- * @throws ServletException
*/
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig filterConfig) {
if (requestContextClass != null) {
mappings = new RequestContextMappings(requestContextClass);
} else {
@@ -73,8 +69,7 @@ public class RequestContextFilter implements Filter {
/**
* Manages the initialization and clearing of the RequestContext.
*/
- public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
- throws IOException, ServletException {
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) {
if (servletRequest instanceof HttpServletRequest) {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
index 114dbf5..95fcacb 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
@@ -16,10 +16,6 @@
*/
package org.apache.logging.log4j.audit.rest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Enumeration;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
@@ -29,6 +25,10 @@ import org.apache.logging.log4j.audit.request.RequestContextMappings;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Enumeration;
+
/**
* May be used instead of the RequestContextFilter to convert RequestContext headers to ThreadContext variables.
*/
@@ -43,7 +43,7 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
}
@Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception {
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) {
logger.trace("Starting request {}", request.getRequestURI());
Enumeration<String> headers = request.getHeaderNames();
while (headers.hasMoreElements()) {
@@ -70,7 +70,7 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
}
@Override
- public void postHandle(HttpServletRequest request, HttpServletResponse response, Object o, ModelAndView modelAndView) throws Exception {
+ public void postHandle(HttpServletRequest request, HttpServletResponse response, Object o, ModelAndView modelAndView) {
if (logger.isTraceEnabled()) {
long elapsed = System.nanoTime() - startTime.get();
StringBuilder sb = new StringBuilder("Request ").append(request.getRequestURI()).append(" completed in ");
@@ -81,7 +81,7 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
}
@Override
- public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
+ public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) {
ThreadContext.clearMap();
}
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java
index 850a34b..ce031e4 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java
@@ -37,7 +37,7 @@ import org.springframework.http.client.ClientHttpResponse;
*/
public class RequestContextHeaderInterceptor implements ClientHttpRequestInterceptor {
- private RequestContextMappings mappings = null;
+ private RequestContextMappings mappings;
public RequestContextHeaderInterceptor(RequestContextMappings mappings) {
this.mappings = mappings;
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
index 94c1f53..bac3eaf 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java
@@ -92,7 +92,7 @@ public class AuditLoggerTest {
ThreadContext.put("product", "TestProduct");
ThreadContext.put("timeZone", "America/Phoenix");
ThreadContext.put("loginId", "TestUser");
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
properties.put("toAccount", "123456");
properties.put("fromAccount", "111111");
properties.put("amount", "111.55");
@@ -115,7 +115,7 @@ public class AuditLoggerTest {
public void testMissingRequestContextAttribute() {
auditLogger = buildAuditLogger(catalogReader);
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
properties.put("toAccount", "123456");
properties.put("fromAccount", "111111");
properties.put("amount", "111.55");
@@ -132,7 +132,7 @@ public class AuditLoggerTest {
ThreadContext.put("product", "TestProduct");
ThreadContext.put("timeZone", "America/Phoenix");
ThreadContext.put("loginId", "TestUser");
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
properties.put("toAccount", "123456");
properties.put("amount", "111.55");
auditLogger.logEvent("transfer", properties);
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/BaseEventTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/BaseEventTest.java
index b547daf..a04fcc1 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/BaseEventTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/BaseEventTest.java
@@ -35,7 +35,7 @@ public class BaseEventTest {
protected static ListAppender app;
@BeforeClass
- public static void setupClass() throws Exception {
+ public static void setupClass() {
ctx = (LoggerContext) LogManager.getContext(false);
Configuration config = ctx.getConfiguration();
for (Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java
index ac9aba7..c4748d2 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java
@@ -63,6 +63,6 @@ public class TestInterfacesGenerator {
List<String> fileNames = new ArrayList<>();
Files.find(p, maxDepth, (path, basicFileAttributes) -> String.valueOf(path).endsWith(".java"))
.map(path -> path.getFileName().toString()).forEach(fileNames::add);
- assertTrue("Incorrect number of files generated. Expected 4 was " + fileNames.size(), fileNames.size() == 4);
+ assertEquals("Incorrect number of files generated. Expected 4 was " + fileNames.size(), 4, fileNames.size());
}
}
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebAppInitializer.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebAppInitializer.java
index 5f8af47..7cfacff 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebAppInitializer.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebAppInitializer.java
@@ -23,14 +23,13 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
import org.springframework.web.servlet.DispatcherServlet;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.ServletRegistration;
public class WebAppInitializer implements WebApplicationInitializer {
private static final String APPLICATION_NAME = "AuditService";
@Override
- public void onStartup(ServletContext servletContext) throws ServletException {
+ public void onStartup(ServletContext servletContext) {
servletContext.setInitParameter("applicationName", APPLICATION_NAME);
System.setProperty("applicationName", APPLICATION_NAME);
ProfileUtil.setActiveProfile(servletContext);
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java
index 184552a..e77f84a 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/WebMvcAppContext.java
@@ -16,12 +16,7 @@
*/
package org.apache.logging.log4j.audit.service.config;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
import com.fasterxml.jackson.databind.ObjectMapper;
-
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -54,6 +49,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
@Configuration
@EnableWebMvc
@@ -140,7 +139,7 @@ public class WebMvcAppContext extends WebMvcConfigurerAdapter {
@Bean
public List<ClientHttpRequestInterceptor> restInterceptors() {
- return Arrays.asList(new ClientHttpRequestInterceptor[] {});
+ return Collections.emptyList();
}
@Bean
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/AuditController.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/AuditController.java
index 446f283..d0d91b6 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/AuditController.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/AuditController.java
@@ -16,12 +16,9 @@
*/
package org.apache.logging.log4j.audit.service.controller;
-import java.util.Map;
-
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import io.swagger.annotations.ApiOperation;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.AuditLogger;
import org.apache.logging.log4j.audit.dto.AuditDto;
@@ -33,13 +30,11 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.ApiOperation;
+import java.util.Map;
@RestController
public class AuditController {
- private static final Logger LOGGER = LogManager.getLogger();
-
@Autowired
private AuditLogger auditLogger;
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
index f79cb4b..53d8a8e 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
@@ -135,7 +135,7 @@ public class CatalogController {
@RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Attribute>>() {
}.getType();
- List<Attribute> attributes = null;
+ List<Attribute> attributes;
if (startIndex == null || pageSize == null) {
attributes = attributeModelMapper.map(attributeService.getAttributes(catalogId), listType);
} else {
@@ -236,7 +236,7 @@ public class CatalogController {
@RequestParam(value = "sortCol", required= false) String sortColumn,
@RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Event>>() {}.getType();
- List<Event> events = null;
+ List<Event> events;
if (startIndex == null || pageSize == null) {
events = eventModelMapper.map(eventService.getEvents(catalogId), listType);
} else {
@@ -314,7 +314,7 @@ public class CatalogController {
@RequestParam(value = "sortCol", required= false) String sortColumn,
@RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Product>>() {}.getType();
- List<Product> products = null;
+ List<Product> products;
if (startIndex == null || pageSize == null) {
products = productModelMapper.map(productService.getProducts(catalogId), listType);
} else {
@@ -387,7 +387,7 @@ public class CatalogController {
@RequestParam(value = "sortCol", required= false) String sortColumn,
@RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Category>>() {}.getType();
- List<Category> categories = null;
+ List<Category> categories;
if (startIndex == null || pageSize == null) {
categories = categoryModelMapper.map(categoryService.getCategories(catalogId), listType);
} else {
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/RestResponseEntityExceptionHandler.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/RestResponseEntityExceptionHandler.java
index 200c29e..f700862 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/RestResponseEntityExceptionHandler.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/RestResponseEntityExceptionHandler.java
@@ -35,9 +35,9 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH
@ResponseBody
public ResponseEntity<?> handleAnyException(Exception e) {
if (e instanceof IllegalArgumentException) {
- return new ResponseEntity(e.getMessage(), HttpStatus.BAD_REQUEST);
+ return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
} else if (e instanceof IllegalStateException) {
- return new ResponseEntity(e.getMessage(), HttpStatus.CONFLICT);
+ return new ResponseEntity<>(e.getMessage(), HttpStatus.CONFLICT);
}
return errorResponse(e, HttpStatus.INTERNAL_SERVER_ERROR);
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
index 84ebbbe..de6dbc3 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
@@ -37,7 +37,7 @@ public class JdbcUrlCondition implements Condition {
if (map != null && map.containsKey("value")) {
String value = map.get("value").toString();
String jdbcUrl = env.getProperty("jdbcUrl");
- Boolean isEmbedded = Boolean.parseBoolean(env.getProperty("isEmbedded"));
+ boolean isEmbedded = Boolean.parseBoolean(env.getProperty("isEmbedded"));
boolean result;
if (value.equals("hsqldb")) {
result = jdbcUrl == null || isEmbedded;
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java
index 77e1171..4959302 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java
@@ -41,7 +41,6 @@ import org.apache.logging.log4j.util.LoaderUtil;
public class ClassPathCatalogReader extends AbstractCatalogReader {
private static final Logger LOGGER = LogManager.getLogger(ClassPathCatalogReader.class);
- private static final String BASEDIR = "baseDir";
private static final String CATALOG_ATTRIBUTE_NAME = "catalogFile";
private static final String DEFAULT_CATALOG_FILE = "catalog.json";
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/EnumConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/EnumConstraint.java
index 929c0a8..a5c9f84 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/EnumConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/EnumConstraint.java
@@ -31,7 +31,7 @@ public class EnumConstraint implements ConstraintType {
@Override
public void validate(boolean isRequestContext, String name, String value, String enums, StringBuilder error) {
if (!isBlank(enums) && !isBlank(value)) {
- boolean result = Arrays.stream(enums.trim().split("\\s*,\\s*")).anyMatch(value::equals);
+ boolean result = Arrays.asList(enums.trim().split("\\s*,\\s*")).contains(value);
if (!result) {
appendNewline(error);
if (isRequestContext) {
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
index d4c8206..12824ec 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
@@ -22,33 +22,26 @@ import org.apache.logging.log4j.catalog.api.util.ProfileUtil;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Bean;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
public class WebAppInitializer {
private static final String APPLICATION_NAME = "AuditCatalog";
private static Logger LOGGER = LogManager.getLogger(WebAppInitializer.class);
@Bean
public ServletContextInitializer initializer() {
- return new ServletContextInitializer() {
-
- @Override
- public void onStartup(ServletContext servletContext) throws ServletException {
- LOGGER.info("Starting Audit Catalog Editor");
- servletContext.setInitParameter("applicationName", APPLICATION_NAME);
- ProfileUtil.setActiveProfile(servletContext);
- servletContext.setInitParameter("isEmbedded", "true");
- System.setProperty("applicationName", APPLICATION_NAME);
- //AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
- //rootContext.setDisplayName(APPLICATION_NAME);
- //rootContext.register(WebMvcAppContext.class);
- //servletContext.addListener(new ContextLoaderListener(rootContext));
+ return servletContext -> {
+ LOGGER.info("Starting Audit Catalog Editor");
+ servletContext.setInitParameter("applicationName", APPLICATION_NAME);
+ ProfileUtil.setActiveProfile(servletContext);
+ servletContext.setInitParameter("isEmbedded", "true");
+ System.setProperty("applicationName", APPLICATION_NAME);
+ //AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
+ //rootContext.setDisplayName(APPLICATION_NAME);
+ //rootContext.register(WebMvcAppContext.class);
+ //servletContext.addListener(new ContextLoaderListener(rootContext));
- //ServletRegistration.Dynamic restServlet = servletContext.addServlet("dispatcherServlet", new DispatcherServlet(rootContext));
- //restServlet.setLoadOnStartup(1);
- //restServlet.addMapping("/*");
- }
+ //ServletRegistration.Dynamic restServlet = servletContext.addServlet("dispatcherServlet", new DispatcherServlet(rootContext));
+ //restServlet.setLoadOnStartup(1);
+ //restServlet.addMapping("/*");
};
}
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
index ec12244..5c93811 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
@@ -16,17 +16,6 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import javax.annotation.PostConstruct;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.api.ListResponse;
@@ -48,6 +37,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.PostConstruct;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
/**
* Catalog Product controller
*/
@@ -55,7 +53,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(value = "/api/attributes")
@RestController
public class AttributeController {
- private static final Logger LOGGER = LogManager.getLogger();
private static ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
private ModelMapper modelMapper = new ModelMapper();
@@ -81,7 +78,7 @@ public class AttributeController {
Type listType = new TypeToken<List<Attribute>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
- List<Attribute> attributes = null;
+ List<Attribute> attributes;
if (startIndex == null || pageSize == null) {
attributes = modelMapper.map(attributeService.getAttributes(), listType);
} else {
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java
index 640bd29..37f023b 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CatalogController.java
@@ -16,16 +16,12 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.catalog.api.dao.CatalogDao;
import org.apache.logging.log4j.catalog.api.Attribute;
+import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.Category;
import org.apache.logging.log4j.catalog.api.Event;
import org.apache.logging.log4j.catalog.api.Product;
+import org.apache.logging.log4j.catalog.api.dao.CatalogDao;
import org.apache.logging.log4j.catalog.jpa.converter.AttributeModelConverter;
import org.apache.logging.log4j.catalog.jpa.converter.CategoryModelConverter;
import org.apache.logging.log4j.catalog.jpa.converter.EventModelConverter;
@@ -42,19 +38,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
-
-import org.apache.logging.log4j.catalog.api.CatalogData;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* The Class CatalogController.
*/
@RestController
public class CatalogController {
- /** The logger. */
- private static Logger logger = LogManager.getLogger(CatalogController.class);
-
@Autowired
private EventService eventService;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
index 578b70c..1d2cb95 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
@@ -16,20 +16,11 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import javax.annotation.PostConstruct;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Category;
-import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
-import org.apache.logging.log4j.catalog.jpa.service.CategoryService;
import org.apache.logging.log4j.catalog.jpa.converter.CategoryConverter;
import org.apache.logging.log4j.catalog.jpa.converter.CategoryModelConverter;
+import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
+import org.apache.logging.log4j.catalog.jpa.service.CategoryService;
import org.modelmapper.ModelMapper;
import org.modelmapper.TypeToken;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +32,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.PostConstruct;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Catalog Category controller
*/
@@ -48,7 +46,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(value = "/api/categories")
@RestController
public class CategoryController {
- private static final Logger LOGGER = LogManager.getLogger();
private ModelMapper modelMapper = new ModelMapper();
@@ -74,7 +71,7 @@ public class CategoryController {
Type listType = new TypeToken<List<Category>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
- List<Category> categories = null;
+ List<Category> categories;
if (startIndex == null || pageSize == null) {
categories = modelMapper.map(categoryService.getCategories(), listType);
} else {
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
index ef8f290..4a552e7 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
@@ -16,15 +16,6 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.jpa.model.ConstraintModel;
@@ -43,6 +34,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* Constraint controller
*/
@@ -50,7 +48,6 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(value = "/api/constraints")
@RestController
public class ConstraintController {
- private static final Logger LOGGER = LogManager.getLogger();
private ModelMapper modelMapper = new ModelMapper();
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
index 0dd8295..dd68682 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
@@ -74,7 +74,7 @@ public class EventController {
Type listType = new TypeToken<List<Event>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
- List<Event> events = null;
+ List<Event> events;
if (startIndex == null || pageSize == null) {
events = modelMapper.map(eventService.getEvents(), listType);
} else {
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
index d566519..e82a384 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
@@ -16,15 +16,11 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import javax.annotation.PostConstruct;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Product;
-import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
-import org.apache.logging.log4j.catalog.jpa.service.ProductService;
import org.apache.logging.log4j.catalog.jpa.converter.ProductConverter;
import org.apache.logging.log4j.catalog.jpa.converter.ProductModelConverter;
+import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
+import org.apache.logging.log4j.catalog.jpa.service.ProductService;
import org.modelmapper.ModelMapper;
import org.modelmapper.TypeToken;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.PostConstruct;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
@@ -49,7 +46,6 @@ import java.util.Map;
@RequestMapping(value = "/api/products")
@RestController
public class ProductController {
- private static final Logger LOGGER = LogManager.getLogger();
private ModelMapper modelMapper = new ModelMapper();
@@ -74,7 +70,7 @@ public class ProductController {
Type listType = new TypeToken<List<Product>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
- List<Product> products = null;
+ List<Product> products;
if (startIndex == null || pageSize == null) {
products = modelMapper.map(productService.getProducts(), listType);
} else {
diff --git a/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/CatalogTest.java b/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/CatalogTest.java
index ebbe165..247cf4d 100644
--- a/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/CatalogTest.java
+++ b/log4j-catalog/log4j-catalog-git/src/test/java/org/apache/logging/log4j/catalog/git/CatalogTest.java
@@ -40,13 +40,9 @@ public class CatalogTest {
@BeforeClass
public static void initTest() {
- try {
- System.setProperty("environment", "lab");
- System.setProperty("site", "dev1");
- System.setProperty("applicationName", "CatalogService");
- } catch (RuntimeException ex) {
- throw ex;
- }
+ System.setProperty("environment", "lab");
+ System.setProperty("site", "dev1");
+ System.setProperty("applicationName", "CatalogService");
}
@Test
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ConstraintModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ConstraintModel.java
index eb70da6..401b3b5 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ConstraintModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/ConstraintModel.java
@@ -77,7 +77,7 @@ public class ConstraintModel implements Serializable {
public void setAttribute(AttributeModel attribute) {
this.attribute = attribute;
- if (attribute.getConstraints() != null && !attribute.getConstraints().contains(this)) {
+ if (attribute.getConstraints() != null) {
attribute.getConstraints().add(this);
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeServiceImpl.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeServiceImpl.java
index 34865c5..e436f9d 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeServiceImpl.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeServiceImpl.java
@@ -16,11 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.jpa.dao.AttributeRepository;
import org.apache.logging.log4j.catalog.jpa.model.AttributeModel;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,11 +25,13 @@ import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Optional;
+
@Service
@Repository
@Transactional
public class AttributeServiceImpl extends AbstractPagingAndSortingService implements AttributeService {
- private static final Logger LOGGER = LogManager.getLogger();
@Autowired
private AttributeRepository attributeRepository;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryServiceImpl.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryServiceImpl.java
index 0fc3050..13b752d 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryServiceImpl.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryServiceImpl.java
@@ -16,11 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.jpa.dao.CategoryRepository;
import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,11 +25,13 @@ import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Optional;
+
@Service
@Repository
@Transactional
public class CategoryServiceImpl extends AbstractPagingAndSortingService implements CategoryService {
- private static final Logger LOGGER = LogManager.getLogger();
@Autowired
private CategoryRepository categoryRepository;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintServiceImpl.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintServiceImpl.java
index 8583175..4548590 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintServiceImpl.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintServiceImpl.java
@@ -16,12 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins;
import org.apache.logging.log4j.catalog.jpa.dao.ConstraintRepository;
import org.apache.logging.log4j.catalog.jpa.model.ConstraintModel;
@@ -30,11 +24,14 @@ import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
@Service
@Repository
@Transactional
public class ConstraintServiceImpl implements ConstraintService {
- private static final Logger LOGGER = LogManager.getLogger();
@Autowired
private ConstraintRepository constraintRepository;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventServiceImpl.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventServiceImpl.java
index d612b28..52033b3 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventServiceImpl.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventServiceImpl.java
@@ -16,13 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.jpa.dao.EventRepository;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,11 +25,15 @@ import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
@Service
@Repository
@Transactional
public class EventServiceImpl extends AbstractPagingAndSortingService implements EventService {
- private static final Logger LOGGER = LogManager.getLogger();
@Autowired
private EventRepository eventRepository;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductServiceImpl.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductServiceImpl.java
index ca4d16f..299b7e0 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductServiceImpl.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductServiceImpl.java
@@ -16,11 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.jpa.dao.ProductRepository;
import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,11 +25,13 @@ import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Optional;
+
@Service
@Repository
@Transactional
public class ProductServiceImpl extends AbstractPagingAndSortingService implements ProductService {
- private static final Logger LOGGER = LogManager.getLogger();
@Autowired
private ProductRepository productRepository;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/CatalogTest.java b/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/CatalogTest.java
index f8f599c..b7cd69c 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/CatalogTest.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/CatalogTest.java
@@ -15,12 +15,8 @@
*/
package org.apache.logging.log4j.catalog.jpa;
-import java.util.List;
-import java.util.Optional;
-
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.DataType;
-import org.apache.logging.log4j.catalog.jpa.service.CatalogService;
import org.apache.logging.log4j.catalog.jpa.config.ApplicationConfiguration;
import org.apache.logging.log4j.catalog.jpa.dao.AttributeRepository;
import org.apache.logging.log4j.catalog.jpa.dao.CategoryRepository;
@@ -28,6 +24,7 @@ import org.apache.logging.log4j.catalog.jpa.dao.EventRepository;
import org.apache.logging.log4j.catalog.jpa.model.AttributeModel;
import org.apache.logging.log4j.catalog.jpa.model.EventAttributeModel;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
+import org.apache.logging.log4j.catalog.jpa.service.CatalogService;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,6 +35,10 @@ import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.SqlGroup;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import java.util.List;
+import java.util.Optional;
+
import static org.junit.Assert.*;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -60,14 +61,10 @@ public class CatalogTest {
@BeforeClass
public static void initTest() {
- try {
- System.setProperty("environment", "lab");
- System.setProperty("site", "dev1");
- System.setProperty("applicationName", "CatalogService");
- System.setProperty("spring.profiles.active", "eclipseLink");
- } catch (RuntimeException ex) {
- throw ex;
- }
+ System.setProperty("environment", "lab");
+ System.setProperty("site", "dev1");
+ System.setProperty("applicationName", "CatalogService");
+ System.setProperty("spring.profiles.active", "eclipseLink");
}
@Test
@@ -128,7 +125,7 @@ public class CatalogTest {
}
assertNotNull(persisted);
assertNotNull(persisted.getId());
- assertTrue(event.equals(persisted));
+ assertEquals(event, persisted);
assertNotNull(persisted.getAttributes());
assertFalse(persisted.getAttributes().isEmpty());
assertEquals(event.getAttributes().size(), persisted.getAttributes().size());
@@ -146,7 +143,7 @@ public class CatalogTest {
}
assertNotNull(persisted);
assertNotNull(persisted.getId());
- assertTrue(persisted.getId().equals(id));
+ assertEquals(persisted.getId(), id);
assertNotNull(persisted.getAttributes());
assertFalse(persisted.getAttributes().isEmpty());
assertEquals(event.getAttributes().size(), persisted.getAttributes().size());
[logging-log4j-audit] 04/06: Mark fields as final where possible
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
commit 87c6255bf162bc3b91915d0fedfe1407fa90606b
Author: Andrei Ivanov <an...@gmail.com>
AuthorDate: Tue May 28 14:22:20 2019 +0300
Mark fields as final where possible
---
.../logging/log4j/audit/AbstractEventLogger.java | 2 +-
.../apache/logging/log4j/audit/ActivityLogger.java | 2 +-
.../apache/logging/log4j/audit/AuditLogger.java | 2 +-
.../apache/logging/log4j/audit/AuditMessage.java | 2 +-
.../logging/log4j/audit/LogEventFactory.java | 4 ++--
.../log4j/audit/catalog/CatalogManagerImpl.java | 4 ++--
.../log4j/audit/generator/ClassGenerator.java | 16 ++++++++--------
.../log4j/audit/generator/MethodDefinition.java | 2 +-
.../logging/log4j/audit/rest/ElapsedUtil.java | 6 +++---
.../rest/RequestContextHandlerInterceptor.java | 4 ++--
.../rest/RequestContextHeaderInterceptor.java | 2 +-
.../apache/logging/log4j/audit/TransferTest.java | 2 +-
.../audit/generator/TestInterfacesGenerator.java | 2 +-
.../audit/service/catalog/AuditCatalogManager.java | 2 +-
.../service/controller/CatalogController.java | 8 ++++----
.../catalog/api/plugins/ConstraintPlugins.java | 4 ++--
.../api/plugins/ConstraintTypeDeserializer.java | 2 +-
.../log4j/catalog/config/WebAppInitializer.java | 2 +-
.../catalog/controller/AttributeController.java | 4 ++--
.../catalog/controller/CategoryController.java | 2 +-
.../catalog/controller/ConstraintController.java | 2 +-
.../log4j/catalog/controller/EventController.java | 22 +++++++++++-----------
.../catalog/controller/ProductController.java | 2 +-
.../catalog/jpa/config/EclipseLinkConfig.java | 2 +-
.../catalog/jpa/converter/AttributeConverter.java | 2 +-
.../catalog/jpa/converter/EventConverter.java | 2 +-
26 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
index 472b2b9..b573dac 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java
@@ -42,7 +42,7 @@ public abstract class AbstractEventLogger {
private static final int DEFAULT_MAX_LENGTH = 32;
- private static ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
+ private static final ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
public CatalogManager catalogManager;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/ActivityLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/ActivityLogger.java
index 5c1381f..7248019 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/ActivityLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/ActivityLogger.java
@@ -31,7 +31,7 @@ public class ActivityLogger extends AbstractEventLogger {
private static final String NAME = "ActivityLogger";
private static final String FQCN = ActivityLogger.class.getName();
- private static Marker EVENT_MARKER = MarkerManager.getMarker("Activity").addParents(EventLogger.EVENT_MARKER);
+ private static final Marker EVENT_MARKER = MarkerManager.getMarker("Activity").addParents(EventLogger.EVENT_MARKER);
private static final ExtendedLogger LOGGER = LogManager.getContext(false).getLogger(NAME);
public ActivityLogger() {
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditLogger.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditLogger.java
index d521399..55e2e7a 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditLogger.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditLogger.java
@@ -32,7 +32,7 @@ public class AuditLogger extends AbstractEventLogger {
private static final String NAME = "AuditLogger";
private static final String FQCN = AuditLogger.class.getName();
- private static Marker EVENT_MARKER = MarkerManager.getMarker("Audit").addParents(EventLogger.EVENT_MARKER);
+ private static final Marker EVENT_MARKER = MarkerManager.getMarker("Audit").addParents(EventLogger.EVENT_MARKER);
private static final ExtendedLogger LOGGER = LogManager.getContext(false).getLogger(NAME);
public AuditLogger() {
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditMessage.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditMessage.java
index 35b15a5..1b59a32 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditMessage.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditMessage.java
@@ -29,7 +29,7 @@ public class AuditMessage extends StructuredDataMessage {
private static final int MAX_LENGTH = 32;
- private Map<String, StructuredDataMessage> extraContent = new HashMap<>();
+ private final Map<String, StructuredDataMessage> extraContent = new HashMap<>();
public AuditMessage(String eventName) {
this(eventName, MAX_LENGTH);
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java
index 2bd0051..36d761f 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java
@@ -67,9 +67,9 @@ public class LogEventFactory {
private static AuditExceptionHandler defaultExceptionHandler = DEFAULT_HANDLER;
- private static ConcurrentMap<Class<?>, List<Property>> classMap = new ConcurrentHashMap<>();
+ private static final ConcurrentMap<Class<?>, List<Property>> classMap = new ConcurrentHashMap<>();
- private static ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
+ private static final ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
public static void setDefaultHandler(AuditExceptionHandler exceptionHandler) {
defaultExceptionHandler = (exceptionHandler == null) ? NOOP_EXCEPTION_HANDLER : exceptionHandler;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java
index 2c921a2..6d2c47b 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManagerImpl.java
@@ -44,11 +44,11 @@ import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CA
*/
public class CatalogManagerImpl implements CatalogManager {
- private static Logger logger = LogManager.getLogger(CatalogManagerImpl.class);
+ private static final Logger logger = LogManager.getLogger(CatalogManagerImpl.class);
private volatile Map<String, Map<String, CatalogInfo>> infoMap;
- private Map<String, Attribute> requestContextAttributes = new HashMap<>();
+ private final Map<String, Attribute> requestContextAttributes = new HashMap<>();
protected final Map<String, Map<String, Attribute>> attributeMap = new ConcurrentHashMap<>();
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
index 8de80c8..6bcebfc 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
@@ -39,23 +39,23 @@ import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
public final class ClassGenerator {
private static final Logger LOGGER = LogManager.getLogger(ClassGenerator.class);
- protected List<AccessorDefinition> beanMethods = new ArrayList<>();
+ protected final List<AccessorDefinition> beanMethods = new ArrayList<>();
private boolean isClass = true;
- private String className;
+ private final String className;
private String parentClassName;
private String packageName;
- private String baseFolder;
+ private final String baseFolder;
private String javadocComment;
private boolean verbose;
- private List<String> implementsDeclarations = new ArrayList<>();
+ private final List<String> implementsDeclarations = new ArrayList<>();
- private Set<String> importsDeclarations = new HashSet<>();
+ private final Set<String> importsDeclarations = new HashSet<>();
- private List<VariableDefinition> localVariables = new ArrayList<>();
+ private final List<VariableDefinition> localVariables = new ArrayList<>();
- private List<ConstructorDefinition> constructors = new ArrayList<>();
+ private final List<ConstructorDefinition> constructors = new ArrayList<>();
- private List<MethodDefinition> methods = new ArrayList<>();
+ private final List<MethodDefinition> methods = new ArrayList<>();
private boolean runPrewrite = false;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java
index 7fa29d1..1dc33ef 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/MethodDefinition.java
@@ -42,7 +42,7 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
private boolean isInterface = false;
- private List<Parameter> parameters = new ArrayList<>();
+ private final List<Parameter> parameters = new ArrayList<>();
private List<String> exceptions = new ArrayList<>();
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java
index 71f899d..3b572bb 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/ElapsedUtil.java
@@ -20,9 +20,9 @@ import java.text.DecimalFormat;
public class ElapsedUtil {
- private static long NANO_PER_SECOND = 1000000000L;
- private static long NANO_PER_MINUTE = NANO_PER_SECOND * 60;
- private static long NANO_PER_HOUR = NANO_PER_MINUTE * 60;
+ private static final long NANO_PER_SECOND = 1000000000L;
+ private static final long NANO_PER_MINUTE = NANO_PER_SECOND * 60;
+ private static final long NANO_PER_HOUR = NANO_PER_MINUTE * 60;
static void addElapsed(long elapsed, StringBuilder msg) {
long nanoseconds = elapsed;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
index 95fcacb..6ec1bc2 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
@@ -35,8 +35,8 @@ import java.util.Enumeration;
public class RequestContextHandlerInterceptor implements HandlerInterceptor {
private static final Logger logger = LogManager.getLogger(RequestContextHandlerInterceptor.class);
- private RequestContextMappings mappings;
- private ThreadLocal<Long> startTime = new ThreadLocal<>();
+ private final RequestContextMappings mappings;
+ private final ThreadLocal<Long> startTime = new ThreadLocal<>();
public RequestContextHandlerInterceptor(Class<?> clazz) {
mappings = new RequestContextMappings(clazz);
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java
index ce031e4..cdfba2e 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHeaderInterceptor.java
@@ -37,7 +37,7 @@ import org.springframework.http.client.ClientHttpResponse;
*/
public class RequestContextHeaderInterceptor implements ClientHttpRequestInterceptor {
- private RequestContextMappings mappings;
+ private final RequestContextMappings mappings;
public RequestContextHeaderInterceptor(RequestContextMappings mappings) {
this.mappings = mappings;
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/TransferTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/TransferTest.java
index e4a1a04..5ca1f52 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/TransferTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/TransferTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
*/
public class TransferTest extends BaseEventTest {
@Rule
- public ExpectedException exception = ExpectedException.none();
+ public final ExpectedException exception = ExpectedException.none();
private final String failingAppenderName = "failingAppenderName";
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java
index c4748d2..9a1ce81 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/generator/TestInterfacesGenerator.java
@@ -31,7 +31,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.Assert.*;
public class TestInterfacesGenerator {
- private static Logger logger = LogManager.getLogger(TestInterfacesGenerator.class);
+ private static final Logger logger = LogManager.getLogger(TestInterfacesGenerator.class);
private static ApplicationContext context;
private static final String GENERATED_SOURCE_DIR = "target/generated-sources/log4j-audit/";
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
index fb05b9b..3b8d340 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
@@ -51,7 +51,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class AuditCatalogManager extends CatalogManagerImpl implements AuditManager {
- private static Logger logger = LogManager.getLogger();
+ private static final Logger logger = LogManager.getLogger();
@Autowired
private CatalogService catalogService;
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
index 53d8a8e..716dc11 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/controller/CatalogController.java
@@ -73,10 +73,10 @@ public class CatalogController {
private static final Logger LOGGER = LogManager.getLogger(CatalogController.class);
- private ModelMapper attributeModelMapper = new ModelMapper();
- private ModelMapper eventModelMapper = new ModelMapper();
- private ModelMapper productModelMapper = new ModelMapper();
- private ModelMapper categoryModelMapper = new ModelMapper();
+ private final ModelMapper attributeModelMapper = new ModelMapper();
+ private final ModelMapper eventModelMapper = new ModelMapper();
+ private final ModelMapper productModelMapper = new ModelMapper();
+ private final ModelMapper categoryModelMapper = new ModelMapper();
@Autowired
private AttributeService attributeService;
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintPlugins.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintPlugins.java
index b2e587f..4ff41c6 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintPlugins.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintPlugins.java
@@ -35,9 +35,9 @@ import org.apache.logging.log4j.core.util.ReflectionUtil;
public class ConstraintPlugins {
- private static Logger LOGGER = LogManager.getLogger(ConstraintPlugins.class);
+ private static final Logger LOGGER = LogManager.getLogger(ConstraintPlugins.class);
- private static Map<String, ConstraintType> constraintMap = new HashMap<>();
+ private static final Map<String, ConstraintType> constraintMap = new HashMap<>();
private static volatile ConstraintPlugins instance = null;
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeDeserializer.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeDeserializer.java
index 56e70a7..debbd7a 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeDeserializer.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeDeserializer.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.catalog.api.exception.NameNotFoundException;
*/
public class ConstraintTypeDeserializer extends StdDeserializer<ConstraintType> {
- ConstraintPlugins plugins = ConstraintPlugins.getInstance();
+ final ConstraintPlugins plugins = ConstraintPlugins.getInstance();
public ConstraintTypeDeserializer() {
this(null);
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
index 12824ec..9c9368f 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebAppInitializer.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
public class WebAppInitializer {
private static final String APPLICATION_NAME = "AuditCatalog";
- private static Logger LOGGER = LogManager.getLogger(WebAppInitializer.class);
+ private static final Logger LOGGER = LogManager.getLogger(WebAppInitializer.class);
@Bean
public ServletContextInitializer initializer() {
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
index 5c93811..5f3bfbc 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/AttributeController.java
@@ -53,9 +53,9 @@ import java.util.Set;
@RequestMapping(value = "/api/attributes")
@RestController
public class AttributeController {
- private static ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
+ private static final ConstraintPlugins constraintPlugins = ConstraintPlugins.getInstance();
- private ModelMapper modelMapper = new ModelMapper();
+ private final ModelMapper modelMapper = new ModelMapper();
@Autowired
private AttributeService attributeService;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
index 1d2cb95..16ef136 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/CategoryController.java
@@ -47,7 +47,7 @@ import java.util.Map;
@RestController
public class CategoryController {
- private ModelMapper modelMapper = new ModelMapper();
+ private final ModelMapper modelMapper = new ModelMapper();
@Autowired
private CategoryService categoryService;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
index 4a552e7..efa3887 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ConstraintController.java
@@ -49,7 +49,7 @@ import java.util.Set;
@RestController
public class ConstraintController {
- private ModelMapper modelMapper = new ModelMapper();
+ private final ModelMapper modelMapper = new ModelMapper();
@Autowired
private ConstraintService constraintService;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
index dd68682..89b9a94 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/EventController.java
@@ -16,21 +16,13 @@
*/
package org.apache.logging.log4j.catalog.controller;
-import javax.annotation.PostConstruct;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Event;
-import org.apache.logging.log4j.catalog.jpa.model.EventModel;
-import org.apache.logging.log4j.catalog.jpa.service.EventService;
import org.apache.logging.log4j.catalog.jpa.converter.EventConverter;
import org.apache.logging.log4j.catalog.jpa.converter.EventModelConverter;
+import org.apache.logging.log4j.catalog.jpa.model.EventModel;
+import org.apache.logging.log4j.catalog.jpa.service.EventService;
import org.modelmapper.ModelMapper;
import org.modelmapper.TypeToken;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +34,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.PostConstruct;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
/**
* Catalog Product controller
*/
@@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.RestController;
public class EventController {
private static final Logger LOGGER = LogManager.getLogger();
- private ModelMapper modelMapper = new ModelMapper();
+ private final ModelMapper modelMapper = new ModelMapper();
@Autowired
private EventService eventService;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
index e82a384..f24d8a5 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/ProductController.java
@@ -47,7 +47,7 @@ import java.util.Map;
@RestController
public class ProductController {
- private ModelMapper modelMapper = new ModelMapper();
+ private final ModelMapper modelMapper = new ModelMapper();
@Autowired
private ProductService productService;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
index 9ff9569..1645c24 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
@@ -39,7 +39,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Profile("eclipseLink")
public class EclipseLinkConfig {
- private static Logger LOGGER = LogManager.getLogger(EclipseLinkConfig.class);
+ private static final Logger LOGGER = LogManager.getLogger(EclipseLinkConfig.class);
@Autowired
private DataSourceConfig dataSourceConfig;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeConverter.java
index ba8962d..f8a6292 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeConverter.java
@@ -37,7 +37,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class AttributeConverter extends AbstractConverter<Attribute, AttributeModel> {
- private static Logger LOGGER = LogManager.getLogger(AttributeConverter.class);
+ private static final Logger LOGGER = LogManager.getLogger(AttributeConverter.class);
@Autowired
private AttributeService attributeService;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
index 388252b..60c181d 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class EventConverter extends AbstractConverter<Event, EventModel> {
- private static Logger LOGGER = LogManager.getLogger(EventConverter.class);
+ private static final Logger LOGGER = LogManager.getLogger(EventConverter.class);
@Autowired
private EventService eventService;
[logging-log4j-audit] 06/06: Fix trivial warnings reported by the
IDE
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
commit b4da24faa2e7a498ec690009c606ae3234342148
Author: Andrei Ivanov <an...@gmail.com>
AuthorDate: Tue May 28 15:51:47 2019 +0300
Fix trivial warnings reported by the IDE
---
.../logging/log4j/audit/generator/ClassGenerator.java | 15 +++++++--------
.../org/apache/logging/log4j/audit/util/NamingUtils.java | 4 ++--
.../log4j/audit/service/catalog/AuditCatalogManager.java | 1 -
.../org/apache/logging/log4j/catalog/api/Constraint.java | 5 ++---
.../log4j/catalog/api/dao/ClassPathCatalogReader.java | 11 +++++------
.../logging/log4j/catalog/git/dao/GitCatalogDao.java | 6 +-----
.../log4j/catalog/jpa/converter/EventConverter.java | 8 +++-----
7 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
index 6bcebfc..9c535e8 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/ClassGenerator.java
@@ -217,10 +217,9 @@ public final class ClassGenerator {
LOGGER.info(fullPath);
}
File file = new File(fullPath);
- DataOutputStream out = new DataOutputStream(openOutputStream(file));
- out.writeBytes(getClassContents());
- out.close();
-
+ try (DataOutputStream out = new DataOutputStream(openOutputStream(file))) {
+ out.writeBytes(getClassContents());
+ }
}
public String getClassContents() throws Exception {
@@ -235,7 +234,7 @@ public final class ClassGenerator {
StringBuilder sb = new StringBuilder();
sb.append("package ").append(getPackageName()).append(";\n\n");
- if (getImports() != null) {
+ if (!getImports().isEmpty()) {
List<String> list = new ArrayList<>(getImports());
Collections.sort(list);
for (String element : list) {
@@ -270,7 +269,7 @@ public final class ClassGenerator {
if (getParentClassName() != null && getParentClassName().length() > 0) {
sb.append(" extends ").append(getParentClassName());
}
- if (getImplements() != null && getImplements().size() > 0) {
+ if (!getImplements().isEmpty()) {
sb.append(" implements ");
boolean first = true;
for (String element : getImplements()) {
@@ -282,14 +281,14 @@ public final class ClassGenerator {
}
}
sb.append(" {\n\n");
- if (localVariables != null) {
+ if (!localVariables.isEmpty()) {
Collections.sort(localVariables);
for (VariableDefinition element : localVariables) {
sb.append(element).append("\n");
}
}
- if (constructors != null) {
+ if (!constructors.isEmpty()) {
Collections.sort(constructors);
for (ConstructorDefinition element : constructors) {
sb.append(element).append("\n\n");
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/NamingUtils.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/NamingUtils.java
index 6fb5063..f736d3a 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/NamingUtils.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/NamingUtils.java
@@ -22,11 +22,11 @@ public final class NamingUtils {
}
public static String getPackageName(String className) {
- return className.substring(0, className.lastIndexOf("."));
+ return className.substring(0, className.lastIndexOf('.'));
}
public static String getSimpleName(String className) {
- return className.substring(className.lastIndexOf(".") + 1);
+ return className.substring(className.lastIndexOf('.') + 1);
}
public static String getMethodShortName(String name) {
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
index 3b8d340..a0c1ac5 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/catalog/AuditCatalogManager.java
@@ -130,7 +130,6 @@ public class AuditCatalogManager extends CatalogManagerImpl implements AuditMana
attributeModels.add(model);
attributeMap.put(attribute.getName(), attribute);
}
- attributeModels.stream().filter(m->!attributeMap.containsKey(m.getName()));
for (AttributeModel attributeModel : attributeModels) {
if (!attributeMap.containsKey(attributeModel.getName())) {
attributeService.deleteAttribute(attributeModel.getId());
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Constraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Constraint.java
index 775dcae..0ee7a19 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Constraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Constraint.java
@@ -16,10 +16,9 @@
*/
package org.apache.logging.log4j.catalog.api;
-import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.logging.log4j.catalog.api.ConstraintType;
+
+import java.io.Serializable;
/**
*
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java
index 4959302..1381974 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/ClassPathCatalogReader.java
@@ -52,15 +52,14 @@ public class ClassPathCatalogReader extends AbstractCatalogReader {
String catalogFile = attributes != null ?
attributes.getOrDefault(CATALOG_ATTRIBUTE_NAME, DEFAULT_CATALOG_FILE) : DEFAULT_CATALOG_FILE;
Collection<URL> catalogs = LoaderUtil.findResources(catalogFile);
- URL catalogURL;
- if (catalogs.size() == 0) {
+ if (catalogs.isEmpty()) {
LOGGER.error("No catalog named {} could be found on the class path", catalogFile);
throw new FileNotFoundException("No catalog named " + catalogFile + " could be found");
- } else if (catalogs.size() > 1) {
- catalogURL = catalogs.stream().findFirst().get();
+ }
+
+ URL catalogURL = catalogs.iterator().next();
+ if (catalogs.size() > 1) {
LOGGER.warn("Multiple catalogs named {} were found. Using {}", catalogFile, catalogURL.toString());
- } else {
- catalogURL = catalogs.stream().findFirst().get();
}
catalog = readCatalog(catalogURL);
diff --git a/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java b/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java
index 7d1c012..bc8b9e4 100644
--- a/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java
+++ b/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/dao/GitCatalogDao.java
@@ -156,15 +156,11 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
throw new CatalogModificationException("Catalog is not writable: " + localRepoFile.getAbsolutePath());
}
- FileWriter writer = null;
- try {
+ try (FileWriter writer = new FileWriter(catalogFile)){
String text = mapper.writeValueAsString(data);
- writer = new FileWriter(catalogFile);
writer.write(text);
} catch (IOException ioException) {
throw new CatalogModificationException("Unable to write catalog file.", ioException);
- } finally {
- try { if (writer != null) writer.close(); } catch(Exception exception) { }
}
try (Git git = Git.open(localRepoFile)) {
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
index 60c181d..96dcc3b 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventConverter.java
@@ -68,18 +68,16 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
Set<EventAttributeModel> eventAttributeModels = model.getAttributes() != null ? model.getAttributes() :
new HashSet<>();
List<EventAttribute> eventAttributes = event.getAttributes() != null ? event.getAttributes() : new ArrayList<>();
- if (event.getAttributes() != null) {
+ if (!eventAttributes.isEmpty()) {
for (EventAttribute eventAttribute : eventAttributes) {
EventAttributeModel eventAttributeModel = model.getAttribute(eventAttribute.getName());
if (eventAttributeModel != null) {
- eventAttributeModel.setRequired(eventAttribute != null ? eventAttribute.isRequired() : null);
+ eventAttributeModel.setRequired(eventAttribute.isRequired());
} else {
Optional<AttributeModel> optional = getAttribute(event.getCatalogId(), eventAttribute.getName());
if (optional.isPresent()) {
eventAttributeModel = new EventAttributeModel();
- if (eventAttribute != null) {
- eventAttributeModel.setRequired(eventAttribute.isRequired());
- }
+ eventAttributeModel.setRequired(eventAttribute.isRequired());
eventAttributeModel.setEvent(model);
eventAttributeModel.setAttribute(optional.get());
eventAttributeModels.add(eventAttributeModel);
[logging-log4j-audit] 02/06: Remove redundant modifiers
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shadow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
commit 0c84ffe0b2df1738adc75a37f4d8782f91b8f7f0
Author: Andrei Ivanov <an...@gmail.com>
AuthorDate: Tue May 28 12:35:03 2019 +0300
Remove redundant modifiers
---
.../test/java/org/apache/logging/log4j/audit/event/Transfer.java | 9 +++++----
.../org/apache/logging/log4j/catalog/api/ConstraintType.java | 2 +-
.../log4j/catalog/api/annotation/ConditionOnPropertyExists.java | 6 +++---
.../org/apache/logging/log4j/catalog/api/annotation/JdbcUrl.java | 6 +++---
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Transfer.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Transfer.java
index 6f988d3..09f79ed 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Transfer.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Transfer.java
@@ -16,13 +16,14 @@
*/
package org.apache.logging.log4j.audit.event;
-import java.math.BigDecimal;
import org.apache.logging.log4j.audit.AuditEvent;
import org.apache.logging.log4j.audit.annotation.Constraint;
import org.apache.logging.log4j.audit.annotation.MaxLength;
import org.apache.logging.log4j.audit.annotation.RequestContext;
import org.apache.logging.log4j.audit.annotation.Required;
+import java.math.BigDecimal;
+
/**
* Transfer between accounts
* @author generated
@@ -40,14 +41,14 @@ public interface Transfer extends AuditEvent {
* @param amount Amount to transfer
*/
@Required
- public void setAmount(BigDecimal amount);
+ void setAmount(BigDecimal amount);
/**
* From Account Number : Source of funds
* @param fromAccount Source of funds
*/
@Required
- public void setFromAccount(int fromAccount);
+ void setFromAccount(int fromAccount);
/**
* To Account Number : Destination account
@@ -55,6 +56,6 @@ public interface Transfer extends AuditEvent {
*/
@Required
@Constraint(constraintType="minValue", constraintValue="1")
- public void setToAccount(int toAccount);
+ void setToAccount(int toAccount);
}
\ No newline at end of file
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/ConstraintType.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/ConstraintType.java
index 962afd1..b2107ee 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/ConstraintType.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/ConstraintType.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@JsonSerialize(using = ConstraintTypeSerializer.class)
public interface ConstraintType {
- public static final String CATEGORY = "Constraint";
+ String CATEGORY = "Constraint";
default String getName() {
Plugin annotation = this.getClass().getAnnotation(Plugin.class);
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/ConditionOnPropertyExists.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/ConditionOnPropertyExists.java
index ae88ebf..4c38ebe 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/ConditionOnPropertyExists.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/ConditionOnPropertyExists.java
@@ -15,13 +15,13 @@
*/
package org.apache.logging.log4j.catalog.api.annotation;
+import org.springframework.context.annotation.Conditional;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.springframework.context.annotation.Conditional;
-
/**
* Prevents a bean from being created unless a property exists.
*/
@@ -33,5 +33,5 @@ public @interface ConditionOnPropertyExists {
* The name of the property to test for existence.
* @return The property name.
*/
- public String value();
+ String value();
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrl.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrl.java
index 3e3fe4c..5a5f6cb 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrl.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrl.java
@@ -15,13 +15,13 @@
*/
package org.apache.logging.log4j.catalog.api.annotation;
+import org.springframework.context.annotation.Conditional;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.springframework.context.annotation.Conditional;
-
/**
* Loads a DataSource based on the JDBC URL.
*/
@@ -33,5 +33,5 @@ public @interface JdbcUrl {
* The name of the property to test for existence.
* @return The property name.
*/
- public String value();
+ String value();
}