Trivial cleanups and improvements
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 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.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 @@
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 @@
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 @@
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.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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
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 @@
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 @@
.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 @@
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 @@
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,18 +16,6 @@
*/
package org.apache.logging.log4j.audit.rest;
-import java.io.IOException;
-import java.util.Enumeration;
-
-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;
@@ -35,6 +23,15 @@
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.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Enumeration;
+
/**
* Filter to initialize and clear the RequestContext.
*/
@@ -54,10 +51,9 @@
/**
* @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 @@
/**
* 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.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 @@
}
@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 @@
}
@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 @@
}
@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 @@
*/
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 @@
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 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 @@
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 @@
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 @@
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.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.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 @@
@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.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 @@
@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 @@
@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 @@
@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 @@
@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 @@
@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 @@
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 @@
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 @@
@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.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() {
+ 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));
- @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));
-
- //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.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 @@
@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 @@
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.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.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 @@
@RequestMapping(value = "/api/categories")
@RestController
public class CategoryController {
- private static final Logger LOGGER = LogManager.getLogger();
private ModelMapper modelMapper = new ModelMapper();
@@ -74,7 +71,7 @@
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.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 @@
@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 @@
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.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 @@
@RequestMapping(value = "/api/products")
@RestController
public class ProductController {
- private static final Logger LOGGER = LogManager.getLogger();
private ModelMapper modelMapper = new ModelMapper();
@@ -74,7 +70,7 @@
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 @@
@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 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.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.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.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.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.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.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.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 @@
@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 @@
}
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 @@
}
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());
