You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/12/04 09:44:23 UTC
(logging-log4j-audit) branch master updated: Reformat using Palantir formatter
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git
The following commit(s) were added to refs/heads/master by this push:
new 7a0e0e8 Reformat using Palantir formatter
7a0e0e8 is described below
commit 7a0e0e893292d5dfd760cbea03605b41129e78ea
Author: Spotless <ro...@logging.apache.org>
AuthorDate: Mon Dec 4 10:44:09 2023 +0100
Reformat using Palantir formatter
---
.../logging/log4j/audit/AbstractEventLogger.java | 68 ++++--
.../apache/logging/log4j/audit/ActivityLogger.java | 3 +-
.../apache/logging/log4j/audit/AuditMessage.java | 7 +-
.../logging/log4j/audit/LogEventFactory.java | 52 +++--
.../log4j/audit/annotation/ClientServer.java | 4 +-
.../logging/log4j/audit/annotation/Local.java | 4 +-
.../logging/log4j/audit/annotation/Required.java | 3 +-
.../log4j/audit/catalog/CatalogManager.java | 5 +-
.../log4j/audit/catalog/CatalogManagerImpl.java | 25 +-
.../log4j/audit/generator/AccessorDefinition.java | 18 +-
.../log4j/audit/generator/ClassGenerator.java | 23 +-
.../audit/generator/ConstructorDefinition.java | 4 +-
.../log4j/audit/generator/InterfacesGenerator.java | 39 ++--
.../log4j/audit/generator/MethodDefinition.java | 31 +--
.../logging/log4j/audit/generator/Parameter.java | 1 -
.../log4j/audit/generator/VariableDefinition.java | 6 +-
.../logging/log4j/audit/layout/AuditLayout.java | 3 +-
.../log4j/audit/request/RequestContextMapping.java | 1 -
.../audit/request/RequestContextMappings.java | 13 +-
.../apache/logging/log4j/audit/request/Scope.java | 4 +-
.../log4j/audit/rest/RequestContextFilter.java | 22 +-
.../rest/RequestContextHandlerInterceptor.java | 18 +-
.../rest/RequestContextHeaderInterceptor.java | 6 +-
.../log4j/audit/util/JsonObjectMapperFactory.java | 65 +++---
.../logging/log4j/audit/util/NamingUtils.java | 3 +-
.../logging/log4j/audit/util/StringUtil.java | 1 -
.../logging/log4j/audit/AuditLoggerTest.java | 13 +-
.../apache/logging/log4j/audit/BaseEventTest.java | 5 +-
.../org/apache/logging/log4j/audit/LogoutTest.java | 11 +-
.../apache/logging/log4j/audit/RequestContext.java | 14 +-
.../logging/log4j/audit/RequestContextTest.java | 4 +-
.../apache/logging/log4j/audit/TransferTest.java | 17 +-
.../log4j/audit/catalog/CatalogManagerTest.java | 17 +-
.../log4j/audit/catalog/StringCatalogReader.java | 102 ++++++--
.../apache/logging/log4j/audit/event/Logout.java | 3 +-
.../apache/logging/log4j/audit/event/Transfer.java | 21 +-
.../audit/generator/TestInterfacesGenerator.java | 14 +-
.../logging/log4j/audit/util/NamingUtilsTest.java | 1 -
.../logging/log4j/audit/plugin/AuditMojo.java | 11 +-
.../audit/service/catalog/AuditCatalogManager.java | 3 -
.../service/config/ApplicationConfiguration.java | 3 +-
.../log4j/audit/service/config/SwaggerConfig.java | 31 ++-
.../audit/service/config/WebAppInitializer.java | 7 +-
.../audit/service/config/WebMvcAppContext.java | 10 +-
.../audit/service/controller/AuditController.java | 10 +-
.../service/controller/CatalogController.java | 259 +++++++++++++--------
.../RestResponseEntityExceptionHandler.java | 5 +-
.../security/LocalAuthorizationInterceptor.java | 2 -
.../logging/log4j/audit/service/CatalogTest.java | 48 ++--
.../logging/log4j/catalog/api/Attribute.java | 8 +-
.../apache/logging/log4j/catalog/api/Category.java | 4 +-
.../logging/log4j/catalog/api/Constraint.java | 3 +-
.../logging/log4j/catalog/api/ConstraintType.java | 4 +-
.../apache/logging/log4j/catalog/api/DataType.java | 4 +-
.../apache/logging/log4j/catalog/api/Event.java | 19 +-
.../logging/log4j/catalog/api/EventAttribute.java | 3 +-
.../apache/logging/log4j/catalog/api/Product.java | 6 +-
.../org/apache/logging/log4j/catalog/api/Type.java | 2 -
.../apache/logging/log4j/catalog/api/Versions.java | 4 +-
.../api/annotation/ConditionOnPropertyExists.java | 1 -
.../log4j/catalog/api/annotation/JdbcUrl.java | 1 -
.../catalog/api/annotation/JdbcUrlCondition.java | 2 +-
.../api/annotation/PropertyExistsCondition.java | 3 +-
.../log4j/catalog/api/constant/Constants.java | 3 +-
.../catalog/api/dao/AbstractCatalogReader.java | 18 +-
.../logging/log4j/catalog/api/dao/CatalogDao.java | 4 -
.../catalog/api/dao/ClassPathCatalogReader.java | 16 +-
.../log4j/catalog/api/dao/FileCatalogReader.java | 13 +-
.../log4j/catalog/api/dao/JsonCatalogReader.java | 9 +-
.../api/plugins/CaseInsensitiveEnumConstraint.java | 7 +-
.../catalog/api/plugins/ConstraintPlugins.java | 22 +-
.../api/plugins/ConstraintTypeDeserializer.java | 3 +-
.../api/plugins/ConstraintTypeSerializer.java | 8 +-
.../log4j/catalog/api/plugins/EnumConstraint.java | 7 +-
.../catalog/api/plugins/MaxLengthConstraint.java | 10 +-
.../catalog/api/plugins/MaxValueConstraint.java | 11 +-
.../catalog/api/plugins/MinLengthConstraint.java | 15 +-
.../catalog/api/plugins/MinValueConstraint.java | 11 +-
.../catalog/api/plugins/PatternConstraint.java | 4 +-
.../log4j/catalog/api/util/CatalogEventFilter.java | 9 +-
.../log4j/catalog/api/util/ProfileUtil.java | 4 +-
.../log4j/catalog/api/util/StringUtils.java | 3 +-
.../logging/log4j/catalog/AuditCatalogEditor.java | 8 +-
.../catalog/config/JsonObjectMapperFactory.java | 65 +++---
.../log4j/catalog/config/SwaggerConfig.java | 15 +-
.../log4j/catalog/config/WebAppInitializer.java | 15 +-
.../log4j/catalog/config/WebMvcAppContext.java | 40 ++--
.../catalog/controller/AttributeController.java | 13 +-
.../catalog/controller/CatalogController.java | 4 +-
.../catalog/controller/CategoryController.java | 14 +-
.../catalog/controller/ConstraintController.java | 2 -
.../log4j/catalog/controller/EventController.java | 14 +-
.../catalog/controller/ProductController.java | 13 +-
.../RestResponseEntityExceptionHandler.java | 5 +-
.../RequestContextHeaderInterceptor.java | 6 +-
.../security/LocalAuthorizationInterceptor.java | 9 +-
.../log4j/catalog/service/CatalogInitializer.java | 2 -
.../log4j/catalog/git/config/ServiceConfig.java | 3 +-
.../log4j/catalog/git/dao/GitCatalogDao.java | 27 +--
.../logging/log4j/catalog/git/CatalogTest.java | 45 ++--
.../git/config/ApplicationConfiguration.java | 10 +-
.../catalog/jpa/config/EclipseLinkConfig.java | 2 -
.../log4j/catalog/jpa/config/HibernateConfig.java | 1 -
.../catalog/jpa/config/HsqldbDataSourceConfig.java | 1 -
.../jpa/config/PostgresqlDataSourceConfig.java | 1 -
.../catalog/jpa/converter/AttributeConverter.java | 18 +-
.../jpa/converter/AttributeModelConverter.java | 6 +-
.../catalog/jpa/converter/CategoryConverter.java | 1 -
.../jpa/converter/CategoryModelConverter.java | 1 -
.../catalog/jpa/converter/DataTypeConverter.java | 1 -
.../catalog/jpa/converter/DateTimeConverter.java | 3 -
.../catalog/jpa/converter/EventConverter.java | 13 +-
.../catalog/jpa/converter/EventModelConverter.java | 3 +-
.../catalog/jpa/converter/ProductConverter.java | 1 -
.../jpa/converter/ProductModelConverter.java | 1 -
.../log4j/catalog/jpa/dao/AttributeRepository.java | 3 +-
.../log4j/catalog/jpa/dao/BaseRepository.java | 7 +-
.../log4j/catalog/jpa/dao/CatalogRepository.java | 3 +-
.../log4j/catalog/jpa/dao/CategoryRepository.java | 1 -
.../catalog/jpa/dao/ConstraintRepository.java | 4 +-
.../log4j/catalog/jpa/dao/EventRepository.java | 3 +-
.../jpa/dao/PagingAndSortingRepository.java | 1 -
.../log4j/catalog/jpa/dao/ProductRepository.java | 3 +-
.../log4j/catalog/jpa/model/AttributeModel.java | 39 ++--
.../log4j/catalog/jpa/model/CatalogModel.java | 5 +-
.../log4j/catalog/jpa/model/CategoryModel.java | 20 +-
.../log4j/catalog/jpa/model/ConstraintModel.java | 7 +-
.../catalog/jpa/model/EventAttributeModel.java | 6 +-
.../log4j/catalog/jpa/model/EventModel.java | 30 ++-
.../log4j/catalog/jpa/model/ProductModel.java | 21 +-
.../service/AbstractPagingAndSortingService.java | 1 -
.../catalog/jpa/service/AttributeService.java | 12 +-
.../catalog/jpa/service/AttributeServiceImpl.java | 4 +-
.../catalog/jpa/service/CatalogServiceImpl.java | 10 +-
.../log4j/catalog/jpa/service/CategoryService.java | 12 +-
.../catalog/jpa/service/CategoryServiceImpl.java | 5 +-
.../catalog/jpa/service/ConstraintService.java | 5 +-
.../catalog/jpa/service/ConstraintServiceImpl.java | 2 -
.../log4j/catalog/jpa/service/EventService.java | 9 +-
.../catalog/jpa/service/EventServiceImpl.java | 5 +-
.../log4j/catalog/jpa/service/ProductService.java | 12 +-
.../catalog/jpa/service/ProductServiceImpl.java | 6 +-
.../logging/log4j/catalog/jpa/CatalogTest.java | 34 ++-
.../jpa/config/ApplicationConfiguration.java | 2 +-
144 files changed, 1050 insertions(+), 866 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 947f35d..587853c 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,11 +16,13 @@
*/
package org.apache.logging.log4j.audit;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.catalog.CatalogManager;
import org.apache.logging.log4j.audit.exception.AuditException;
@@ -32,9 +34,6 @@ import org.apache.logging.log4j.catalog.api.EventAttribute;
import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins;
import org.apache.logging.log4j.message.StructuredDataMessage;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-
/**
* This class is used to log events generated remotely.
*/
@@ -50,8 +49,7 @@ public abstract class AbstractEventLogger {
throw new AuditException("Error logging event " + message.getId().getName(), ex);
};
- private static final AuditExceptionHandler NOOP_EXCEPTION_HANDLER = (message, ex) -> {
- };
+ private static final AuditExceptionHandler NOOP_EXCEPTION_HANDLER = (message, ex) -> {};
private AuditExceptionHandler defaultAuditExceptionHandler = DEFAULT_EXCEPTION_HANDLER;
@@ -89,8 +87,13 @@ public abstract class AbstractEventLogger {
logEvent(eventName, null, attributes, exceptionHandler);
}
- private void logEvent(String eventName, String catalogId, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) {
- Event event = catalogId == null ? catalogManager.getEvent(eventName) : catalogManager.getEvent(eventName, catalogId);
+ private void logEvent(
+ String eventName,
+ String catalogId,
+ Map<String, String> attributes,
+ AuditExceptionHandler exceptionHandler) {
+ Event event =
+ catalogId == null ? catalogManager.getEvent(eventName) : catalogManager.getEvent(eventName, catalogId);
if (event == null) {
throw new AuditException("Unable to locate definition of audit event " + eventName);
}
@@ -99,8 +102,8 @@ public abstract class AbstractEventLogger {
protected abstract void logEvent(StructuredDataMessage message);
- private void logEvent(String eventName, Map<String, String> attributes, Event event,
- AuditExceptionHandler exceptionHandler) {
+ private void logEvent(
+ String eventName, Map<String, String> attributes, Event event, AuditExceptionHandler exceptionHandler) {
AuditMessage msg = new AuditMessage(eventName, maxLength);
if (attributes == null) {
@@ -113,8 +116,8 @@ public abstract class AbstractEventLogger {
List<EventAttribute> eventAttributes = event.getAttributes() == null ? emptyList() : event.getAttributes();
for (EventAttribute eventAttribute : eventAttributes) {
Attribute attr = catalogManager.getAttribute(eventAttribute.getName(), event.getCatalogId());
- if ((!attr.isRequestContext() && (attr.isRequired()) ||
- (eventAttribute.isRequired() != null && eventAttribute.isRequired()))) {
+ if ((!attr.isRequestContext() && (attr.isRequired())
+ || (eventAttribute.isRequired() != null && eventAttribute.isRequired()))) {
String name = attr.getName();
if (!attributes.containsKey(name)) {
if (missingAttributes.length() > 0) {
@@ -134,14 +137,20 @@ public abstract class AbstractEventLogger {
if (errors.length() > 0) {
errors.append("\n");
}
- errors.append("Attribute ").append(name).append(" is not defined for ").append(eventName);
+ errors.append("Attribute ")
+ .append(name)
+ .append(" is not defined for ")
+ .append(eventName);
}
}
if (missingAttributes.length() > 0) {
if (errors.length() > 0) {
errors.append("\n");
}
- errors.append("Event ").append(eventName).append(" is missing required attribute(s) ").append(missingAttributes.toString());
+ errors.append("Event ")
+ .append(eventName)
+ .append(" is missing required attribute(s) ")
+ .append(missingAttributes.toString());
}
if (errors.length() > 0) {
throw new ConstraintValidationException(errors.toString());
@@ -157,7 +166,8 @@ public abstract class AbstractEventLogger {
}
}
if (buf.length() > 0) {
- throw new ConstraintValidationException("Event " + eventName + " contains invalid attribute(s) " + buf.toString());
+ throw new ConstraintValidationException(
+ "Event " + eventName + " contains invalid attribute(s) " + buf.toString());
}
List<String> reqCtxAttrs = catalogManager.getRequiredContextAttributes(eventName, event.getCatalogId());
@@ -172,8 +182,8 @@ public abstract class AbstractEventLogger {
}
}
if (sb.length() > 0) {
- throw new ConstraintValidationException("Event " + msg.getId().getName() +
- " is missing required RequestContextMapping values for " + sb.toString());
+ throw new ConstraintValidationException("Event " + msg.getId().getName()
+ + " is missing required RequestContextMapping values for " + sb.toString());
}
}
@@ -189,8 +199,8 @@ public abstract class AbstractEventLogger {
}
}
if (errors.length() > 0) {
- throw new ConstraintValidationException("Event " + eventName +
- " is missing required Thread Context values for " + errors.toString());
+ throw new ConstraintValidationException(
+ "Event " + eventName + " is missing required Thread Context values for " + errors.toString());
}
for (Map.Entry<String, Attribute> entry : reqCtxAttributes.entrySet()) {
@@ -204,7 +214,8 @@ public abstract class AbstractEventLogger {
}
}
if (errors.length() > 0) {
- throw new ConstraintValidationException("Event " + eventName + " has incorrect data in the Thread Context: " + errors.toString());
+ throw new ConstraintValidationException(
+ "Event " + eventName + " has incorrect data in the Thread Context: " + errors.toString());
}
msg.putAll(attributes);
@@ -219,11 +230,20 @@ public abstract class AbstractEventLogger {
}
}
- private static void validateConstraints(boolean isRequestContext, Collection<Constraint> constraints, String name,
- String value, StringBuilder errors) {
+ private static void validateConstraints(
+ boolean isRequestContext,
+ Collection<Constraint> constraints,
+ String name,
+ String value,
+ StringBuilder errors) {
for (Constraint constraint : constraints) {
- constraintPlugins.validateConstraint(isRequestContext, constraint.getConstraintType().getName(), name, value,
- constraint.getValue(), errors);
+ constraintPlugins.validateConstraint(
+ isRequestContext,
+ constraint.getConstraintType().getName(),
+ name,
+ value,
+ constraint.getValue(),
+ errors);
}
}
}
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 c7a8902..49f8b10 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,8 @@ public class ActivityLogger extends AbstractEventLogger {
private static final String NAME = "ActivityLogger";
private static final String FQCN = ActivityLogger.class.getName();
- private static final 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/AuditMessage.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AuditMessage.java
index 58a3a85..e4044dc 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.logging.log4j.message.StructuredDataId;
import org.apache.logging.log4j.message.StructuredDataMessage;
@@ -32,12 +31,12 @@ public class AuditMessage extends StructuredDataMessage {
private final Map<String, StructuredDataMessage> extraContent = new HashMap<>();
public AuditMessage(String eventName) {
- this(eventName, MAX_LENGTH);
+ this(eventName, MAX_LENGTH);
}
public AuditMessage(String eventName, int maxLength) {
// Use this with Log4j 2.9
- // super(new AuditId(eventName, MAX_LENGTH), null, "Audit", maxLength);
+ // super(new AuditId(eventName, MAX_LENGTH), null, "Audit", maxLength);
super(new AuditId(eventName, maxLength), null, "Audit");
}
@@ -52,7 +51,5 @@ public class AuditMessage extends StructuredDataMessage {
// super(eventName, maxLength);
super(eventName, null, null);
}
-
}
-
}
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 948dc06..7e74f17 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
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.audit;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -26,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -44,8 +45,6 @@ import org.apache.logging.log4j.audit.util.NamingUtils;
import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins;
import org.apache.logging.log4j.message.StructuredDataMessage;
-import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
-
/**
* Handles logging generated Events. Every Event extends the AuditProxy, which handles construction of the
* Event and logging of the Event.
@@ -62,8 +61,7 @@ public class LogEventFactory {
throw new AuditException("Error logging event " + message.getId().getName(), ex);
};
- private static final AuditExceptionHandler NOOP_EXCEPTION_HANDLER = (message, ex) -> {
- };
+ private static final AuditExceptionHandler NOOP_EXCEPTION_HANDLER = (message, ex) -> {};
private static AuditExceptionHandler defaultExceptionHandler = DEFAULT_HANDLER;
@@ -88,11 +86,11 @@ public class LogEventFactory {
@SuppressWarnings("unchecked")
public static <T extends AuditEvent> T getEvent(Class<T> intrface) {
- Class<?>[] interfaces = new Class<?>[] { intrface };
+ Class<?>[] interfaces = new Class<?>[] {intrface};
AuditMessage msg = buildAuditMessage(intrface);
- AuditEvent audit = (AuditEvent) Proxy.newProxyInstance(intrface.getClassLoader(), interfaces,
- new AuditProxy(msg, intrface, defaultExceptionHandler));
+ AuditEvent audit = (AuditEvent) Proxy.newProxyInstance(
+ intrface.getClassLoader(), interfaces, new AuditProxy(msg, intrface, defaultExceptionHandler));
return (T) audit;
}
@@ -157,7 +155,10 @@ public class LogEventFactory {
if (errors.length() > 0) {
errors.append("\n");
}
- errors.append("Required attribute ").append(property.name).append(" is missing from ").append(msg.getId().getName());
+ errors.append("Required attribute ")
+ .append(property.name)
+ .append(" is missing from ")
+ .append(msg.getId().getName());
}
if (msg.containsKey(property.name)) {
validateConstraints(false, property.constraints, property.name, msg, errors);
@@ -167,7 +168,10 @@ public class LogEventFactory {
msg.forEach((key, value) -> {
if (!propertyMap.containsKey(key)) {
if (errors.length() > 0) {
- errors.append("Attribute ").append(key).append(" is not defined for ").append(msg.getId().getName());
+ errors.append("Attribute ")
+ .append(key)
+ .append(" is not defined for ")
+ .append(msg.getId().getName());
}
}
});
@@ -306,7 +310,8 @@ public class LogEventFactory {
} else if (objects[0] instanceof AuditExceptionHandler) {
auditExceptionHandler = (AuditExceptionHandler) objects[0];
} else {
- throw new IllegalArgumentException(objects[0] + " is not an " + AuditExceptionHandler.class.getName());
+ throw new IllegalArgumentException(
+ objects[0] + " is not an " + AuditExceptionHandler.class.getName());
}
return null;
}
@@ -331,12 +336,16 @@ public class LogEventFactory {
for (Annotation annotation : annotations) {
if (annotation instanceof Constraints) {
Constraints constraints = (Constraints) annotation;
- validateConstraints(false, constraints.value(), name, objects[0].toString(),
- errors);
+ validateConstraints(false, constraints.value(), name, objects[0].toString(), errors);
} else if (annotation instanceof Constraint) {
Constraint constraint = (Constraint) annotation;
- constraintPlugins.validateConstraint(false, constraint.constraintType(),
- name, objects[0].toString(), constraint.constraintValue(), errors);
+ constraintPlugins.validateConstraint(
+ false,
+ constraint.constraintType(),
+ name,
+ objects[0].toString(),
+ constraint.constraintValue(),
+ errors);
}
}
if (errors.length() > 0) {
@@ -359,17 +368,17 @@ public class LogEventFactory {
}
}
- private static void validateConstraints(boolean isRequestContext, Constraint[] constraints, String name,
- AuditMessage msg, StringBuilder errors) {
+ private static void validateConstraints(
+ boolean isRequestContext, Constraint[] constraints, String name, AuditMessage msg, StringBuilder errors) {
String value = isRequestContext ? ThreadContext.get(name) : msg.get(name);
validateConstraints(isRequestContext, constraints, name, value, errors);
}
- private static void validateConstraints(boolean isRequestContext, Constraint[] constraints, String name,
- String value, StringBuilder errors) {
+ private static void validateConstraints(
+ boolean isRequestContext, Constraint[] constraints, String name, String value, StringBuilder errors) {
for (Constraint constraint : constraints) {
- constraintPlugins.validateConstraint(isRequestContext, constraint.constraintType(), name, value,
- constraint.constraintValue(), errors);
+ constraintPlugins.validateConstraint(
+ isRequestContext, constraint.constraintType(), name, value, constraint.constraintValue(), errors);
}
}
@@ -415,5 +424,4 @@ public class LogEventFactory {
this.isRequired = isRequired;
}
}
-
}
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 fbdd7ce..78c38ba 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
@@ -23,6 +23,4 @@ import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface ClientServer {
-
-}
+public @interface ClientServer {}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Local.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Local.java
index c9587f4..717f0eb 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Local.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Local.java
@@ -23,6 +23,4 @@ import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface Local {
-
-}
+public @interface Local {}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Required.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Required.java
index 881ad60..9585f77 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Required.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/annotation/Required.java
@@ -26,5 +26,4 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface Required {
-}
+public @interface Required {}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManager.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManager.java
index f6b7b2d..1d4f7e0 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManager.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/catalog/CatalogManager.java
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.audit.catalog;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+
import java.util.List;
import java.util.Map;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Event;
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
/**
*
*/
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 71d2dbd..995ab06 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
@@ -16,15 +16,17 @@
*/
package org.apache.logging.log4j.audit.catalog;
+import static java.util.Collections.emptyList;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.audit.exception.AuditException;
@@ -35,10 +37,6 @@ 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;
-
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
/**
*
*/
@@ -125,8 +123,9 @@ public class CatalogManagerImpl implements CatalogManager {
private CatalogInfo getCatalogInfo(String eventName, String catalogId) {
Map<String, CatalogInfo> defaultCatalog = infoMap.get(DEFAULT_CATALOG);
Map<String, CatalogInfo> catalog = catalogId != null ? infoMap.get(catalogId) : null;
- return catalog != null && catalog.containsKey(eventName) ? catalog.get(eventName) :
- defaultCatalog.get(eventName);
+ return catalog != null && catalog.containsKey(eventName)
+ ? catalog.get(eventName)
+ : defaultCatalog.get(eventName);
}
private Map<String, Map<String, CatalogInfo>> initializeData(CatalogReader catalogReader) throws Exception {
@@ -142,7 +141,8 @@ public class CatalogManagerImpl implements CatalogManager {
if (attr.isRequestContext()) {
requestContextAttributes.put(attr.getName(), attr);
}
- Map<String, Attribute> attrMap = attributeMap.computeIfAbsent(attr.getCatalogId(), k -> new HashMap<>());
+ Map<String, Attribute> attrMap =
+ attributeMap.computeIfAbsent(attr.getCatalogId(), k -> new HashMap<>());
attrMap.put(attr.getName(), attr);
}
}
@@ -194,8 +194,7 @@ public class CatalogManagerImpl implements CatalogManager {
}
info.requiredContextAttributes = required;
info.attributeNames = names;
- Map<String, CatalogInfo> catalogMap = catalogId == null ?
- map.get(DEFAULT_CATALOG) : map.get(catalogId);
+ Map<String, CatalogInfo> catalogMap = catalogId == null ? map.get(DEFAULT_CATALOG) : map.get(catalogId);
catalogMap.put(NamingUtils.getFieldName(event.getName()), info);
}
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 d8c7b11..19b8b43 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
@@ -23,8 +23,9 @@ public class AccessorDefinition {
public class StandardGetter extends MethodDefinition {
public StandardGetter(AccessorDefinition beanDefinition) {
- super(beanDefinition.getType(), NamingUtils.getAccessorName(
- beanDefinition.getType(), beanDefinition.getName()));
+ super(
+ beanDefinition.getType(),
+ NamingUtils.getAccessorName(beanDefinition.getType(), beanDefinition.getName()));
if (getterContent != null) {
setContent("\t" + StringUtil.filterContent(getterContent, name, type));
} else {
@@ -35,15 +36,12 @@ public class AccessorDefinition {
public class StandardSetter extends MethodDefinition {
public StandardSetter(AccessorDefinition beanDefinition) {
- super(beanDefinition.getType(), NamingUtils
- .getMutatorName(beanDefinition.getName()));
+ super(beanDefinition.getType(), NamingUtils.getMutatorName(beanDefinition.getName()));
setReturnType("void");
if (setterContent != null) {
- setContent("\t"
- + StringUtil.filterContent(setterContent, name, type));
+ setContent("\t" + StringUtil.filterContent(setterContent, name, type));
} else {
- String sb = "\tthis." + beanDefinition.getName() +
- " = " + beanDefinition.getName() + ";";
+ String sb = "\tthis." + beanDefinition.getName() + " = " + beanDefinition.getName() + ";";
setContent(sb);
}
getParameters().add(new Parameter(beanDefinition.getName(), beanDefinition.getType(), ""));
@@ -90,8 +88,7 @@ public class AccessorDefinition {
public void addBean(ClassGenerator generator, boolean addLocalVariable, boolean addGetter, boolean addSetter) {
if (generator.isClass() && addLocalVariable) {
- generator.addLocalVariable(new VariableDefinition("private",
- getType(), getName(), null, getAnnotation()));
+ generator.addLocalVariable(new VariableDefinition("private", getType(), getName(), null, getAnnotation()));
}
if (packageName != null) {
@@ -146,5 +143,4 @@ public class AccessorDefinition {
this.type = type.substring(lastDot + 1);
}
}
-
}
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 a0cace4..f033267 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,8 @@
*/
package org.apache.logging.log4j.audit.generator;
+import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
+
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -26,13 +28,10 @@ import java.util.Collections;
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.PUBLIC;
-
/**
* Generates the Classes and Interfaces for Audit Logging based on data in the Catalog.
*/
@@ -88,7 +87,6 @@ public final class ClassGenerator {
*
* @return
*/
-
public String getCode() {
return code;
}
@@ -118,8 +116,7 @@ public final class ClassGenerator {
name = name.substring(0, 1).toLowerCase() + name.substring(1);
}
- VariableDefinition definition = new VariableDefinition("private",
- getClassName(), name, null);
+ VariableDefinition definition = new VariableDefinition("private", getClassName(), name, null);
definition.setMakeStatic(true);
addLocalVariable(definition);
addMethod(MethodDefinition.getStandardSingleton(getClassName(), name, parameters));
@@ -201,17 +198,14 @@ public final class ClassGenerator {
* Override this method it gets called once before toString do if toString
* gets called 5 time this will only be called on the first
*/
- public void preWrite() {
-
- }
+ public void preWrite() {}
public void generate() throws Exception {
StringBuilder sb = new StringBuilder(baseFolder);
if (getPackageName() != null) {
sb.append("/").append(getPackageName().replaceAll("\\.", "/"));
}
- sb.append("/").append(NamingUtils.upperFirst(getClassName()))
- .append(".java");
+ sb.append("/").append(NamingUtils.upperFirst(getClassName())).append(".java");
String fullPath = sb.toString();
if (verbose) {
LOGGER.info(fullPath);
@@ -296,8 +290,7 @@ public final class ClassGenerator {
}
if (beanMethods.size() > 0 && isClass()) {
- MethodDefinition definition = new MethodDefinition("String",
- "toString");
+ MethodDefinition definition = new MethodDefinition("String", "toString");
StringBuilder buffer = new StringBuilder();
buffer.append("\tStringBuilder sb = new StringBuilder();");
buffer.append("\n\tsb.append(super.toString());");
@@ -305,8 +298,8 @@ public final class ClassGenerator {
buffer.append("\n\tsb.append(\", ");
buffer.append(element.getName())
.append("=\").append(")
- .append(NamingUtils.getAccessorName(element.getName(),
- element.getType())).append("());");
+ .append(NamingUtils.getAccessorName(element.getName(), element.getType()))
+ .append("());");
}
buffer.append("\n\treturn sb.toString();");
definition.setContent(buffer.toString());
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 980646b..aaef606 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
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.audit.generator;
+import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
+
import java.util.ArrayList;
import java.util.List;
-import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
-
public class ConstructorDefinition implements Comparable<ConstructorDefinition> {
private String visability = PUBLIC;
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 0e6a302..d9395ba 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
@@ -21,7 +21,6 @@ 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.audit.util.NamingUtils;
@@ -149,8 +148,8 @@ public class InterfacesGenerator {
errors = true;
continue;
}
- ClassGenerator classGenerator = new ClassGenerator(
- NamingUtils.getClassName(event.getName()), outputDirectory);
+ ClassGenerator classGenerator =
+ new ClassGenerator(NamingUtils.getClassName(event.getName()), outputDirectory);
classGenerator.setClass(false);
classGenerator.setPackageName(packageName);
classGenerator.setParentClassName(PARENT_CLASS);
@@ -203,18 +202,20 @@ public class InterfacesGenerator {
String type = attribute.getDataType().getTypeName();
- MethodDefinition definition = new MethodDefinition("void",
- NamingUtils.getMutatorName(name));
- if (!attribute.isRequestContext() && attribute.getDataType().getImportClass() != null) {
- if (!importedTypes.containsKey(attribute.getDataType().getTypeName())) {
- importedTypes.put(attribute.getDataType().getTypeName(), attribute.getDataType().getImportClass());
+ MethodDefinition definition = new MethodDefinition("void", NamingUtils.getMutatorName(name));
+ if (!attribute.isRequestContext()
+ && attribute.getDataType().getImportClass() != null) {
+ if (!importedTypes.containsKey(
+ attribute.getDataType().getTypeName())) {
+ importedTypes.put(
+ attribute.getDataType().getTypeName(),
+ attribute.getDataType().getImportClass());
}
}
definition.addParameter(new Parameter(name, type, attribute.getDescription()));
definition.setInterface(true);
definition.setVisability("public");
- definition.setJavadocComments(attribute.getDisplayName()
- + " : " + attribute.getDescription());
+ definition.setJavadocComments(attribute.getDisplayName() + " : " + attribute.getDescription());
StringBuilder buffer = new StringBuilder();
Set<Constraint> constraints = attribute.getConstraints();
@@ -238,7 +239,6 @@ public class InterfacesGenerator {
definition.setAnnotation(buffer.toString());
}
classGenerator.addMethod(definition);
-
}
}
if (importedTypes.size() > 0) {
@@ -266,16 +266,18 @@ public class InterfacesGenerator {
Boolean isRequired = null;
final String attrName = name;
if (event.getAttributes() != null) {
- Optional<EventAttribute> optional = event.getAttributes().stream().filter(a -> attrName.equals(a.getName())).findFirst();
+ Optional<EventAttribute> optional = event.getAttributes().stream()
+ .filter(a -> attrName.equals(a.getName()))
+ .findFirst();
if (optional.isPresent()) {
isRequired = optional.get().isRequired();
}
}
- if ((isRequired != null && isRequired) ||
- (isRequired == null && requestContextIsRequired.get(name))) {
+ if ((isRequired != null && isRequired)
+ || (isRequired == null && requestContextIsRequired.get(name))) {
reqCtx.append(", ").append(REQUIRED_ATTR);
}
- Set<Constraint> constraints = entry.getValue().getConstraints();
+ Set<Constraint> constraints = entry.getValue().getConstraints();
if (constraints != null && constraints.size() > 0) {
anyConstraints = true;
reqCtx.append(CONSTRAINTS_ATTR);
@@ -288,7 +290,6 @@ public class InterfacesGenerator {
appendConstraint(constraint, reqCtx);
}
reqCtx.append("}");
-
}
}
reqCtx.append(")");
@@ -313,8 +314,10 @@ public class InterfacesGenerator {
void appendConstraint(Constraint constraint, StringBuilder buffer) {
ConstraintType type = constraint.getConstraintType();
- // Add the escapes since they have been removed when converting the original data to a Java Strinng. They need to
+ // Add the escapes since they have been removed when converting the original data to a Java Strinng. They need
+ // to
// be added back for use in the Constraint declaration.
- buffer.append(String.format(CONSTRAINT, type.getName(), constraint.getValue().replace("\\", "\\\\")));
+ buffer.append(
+ String.format(CONSTRAINT, type.getName(), constraint.getValue().replace("\\", "\\\\")));
}
}
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 f23b982..f54deaa 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
@@ -16,15 +16,14 @@
*/
package org.apache.logging.log4j.audit.generator;
+import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.logging.log4j.audit.util.NamingUtils;
import org.apache.logging.log4j.audit.util.StringUtil;
-import static org.apache.logging.log4j.audit.generator.Constants.PUBLIC;
-
public class MethodDefinition implements Comparable<MethodDefinition> {
private String visibility = PUBLIC;
@@ -59,12 +58,10 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
super(returnType, name);
setStatic(true);
String prefix = "get";
- setName(prefix + name.substring(0, 1).toUpperCase()
- + name.substring(1));
+ setName(prefix + name.substring(0, 1).toUpperCase() + name.substring(1));
StringBuilder sb = new StringBuilder();
sb.append("\tif (").append(name).append(" == null) {\n");
- sb.append("\t\t").append(name).append(" = new ").append(returnType)
- .append("(");
+ sb.append("\t\t").append(name).append(" = new ").append(returnType).append("(");
boolean first = true;
if (parameters != null) {
for (String element : parameters) {
@@ -80,11 +77,9 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
}
}
- private static MethodDefinition definition = new MethodDefinition("dumb",
- "dumb");
+ private static MethodDefinition definition = new MethodDefinition("dumb", "dumb");
- public static MethodDefinition getStandardSingleton(String returnType,
- String name, List<String> parameters) {
+ public static MethodDefinition getStandardSingleton(String returnType, String name, List<String> parameters) {
return definition.new StandardSingleton(returnType, name, parameters);
}
@@ -125,7 +120,6 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
setContent(content + "return null;");
}
}
-
}
public MethodDefinition(Method method) {
@@ -143,8 +137,7 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
}
int pName = 'a';
for (Class<?> param : method.getParameterTypes()) {
- addParameter(new Parameter(Character.toString((char) pName++),
- param.getName(), ""));
+ addParameter(new Parameter(Character.toString((char) pName++), param.getName(), ""));
}
for (Class<?> param : method.getExceptionTypes()) {
@@ -251,8 +244,10 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
if (getParameters() != null) {
for (Parameter param : getParameters()) {
- sb.append("\n * @param ").append(param.getName())
- .append(" ").append(param.getDescription());
+ sb.append("\n * @param ")
+ .append(param.getName())
+ .append(" ")
+ .append(param.getDescription());
}
}
@@ -312,8 +307,7 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
@Override
public int compareTo(MethodDefinition arg0) {
- int res = NamingUtils.getMethodShortName(getName()).compareTo(
- NamingUtils.getMethodShortName(arg0.getName()));
+ int res = NamingUtils.getMethodShortName(getName()).compareTo(NamingUtils.getMethodShortName(arg0.getName()));
if (res == 0) {
return getName().compareTo(arg0.getName());
}
@@ -327,5 +321,4 @@ public class MethodDefinition implements Comparable<MethodDefinition> {
public void setJavadocComments(String javadocComments) {
this.javadocComments = javadocComments;
}
-
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/Parameter.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/Parameter.java
index 749737b..1326da5 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/Parameter.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/Parameter.java
@@ -73,5 +73,4 @@ public class Parameter {
sb.append(type).append(" ").append(name);
return sb.toString();
}
-
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/VariableDefinition.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/VariableDefinition.java
index 2a2aa63..5bd42b2 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/VariableDefinition.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/generator/VariableDefinition.java
@@ -27,16 +27,14 @@ public class VariableDefinition implements Comparable<VariableDefinition> {
private String initialValue;
private String annotation = null;
- public VariableDefinition(String visability, String type, String name,
- String initialValue) {
+ public VariableDefinition(String visability, String type, String name, String initialValue) {
this.visability = visability;
this.type = type;
this.name = name;
this.initialValue = initialValue;
}
- public VariableDefinition(String visability, String type, String name,
- String initialValue, String annotation) {
+ public VariableDefinition(String visability, String type, String name, String initialValue, String annotation) {
this.visability = visability;
this.type = type;
this.name = name;
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/layout/AuditLayout.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/layout/AuditLayout.java
index 433c039..fb41197 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/layout/AuditLayout.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/layout/AuditLayout.java
@@ -16,5 +16,4 @@
*/
package org.apache.logging.log4j.audit.layout;
-public class AuditLayout {
-}
+public class AuditLayout {}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMapping.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMapping.java
index a0f49da..ac45064 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMapping.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/RequestContextMapping.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.audit.request;
-
public class RequestContextMapping {
private final String fieldName;
private final Scope scope;
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 8ecdf42..a6a95b2 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
@@ -22,7 +22,6 @@ import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
-
import org.apache.logging.log4j.audit.annotation.Chained;
import org.apache.logging.log4j.audit.annotation.ClientServer;
import org.apache.logging.log4j.audit.annotation.HeaderPrefix;
@@ -54,7 +53,8 @@ public class RequestContextMappings {
throw new IllegalArgumentException("A RequestContext class must be provided");
}
Annotation annotation = clazz.getAnnotation(HeaderPrefix.class);
- this.headerPrefix = annotation != null ? ((HeaderPrefix) annotation).value().toLowerCase() : DEFAULT_HEADER_PREFIX;
+ this.headerPrefix =
+ annotation != null ? ((HeaderPrefix) annotation).value().toLowerCase() : DEFAULT_HEADER_PREFIX;
Field[] fields = clazz.getFields();
for (Field field : fields) {
if (!Modifier.isStatic(field.getModifiers())) {
@@ -87,10 +87,12 @@ public class RequestContextMappings {
try {
@SuppressWarnings("unchecked")
Supplier<String> supplier = (Supplier<String>) field.get(null);
- mappings.put(chained.fieldName().toLowerCase(),
+ mappings.put(
+ chained.fieldName().toLowerCase(),
new ChainedMapping(chained.fieldName(), chained.chainedFieldName(), supplier));
} catch (IllegalAccessException ex) {
- throw new IllegalArgumentException("Unable to retrieve Supplier for chained field " + chained.fieldName());
+ throw new IllegalArgumentException(
+ "Unable to retrieve Supplier for chained field " + chained.fieldName());
}
}
}
@@ -115,6 +117,7 @@ public class RequestContextMappings {
}
private boolean validateChained(RequestContextMapping mapping) {
- return mapping.getScope() == Scope.CHAIN && !mappings.containsKey(mapping.getChainKey().toLowerCase());
+ return mapping.getScope() == Scope.CHAIN
+ && !mappings.containsKey(mapping.getChainKey().toLowerCase());
}
}
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/Scope.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/Scope.java
index 5615ecf..1d93a38 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/Scope.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/request/Scope.java
@@ -17,5 +17,7 @@
package org.apache.logging.log4j.audit.request;
public enum Scope {
- CLIENT_SERVER, LOCAL_ONLY, CHAIN
+ CLIENT_SERVER,
+ LOCAL_ONLY,
+ CHAIN
}
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 76dac26..e9d550a 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.util.Enumeration;
-
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -25,7 +24,6 @@ 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;
@@ -84,13 +82,20 @@ public class RequestContextFilter implements Filter {
if (mapping != null) {
if (mapping.isChained()) {
ThreadContext.put(mapping.getChainKey(), request.getHeader(name));
- logger.debug("Setting Context Key:{} with value:{}", mapping.getChainKey(), request.getHeader(name));
- String value = ((ChainedMapping)mapping).getSupplier().get();
+ logger.debug(
+ "Setting Context Key:{} with value:{}",
+ mapping.getChainKey(),
+ request.getHeader(name));
+ String value =
+ ((ChainedMapping) mapping).getSupplier().get();
ThreadContext.put(mapping.getFieldName(), value);
logger.debug("Setting Context Key:{} with value:{}", mapping.getFieldName(), value);
} else {
ThreadContext.put(mapping.getFieldName(), request.getHeader(name));
- logger.debug("Setting Context Key:{} with value:{}", mapping.getFieldName(), request.getHeader(name));
+ logger.debug(
+ "Setting Context Key:{} with value:{}",
+ mapping.getFieldName(),
+ request.getHeader(name));
}
}
}
@@ -101,7 +106,9 @@ public class RequestContextFilter implements Filter {
filterChain.doFilter(servletRequest, servletResponse);
if (logger.isTraceEnabled()) {
long elapsed = System.nanoTime() - start;
- StringBuilder sb = new StringBuilder("Request ").append(request.getRequestURI()).append(" completed in ");
+ StringBuilder sb = new StringBuilder("Request ")
+ .append(request.getRequestURI())
+ .append(" completed in ");
ElapsedUtil.addElapsed(elapsed, sb);
logger.trace(sb.toString());
}
@@ -114,6 +121,5 @@ public class RequestContextFilter implements Filter {
}
}
- public void destroy() {
- }
+ public void destroy() {}
}
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 6b7da08..bb3c182 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
@@ -17,10 +17,8 @@
package org.apache.logging.log4j.audit.rest;
import java.util.Enumeration;
-
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;
@@ -54,13 +52,15 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
if (mapping != null) {
if (mapping.isChained()) {
ThreadContext.put(mapping.getChainKey(), request.getHeader(name));
- logger.debug("Setting Context Key:{} with value:{}", mapping.getChainKey(), request.getHeader(name));
+ logger.debug(
+ "Setting Context Key:{} with value:{}", mapping.getChainKey(), request.getHeader(name));
String value = ((ChainedMapping) mapping).getSupplier().get();
ThreadContext.put(mapping.getFieldName(), value);
logger.debug("Setting Context Key:{} with value:{}", mapping.getFieldName(), value);
} else {
ThreadContext.put(mapping.getFieldName(), request.getHeader(name));
- logger.debug("Setting Context Key:{} with value:{}", mapping.getFieldName(), request.getHeader(name));
+ logger.debug(
+ "Setting Context Key:{} with value:{}", mapping.getFieldName(), request.getHeader(name));
}
}
}
@@ -71,10 +71,13 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
}
@Override
- public void postHandle(HttpServletRequest request, HttpServletResponse response, Object o, ModelAndView modelAndView) {
+ 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 ");
+ StringBuilder sb = new StringBuilder("Request ")
+ .append(request.getRequestURI())
+ .append(" completed in ");
ElapsedUtil.addElapsed(elapsed, sb);
logger.trace(sb.toString());
startTime.remove();
@@ -82,7 +85,8 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
}
@Override
- public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) {
+ 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 7601e89..352fc28 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.rest;
import java.io.IOException;
import java.util.Map;
-
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.request.RequestContextMapping;
import org.apache.logging.log4j.audit.request.RequestContextMappings;
@@ -44,8 +43,9 @@ public class RequestContextHeaderInterceptor implements ClientHttpRequestInterce
}
@Override
- public ClientHttpResponse intercept(HttpRequest httpRequest, byte[] body,
- ClientHttpRequestExecution clientHttpRequestExecution) throws IOException {
+ public ClientHttpResponse intercept(
+ HttpRequest httpRequest, byte[] body, ClientHttpRequestExecution clientHttpRequestExecution)
+ throws IOException {
Map<String, String> map = ThreadContext.getImmutableContext();
HttpHeaders headers = httpRequest.getHeaders();
for (Map.Entry<String, String> entry : map.entrySet()) {
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/JsonObjectMapperFactory.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/JsonObjectMapperFactory.java
index 5db40b5..7c3ea1d 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/JsonObjectMapperFactory.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/JsonObjectMapperFactory.java
@@ -16,13 +16,6 @@
*/
package org.apache.logging.log4j.audit.util;
-import java.io.IOException;
-import java.time.DateTimeException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
@@ -35,6 +28,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.io.IOException;
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
/**
@@ -50,7 +49,8 @@ public final class JsonObjectMapperFactory {
/**
* LocalDateTime formatter that converts to and from a format usable in REST requests.
*/
- public static final DateTimeFormatter LOCAL_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern(LOCAL_DATE_TIME_FORMAT);
+ public static final DateTimeFormatter LOCAL_DATE_TIME_FORMATTER =
+ DateTimeFormatter.ofPattern(LOCAL_DATE_TIME_FORMAT);
/**
* Date/Time format.
@@ -70,10 +70,10 @@ public final class JsonObjectMapperFactory {
/**
* LocalDateTime formatter that converts to and from a format usable in REST requests.
*/
- public static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern(ZONED_DATE_TIME_FORMAT);
+ public static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER =
+ DateTimeFormatter.ofPattern(ZONED_DATE_TIME_FORMAT);
- private JsonObjectMapperFactory() {
- }
+ private JsonObjectMapperFactory() {}
/**
* Create an ObjectMapper using the standard LocalDateTime format.
@@ -87,8 +87,9 @@ public final class JsonObjectMapperFactory {
SimpleModule module = new SimpleModule();
module.addSerializer(LocalDateTime.class, new JsonSerializer<LocalDateTime>() {
@Override
- public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+ public void serialize(
+ LocalDateTime localDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException, JsonProcessingException {
jsonGenerator.writeString(dateTimeFormatter.format(localDateTime));
}
});
@@ -102,16 +103,20 @@ public final class JsonObjectMapperFactory {
try {
return LocalDateTime.parse(string, dateTimeFormatter);
} catch (DateTimeException e) {
- throw JsonMappingException.from(parser,
- String.format("Failed to deserialize %s: (%s) %s",
- handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+ throw JsonMappingException.from(
+ parser,
+ String.format(
+ "Failed to deserialize %s: (%s) %s",
+ handledType().getName(), e.getClass().getName(), e.getMessage()),
+ e);
}
}
});
module.addSerializer(ZonedDateTime.class, new JsonSerializer<ZonedDateTime>() {
@Override
- public void serialize(ZonedDateTime zonedDateTime, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+ public void serialize(
+ ZonedDateTime zonedDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException, JsonProcessingException {
jsonGenerator.writeString(zonedTimeFormatter.format(zonedDateTime));
}
});
@@ -125,16 +130,20 @@ public final class JsonObjectMapperFactory {
try {
return ZonedDateTime.parse(string, zonedTimeFormatter);
} catch (DateTimeException e) {
- throw JsonMappingException.from(parser,
- String.format("Failed to deserialize %s: (%s) %s",
- handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+ throw JsonMappingException.from(
+ parser,
+ String.format(
+ "Failed to deserialize %s: (%s) %s",
+ handledType().getName(), e.getClass().getName(), e.getMessage()),
+ e);
}
}
});
module.addSerializer(LocalDate.class, new JsonSerializer<LocalDate>() {
@Override
- public void serialize(LocalDate localDate, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+ public void serialize(
+ LocalDate localDate, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException, JsonProcessingException {
jsonGenerator.writeString(dateFormatter.format(localDate));
}
});
@@ -148,9 +157,12 @@ public final class JsonObjectMapperFactory {
try {
return LocalDate.parse(string, dateFormatter);
} catch (DateTimeException e) {
- throw JsonMappingException.from(parser,
- String.format("Failed to deserialize %s: (%s) %s",
- handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+ throw JsonMappingException.from(
+ parser,
+ String.format(
+ "Failed to deserialize %s: (%s) %s",
+ handledType().getName(), e.getClass().getName(), e.getMessage()),
+ e);
}
}
});
@@ -159,5 +171,4 @@ public final class JsonObjectMapperFactory {
mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
return mapper;
}
-
}
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 31679af..f141577 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
@@ -18,8 +18,7 @@ package org.apache.logging.log4j.audit.util;
public final class NamingUtils {
- private NamingUtils() {
- }
+ private NamingUtils() {}
public static String getPackageName(String className) {
return className.substring(0, className.lastIndexOf('.'));
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/StringUtil.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/StringUtil.java
index bef96bf..fdbf6a6 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/StringUtil.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/util/StringUtil.java
@@ -27,5 +27,4 @@ public class StringUtil {
String alphaAndDigits = input.replaceAll("[^a-zA-Z0-9_]+", "");
System.out.println(alphaAndDigits);
}
-
}
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 7d5a89d..246192b 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
@@ -16,12 +16,15 @@
*/
package org.apache.logging.log4j.audit;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.catalog.CatalogManager;
@@ -38,11 +41,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
/**
*
*/
@@ -140,7 +138,8 @@ public class AuditLoggerTest {
@Test
public void testAuditLoggerWithBasicCatalog() throws Exception {
- auditLogger = buildAuditLogger(new ClassPathCatalogReader(Collections.singletonMap("catalogFile", "basicCatalog.json")));
+ auditLogger = buildAuditLogger(
+ new ClassPathCatalogReader(Collections.singletonMap("catalogFile", "basicCatalog.json")));
auditLogger.logEvent("login", null);
}
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 2ab9ef7..c39f3fb 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
@@ -16,8 +16,9 @@
*/
package org.apache.logging.log4j.audit;
-import java.util.Map;
+import static org.junit.Assert.assertNotNull;
+import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.Appender;
@@ -27,8 +28,6 @@ import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.junit.Before;
import org.junit.BeforeClass;
-import static org.junit.Assert.assertNotNull;
-
public class BaseEventTest {
protected static LoggerContext ctx;
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/LogoutTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/LogoutTest.java
index c048940..d7dbd7e 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/LogoutTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/LogoutTest.java
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.audit;
+import static org.junit.Assert.*;
+
import java.util.Collections;
import java.util.List;
-
import org.apache.logging.log4j.audit.event.Logout;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class LogoutTest extends BaseEventTest {
@Test
public void testAuditClassToString() {
@@ -44,9 +43,8 @@ public class LogoutTest extends BaseEventTest {
event.logEvent();
- AuditExceptionHandler exceptionHandler = (message, ex) -> {
+ AuditExceptionHandler exceptionHandler = (message, ex) -> {};
- };
event.setAuditExceptionHandler(exceptionHandler);
event.logEvent();
@@ -58,7 +56,8 @@ public class LogoutTest extends BaseEventTest {
assertTrue("No completionStatus", msg.contains("completionStatus=\"Success\""));
msg = msgs.get(2);
- assertFalse("auditExceptionHandler should not be present in the context", msg.contains("auditExceptionHandler=\""));
+ assertFalse(
+ "auditExceptionHandler should not be present in the context", msg.contains("auditExceptionHandler=\""));
msgs.forEach(System.out::println);
}
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContext.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContext.java
index 209e818..91f82fe 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContext.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContext.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit;
import java.util.UUID;
import java.util.function.Supplier;
-
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.annotation.Chained;
import org.apache.logging.log4j.audit.annotation.ClientServer;
@@ -35,24 +34,37 @@ import org.apache.logging.log4j.core.util.UuidUtil;
public final class RequestContext {
@ClientServer
public static final String REQUEST_ID = "requestId";
+
public String requestId;
+
@ClientServer
public static final String SESSION_ID = "sessionId";
+
private String sessionId;
+
@ClientServer
public static final String ACCOUNT_NUMBER = "accountNumber";
+
private Long accountNumber;
+
@ClientServer
public static final String IP_ADDRESS = "ipAddress";
+
private String ipAddress;
+
@ClientServer
public static final String USER_ID = "userId";
+
private String userId;
+
@ClientServer
public static final String LOGIN_ID = "loginId";
+
private String loginId;
+
@Local
public static final String CALLING_HOST = "callingHost";
+
private String callingHost;
public static final String HOST_NAME = "hostName";
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContextTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContextTest.java
index a10bc9d..128a824 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContextTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/RequestContextTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.logging.log4j.audit;
+import static org.junit.Assert.*;
+
import org.apache.logging.log4j.audit.request.RequestContextMapping;
import org.apache.logging.log4j.audit.request.RequestContextMappings;
import org.apache.logging.log4j.audit.request.Scope;
import org.apache.logging.log4j.core.util.UuidUtil;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class RequestContextTest {
@Test
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 a5c2e95..437b161 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
@@ -16,11 +16,18 @@
*/
package org.apache.logging.log4j.audit;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.isA;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.LoggingException;
@@ -37,14 +44,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.isA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
/**
*
*/
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
index cc3d3e1..bcd0a76 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/CatalogManagerTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.logging.log4j.audit.catalog;
-import org.apache.logging.log4j.catalog.api.Event;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import org.apache.logging.log4j.catalog.api.Event;
+import org.junit.Test;
+
/**
*
*/
@@ -31,12 +31,15 @@ public class CatalogManagerTest {
CatalogManager manager = new CatalogManagerImpl(new StringCatalogReader());
Event event = manager.getEvent("transfer");
assertNotNull("No transfer event", event);
- assertEquals("{\"name\" : \"transfer\", \"displayName\" : \"Transfer\", \"description\" : \"Transfer between accounts\", " +
- "\"attributes\" : [{\"name\" : \"toAccount\", \"required\" : true}, {\"name\" : \"fromAccount\", \"required\" : true}, {\"name\" : \"amount\", \"required\" : true}]}",
- event.toString());
+ assertEquals(
+ "{\"name\" : \"transfer\", \"displayName\" : \"Transfer\", \"description\" : \"Transfer between accounts\", "
+ + "\"attributes\" : [{\"name\" : \"toAccount\", \"required\" : true}, {\"name\" : \"fromAccount\", \"required\" : true}, {\"name\" : \"amount\", \"required\" : true}]}",
+ event.toString());
Event login = manager.getEvent("login");
assertNotNull("No login event", login);
- assertEquals("{\"name\" : \"login\", \"displayName\" : \"Login\", \"description\" : \"User Login\", \"attributes\" : []}", login.toString());
+ assertEquals(
+ "{\"name\" : \"login\", \"displayName\" : \"Login\", \"description\" : \"User Login\", \"attributes\" : []}",
+ login.toString());
}
}
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/StringCatalogReader.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/StringCatalogReader.java
index 7c4e166..2a2c2c1 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/StringCatalogReader.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/catalog/StringCatalogReader.java
@@ -16,6 +16,12 @@
*/
package org.apache.logging.log4j.audit.catalog;
+import static org.junit.Assert.assertNotNull;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
@@ -26,11 +32,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.CatalogReader;
@@ -44,8 +45,6 @@ import org.apache.logging.log4j.catalog.api.plugins.MinValueConstraint;
import org.apache.logging.log4j.catalog.api.plugins.PatternConstraint;
import org.apache.logging.log4j.catalog.api.util.CatalogEventFilter;
-import static org.junit.Assert.assertNotNull;
-
/**
*
*/
@@ -90,7 +89,6 @@ public class StringCatalogReader implements CatalogReader {
return attributeMap;
}
-
@Override
public Attribute getAttribute(String name) {
return attributeMap.get(name);
@@ -99,25 +97,32 @@ public class StringCatalogReader implements CatalogReader {
@Override
public Category getCategory(String name) {
if (catalogData.getCategories() != null) {
- return catalogData.getCategories().stream().filter(a -> a.getName().equals(name)).findFirst().orElse(null);
+ return catalogData.getCategories().stream()
+ .filter(a -> a.getName().equals(name))
+ .findFirst()
+ .orElse(null);
}
return null;
}
-
@Override
public Event getEvent(String name) {
if (catalogData.getEvents() != null) {
- return catalogData.getEvents().stream().filter(e -> e.getName().equals(name)).findFirst().orElse(null);
+ return catalogData.getEvents().stream()
+ .filter(e -> e.getName().equals(name))
+ .findFirst()
+ .orElse(null);
}
return null;
}
-
@Override
public Product getProduct(String name) {
if (catalogData.getProducts() != null) {
- return catalogData.getProducts().stream().filter(p -> p.getName().equals(name)).findFirst().orElse(null);
+ return catalogData.getProducts().stream()
+ .filter(p -> p.getName().equals(name))
+ .findFirst()
+ .orElse(null);
}
return null;
}
@@ -150,32 +155,64 @@ public class StringCatalogReader implements CatalogReader {
List<Event> events = new ArrayList<>();
Attribute attribute = new Attribute();
attribute.setName("accountNumber").setDisplayName("Account Number").setDescription("Company account number");
- attribute.setDataType(DataType.INT).setIndexed(true).setSortable(true).setRequired(true).setRequestContext(true);
+ attribute
+ .setDataType(DataType.INT)
+ .setIndexed(true)
+ .setSortable(true)
+ .setRequired(true)
+ .setRequestContext(true);
attributes.add(attribute);
attribute = new Attribute();
attribute.setName("ipAddress").setDisplayName("IP Address").setDescription("IP Address of the caller");
- attribute.setDataType(DataType.STRING).setIndexed(true).setSortable(true).setRequired(false).setRequestContext(true);
+ attribute
+ .setDataType(DataType.STRING)
+ .setIndexed(true)
+ .setSortable(true)
+ .setRequired(false)
+ .setRequestContext(true);
Set<Constraint> constraints = new HashSet<>();
Constraint constraint = new Constraint();
- constraint.setConstraintType(new PatternConstraint()).setValue("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$");
+ constraint
+ .setConstraintType(new PatternConstraint())
+ .setValue(
+ "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$");
constraints.add(constraint);
attribute.setConstraints(constraints);
attributes.add(attribute);
attribute = new Attribute();
- attribute.setName("userId").setDisplayName("UserId").setDescription("Id of the User").setDataType(DataType.INT);
+ attribute
+ .setName("userId")
+ .setDisplayName("UserId")
+ .setDescription("Id of the User")
+ .setDataType(DataType.INT);
attribute.setIndexed(true).setSortable(true).setRequired(true).setRequestContext(true);
attributes.add(attribute);
attribute = new Attribute();
attribute.setName("loginId").setDisplayName("LoginId").setDescription("Id user logs in with");
- attribute.setDataType(DataType.INT).setIndexed(true).setSortable(true).setRequired(true).setRequestContext(true);
+ attribute
+ .setDataType(DataType.INT)
+ .setIndexed(true)
+ .setSortable(true)
+ .setRequired(true)
+ .setRequestContext(true);
attributes.add(attribute);
attribute = new Attribute();
attribute.setName("hostName").setDisplayName("Host Name").setDescription("Name of the server");
- attribute.setDataType(DataType.STRING).setIndexed(true).setSortable(true).setRequired(false).setRequestContext(true);
+ attribute
+ .setDataType(DataType.STRING)
+ .setIndexed(true)
+ .setSortable(true)
+ .setRequired(false)
+ .setRequestContext(true);
attributes.add(attribute);
Attribute toAccount = new Attribute();
toAccount.setName("toAccount").setDisplayName("To Account Number").setDescription("Destination account");
- toAccount.setDataType(DataType.INT).setIndexed(false).setSortable(false).setRequired(true).setRequestContext(false);
+ toAccount
+ .setDataType(DataType.INT)
+ .setIndexed(false)
+ .setSortable(false)
+ .setRequired(true)
+ .setRequestContext(false);
constraints = new HashSet<>();
constraint = new Constraint();
constraint.setConstraintType(new MinValueConstraint()).setValue("1");
@@ -184,19 +221,36 @@ public class StringCatalogReader implements CatalogReader {
attributes.add(toAccount);
Attribute fromAccount = new Attribute();
fromAccount.setName("fromAccount").setDisplayName("From Account Number").setDescription("Source of funds");
- fromAccount.setDataType(DataType.INT).setIndexed(false).setSortable(false).setRequired(true).setRequestContext(false);
+ fromAccount
+ .setDataType(DataType.INT)
+ .setIndexed(false)
+ .setSortable(false)
+ .setRequired(true)
+ .setRequestContext(false);
attributes.add(fromAccount);
Attribute amount = new Attribute();
amount.setName("amount").setDisplayName("Amount").setDescription("Amount to transfer");
- amount.setDataType(DataType.BIG_DECIMAL).setIndexed(false).setSortable(false).setRequired(true).setRequestContext(false);
+ amount.setDataType(DataType.BIG_DECIMAL)
+ .setIndexed(false)
+ .setSortable(false)
+ .setRequired(true)
+ .setRequestContext(false);
attributes.add(amount);
Attribute account = new Attribute();
account.setName("account").setDisplayName("Account Number").setDescription("Accopunt number");
- account.setDataType(DataType.INT).setIndexed(false).setSortable(false).setRequired(true).setRequestContext(false);
+ account.setDataType(DataType.INT)
+ .setIndexed(false)
+ .setSortable(false)
+ .setRequired(true)
+ .setRequestContext(false);
attributes.add(account);
Attribute payee = new Attribute();
payee.setName("payee").setDisplayName("Payee").setDescription("Recipient of payment");
- payee.setDataType(DataType.STRING).setIndexed(false).setSortable(false).setRequired(true).setRequestContext(false);
+ payee.setDataType(DataType.STRING)
+ .setIndexed(false)
+ .setSortable(false)
+ .setRequired(true)
+ .setRequestContext(false);
attributes.add(payee);
Event event = new Event();
event.setName("login").setDisplayName("Login").setDescription("User Login");
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Logout.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Logout.java
index 0a600a8..e173217 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Logout.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/event/Logout.java
@@ -20,5 +20,4 @@ import org.apache.logging.log4j.audit.AuditEvent;
import org.apache.logging.log4j.audit.annotation.EventName;
@EventName("Logout")
-public interface Logout extends AuditEvent {
-}
+public interface Logout extends AuditEvent {}
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 80b3794..46f05bd 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
@@ -17,7 +17,6 @@
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;
@@ -29,11 +28,18 @@ import org.apache.logging.log4j.audit.annotation.Required;
* @author generated
*/
@MaxLength(32)
-@RequestContext(key="hostName")
-@RequestContext(key="loginId", required=true)
-@RequestContext(key="ipAddress", constraints={@Constraint(constraintType="pattern", constraintValue="^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$")})
-@RequestContext(key="accountNumber", required=true)
-@RequestContext(key="userId", required=true)
+@RequestContext(key = "hostName")
+@RequestContext(key = "loginId", required = true)
+@RequestContext(
+ key = "ipAddress",
+ constraints = {
+ @Constraint(
+ constraintType = "pattern",
+ constraintValue =
+ "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$")
+ })
+@RequestContext(key = "accountNumber", required = true)
+@RequestContext(key = "userId", required = true)
public interface Transfer extends AuditEvent {
/**
@@ -55,7 +61,6 @@ public interface Transfer extends AuditEvent {
* @param toAccount Destination account
*/
@Required
- @Constraint(constraintType="minValue", constraintValue="1")
+ @Constraint(constraintType = "minValue", constraintValue = "1")
void setToAccount(int toAccount);
-
}
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 70b8edb..9c08ebb 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
@@ -16,12 +16,13 @@
*/
package org.apache.logging.log4j.audit.generator;
+import static org.junit.Assert.*;
+
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.BeforeClass;
@@ -29,8 +30,6 @@ import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.*;
-
public class TestInterfacesGenerator {
private static final Logger logger = LogManager.getLogger(TestInterfacesGenerator.class);
private static ApplicationContext context;
@@ -49,8 +48,7 @@ public class TestInterfacesGenerator {
@Test
public void testInterfaceGenerator() throws Exception {
- InterfacesGenerator interfacesGenerator =
- (InterfacesGenerator) context.getBean("interfacesGenerator");
+ InterfacesGenerator interfacesGenerator = (InterfacesGenerator) context.getBean("interfacesGenerator");
assertNotNull("No interfaces generator", interfacesGenerator);
try {
interfacesGenerator.generateSource();
@@ -62,8 +60,10 @@ public class TestInterfacesGenerator {
assertNotNull("Could not locate generated source path", p);
int maxDepth = 10;
List<String> fileNames = new ArrayList<>();
- Files.find(p, maxDepth, (path, basicFileAttributes) -> String.valueOf(path).endsWith(".java"))
- .map(path -> path.getFileName().toString()).forEach(fileNames::add);
+ Files.find(p, maxDepth, (path, basicFileAttributes) -> String.valueOf(path)
+ .endsWith(".java"))
+ .map(path -> path.getFileName().toString())
+ .forEach(fileNames::add);
assertEquals("Incorrect number of files generated. Expected 4 was " + fileNames.size(), 4, fileNames.size());
}
}
diff --git a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/util/NamingUtilsTest.java b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/util/NamingUtilsTest.java
index bd39243..0eb2c1d 100644
--- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/util/NamingUtilsTest.java
+++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/util/NamingUtilsTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.audit.util;
-
import static org.apache.logging.log4j.audit.util.NamingUtils.*;
/**
diff --git a/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java b/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
index 9a9793f..38c8227 100644
--- a/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
+++ b/log4j-audit/log4j-audit-maven-plugin/src/main/java/org/apache/logging/log4j/audit/plugin/AuditMojo.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.logging.log4j.audit.generator.InterfacesGenerator;
import org.apache.logging.log4j.catalog.api.CatalogReader;
import org.apache.logging.log4j.catalog.api.dao.JsonCatalogReader;
@@ -46,7 +45,9 @@ public class AuditMojo extends AbstractMojo {
@Parameter(defaultValue = "${project}")
private MavenProject project;
- @Parameter(property = "catalogReaderClassName", defaultValue = "org.apache.logging.log4j.catalog.api.dao.FileCatalogReader")
+ @Parameter(
+ property = "catalogReaderClassName",
+ defaultValue = "org.apache.logging.log4j.catalog.api.dao.FileCatalogReader")
private String catalogReaderClassName;
@Parameter(property = "catalogReaderAttributes", required = false)
@@ -87,12 +88,14 @@ public class AuditMojo extends AbstractMojo {
Constructor<CatalogReader>[] constructors = (Constructor<CatalogReader>[]) clazz.getConstructors();
for (Constructor<CatalogReader> constructor : constructors) {
- if (constructor.getParameterCount() == 1 && constructor.getParameterTypes()[0].isAssignableFrom(Map.class)) {
+ if (constructor.getParameterCount() == 1
+ && constructor.getParameterTypes()[0].isAssignableFrom(Map.class)) {
if (catalogReaderAttributes == null) {
catalogReaderAttributes = new HashMap<>();
}
if (!catalogReaderAttributes.containsKey(BASEDIR)) {
- catalogReaderAttributes.put(BASEDIR, project.getBasedir().getAbsolutePath());
+ catalogReaderAttributes.put(
+ BASEDIR, project.getBasedir().getAbsolutePath());
}
if (!catalogReaderAttributes.containsKey(BUILDDIR)) {
catalogReaderAttributes.put(BUILDDIR, project.getBuild().getDirectory());
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 6b6a61c..733f61a 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
@@ -23,9 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import javax.annotation.PostConstruct;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.audit.catalog.CatalogManagerImpl;
@@ -83,7 +81,6 @@ public class AuditCatalogManager extends CatalogManagerImpl implements AuditMana
private final CatalogReader catalogReader;
-
public AuditCatalogManager(CatalogReader catalogReader) {
super(catalogReader);
this.catalogReader = catalogReader;
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/ApplicationConfiguration.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/ApplicationConfiguration.java
index e9d4fc4..947fea0 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/ApplicationConfiguration.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/ApplicationConfiguration.java
@@ -19,5 +19,4 @@ package org.apache.logging.log4j.audit.service.config;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class ApplicationConfiguration {
-}
+public class ApplicationConfiguration {}
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java
index 080886d..d0a75da 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.service.config;
import java.time.LocalDate;
import java.time.LocalDateTime;
-
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -40,24 +39,24 @@ public class SwaggerConfig {
@Bean
public Docket api() {
return new Docket(DocumentationType.SWAGGER_2)
- .apiInfo(apiInfo())
- .select()
- .apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any())
- .build()
- .directModelSubstitute(LocalDate.class, java.sql.Date.class)
- .directModelSubstitute(LocalDateTime.class, java.util.Date.class);
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.any())
+ .paths(PathSelectors.any())
+ .build()
+ .directModelSubstitute(LocalDate.class, java.sql.Date.class)
+ .directModelSubstitute(LocalDateTime.class, java.util.Date.class);
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
- .title("Audit Service")
- .description("Audits events")
- .termsOfServiceUrl("http://logging.apache.org")
- .contact("Apache Logging")
- .license("1.0")
- .licenseUrl("http://www.apache.org/licenses/")
- .version("1.0")
- .build();
+ .title("Audit Service")
+ .description("Audits events")
+ .termsOfServiceUrl("http://logging.apache.org")
+ .contact("Apache Logging")
+ .license("1.0")
+ .licenseUrl("http://www.apache.org/licenses/")
+ .version("1.0")
+ .build();
}
}
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 e00f1fc..d3d12c6 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.service.config;
import javax.servlet.ServletContext;
import javax.servlet.ServletRegistration;
-
import org.apache.logging.log4j.catalog.api.util.ProfileUtil;
import org.springframework.web.WebApplicationInitializer;
import org.springframework.web.context.ContextLoaderListener;
@@ -42,11 +41,9 @@ public class WebAppInitializer implements WebApplicationInitializer {
AnnotationConfigWebApplicationContext mvcContext = new AnnotationConfigWebApplicationContext();
mvcContext.register(WebMvcAppContext.class);
- ServletRegistration.Dynamic restServlet = servletContext.addServlet("restServlet", new DispatcherServlet(mvcContext));
+ ServletRegistration.Dynamic restServlet =
+ servletContext.addServlet("restServlet", new DispatcherServlet(mvcContext));
restServlet.setLoadOnStartup(1);
restServlet.addMapping("/*");
}
-
-
-
}
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 9163e3a..3121ef8 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,11 @@
*/
package org.apache.logging.log4j.audit.service.config;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import java.io.IOException;
import java.util.Collections;
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;
import org.apache.logging.log4j.audit.AuditLogger;
@@ -53,12 +52,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;
-
@Configuration
@EnableWebMvc
@EnableScheduling
@ComponentScan(basePackages = {"org.apache.logging.log4j.catalog.jpa", "org.apache.logging.log4j.audit.service"})
-@PropertySource(value= " classpath:catalog-${env:}config.properties", ignoreResourceNotFound = true)
+@PropertySource(value = " classpath:catalog-${env:}config.properties", ignoreResourceNotFound = true)
public class WebMvcAppContext extends WebMvcConfigurerAdapter {
private static final Logger LOGGER = LogManager.getLogger(WebMvcAppContext.class);
@@ -82,7 +80,6 @@ public class WebMvcAppContext extends WebMvcConfigurerAdapter {
converters.add(jsonMessageConverter());
}
-
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(localAuthorizationInterceptor())
@@ -163,5 +160,4 @@ public class WebMvcAppContext extends WebMvcConfigurerAdapter {
auditLogger.setCatalogManager(auditManager());
return auditLogger;
}
-
}
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 b1183c2..dfa8dde 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,11 +16,10 @@
*/
package org.apache.logging.log4j.audit.service.controller;
-import java.util.Map;
-
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import java.util.Map;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.audit.AuditLogger;
import org.apache.logging.log4j.audit.dto.AuditDto;
@@ -38,8 +37,11 @@ public class AuditController {
@Autowired
private AuditLogger auditLogger;
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Generate an Audit event", notes = "Causes an Audit event to be logged", tags = {"Audit"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Generate an Audit event",
+ notes = "Causes an Audit event to be logged",
+ tags = {"Audit"})
@PostMapping(value = "/event/log", produces = Versions.V1_0)
@ResponseStatus(value = HttpStatus.OK)
public void logEvent(@RequestBody AuditDto auditDto) {
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 c9e8143..cc73130 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
@@ -16,17 +16,17 @@
*/
package org.apache.logging.log4j.audit.service.controller;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.annotation.PostConstruct;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.PostConstruct;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.audit.service.catalog.AuditManager;
@@ -66,8 +66,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
@RestController
@RequestMapping(value = "/catalog")
public class CatalogController {
@@ -126,16 +124,19 @@ public class CatalogController {
categoryModelMapper.addConverter(categoryModelConverter);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "List catalog Attributes", notes = "List catalog attributes for a catalog id", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "List catalog Attributes",
+ notes = "List catalog attributes for a catalog id",
+ tags = {"Catalog"})
@GetMapping(value = "{catalogId}/attributes")
- public ResponseEntity<List<Attribute>> getAttributes(@ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
- @RequestParam(value = "startIndex", required = false) Integer startIndex,
- @RequestParam(value = "pageSize", required = false) Integer pageSize,
- @RequestParam(value = "sortCol", required= false) String sortColumn,
- @RequestParam(value = "sortDir", required = false) String sortDirection) {
- Type listType = new TypeToken<List<Attribute>>() {
- }.getType();
+ public ResponseEntity<List<Attribute>> getAttributes(
+ @ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
+ @RequestParam(value = "startIndex", required = false) Integer startIndex,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize,
+ @RequestParam(value = "sortCol", required = false) String sortColumn,
+ @RequestParam(value = "sortDir", required = false) String sortDirection) {
+ Type listType = new TypeToken<List<Attribute>>() {}.getType();
List<Attribute> attributes;
if (startIndex == null || pageSize == null) {
attributes = attributeModelMapper.map(attributeService.getAttributes(catalogId), listType);
@@ -148,8 +149,8 @@ public class CatalogController {
if (startIndex > 0) {
startPage = startIndex / pageSize;
}
- attributes = attributeModelMapper.map(attributeService.getAttributes(startPage, pageSize, sortColumn,
- sortDirection), listType);
+ attributes = attributeModelMapper.map(
+ attributeService.getAttributes(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (attributes == null) {
attributes = new ArrayList<>();
@@ -157,11 +158,15 @@ public class CatalogController {
return new ResponseEntity<>(attributes, HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Create a catalog Attribute", notes = "Returns a catalog attribute", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Create a catalog Attribute",
+ notes = "Returns a catalog attribute",
+ tags = {"Catalog"})
@GetMapping(value = "{catalogId}/attribute/{name}")
- public ResponseEntity<Attribute> getAttribute(@ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
- @ApiParam(value = "attribute name", required = true) @PathVariable String name) {
+ public ResponseEntity<Attribute> getAttribute(
+ @ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
+ @ApiParam(value = "attribute name", required = true) @PathVariable String name) {
Optional<AttributeModel> optional = attributeService.getAttribute(catalogId, name);
if (!optional.isPresent()) {
LOGGER.warn("Unable to locate attribute {} in catalog {}", name, catalogId);
@@ -171,12 +176,14 @@ public class CatalogController {
return new ResponseEntity<>(attribute, HttpStatus.OK);
}
-
-
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Create a catalog Attribute", notes = "Creates a catalog attribute", tags = {"Catalog"})
- @PostMapping(value = "/attribute", consumes=Versions.V1_0, produces=Versions.V1_0)
- public ResponseEntity<Attribute> createAttribute(@ApiParam(value = "attribute", required = true) @RequestBody Attribute attribute) {
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Create a catalog Attribute",
+ notes = "Creates a catalog attribute",
+ tags = {"Catalog"})
+ @PostMapping(value = "/attribute", consumes = Versions.V1_0, produces = Versions.V1_0)
+ public ResponseEntity<Attribute> createAttribute(
+ @ApiParam(value = "attribute", required = true) @RequestBody Attribute attribute) {
if (attribute.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required.");
}
@@ -184,11 +191,11 @@ public class CatalogController {
throw new IllegalArgumentException("The default catalog cannot be modified at run time.");
}
AttributeModel model;
- synchronized(this) {
+ synchronized (this) {
Optional<AttributeModel> opt = attributeService.getAttribute(attribute.getCatalogId(), attribute.getName());
if (opt != null && opt.isPresent()) {
- throw new IllegalStateException(
- "An attribute named " + attribute.getName() + " in catalog " + attribute.getCatalogId() + " already exists");
+ throw new IllegalStateException("An attribute named " + attribute.getName() + " in catalog "
+ + attribute.getCatalogId() + " already exists");
}
model = attributeService.saveAttribute(attributeConverter.convert(attribute));
auditManager.saveAttribute(attribute);
@@ -196,10 +203,14 @@ public class CatalogController {
return new ResponseEntity<>(attributeModelConverter.convert(model), HttpStatus.CREATED);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Update a catalog Attribute", notes = "Updates a catalog attribute", tags = {"Catalog"})
- @PutMapping(value = "/attribute", consumes=Versions.V1_0, produces=Versions.V1_0)
- public ResponseEntity<Attribute> updateAttribute(@ApiParam(value = "attribute", required = true) @RequestBody Attribute attribute) {
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Update a catalog Attribute",
+ notes = "Updates a catalog attribute",
+ tags = {"Catalog"})
+ @PutMapping(value = "/attribute", consumes = Versions.V1_0, produces = Versions.V1_0)
+ public ResponseEntity<Attribute> updateAttribute(
+ @ApiParam(value = "attribute", required = true) @RequestBody Attribute attribute) {
if (attribute.getId() == null) {
throw new IllegalArgumentException("An Attribute must have an id to be updated.");
}
@@ -215,8 +226,11 @@ public class CatalogController {
return new ResponseEntity<>(attributeModelConverter.convert(model), HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Deletes a catalog Attribute", notes = "Deletes a catalog attribute", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Deletes a catalog Attribute",
+ notes = "Deletes a catalog attribute",
+ tags = {"Catalog"})
@DeleteMapping(value = "/attribute/{id}")
public ResponseEntity<?> deleteAttribute(@RequestParam("id") Long attributeId) {
synchronized (this) {
@@ -228,14 +242,18 @@ public class CatalogController {
return new ResponseEntity<>(HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "List catalog Events", notes = "Lists catalog events for a catalog id", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "List catalog Events",
+ notes = "Lists catalog events for a catalog id",
+ tags = {"Catalog"})
@GetMapping(value = "{catalogId}/events")
- public ResponseEntity<List<Event>> getEvents(@ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
- @RequestParam(value = "startIndex", required = false) Integer startIndex,
- @RequestParam(value = "pageSize", required = false) Integer pageSize,
- @RequestParam(value = "sortCol", required= false) String sortColumn,
- @RequestParam(value = "sortDir", required = false) String sortDirection) {
+ public ResponseEntity<List<Event>> getEvents(
+ @ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
+ @RequestParam(value = "startIndex", required = false) Integer startIndex,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize,
+ @RequestParam(value = "sortCol", required = false) String sortColumn,
+ @RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Event>>() {}.getType();
List<Event> events;
if (startIndex == null || pageSize == null) {
@@ -249,8 +267,8 @@ public class CatalogController {
if (startIndex > 0) {
startPage = startIndex / pageSize;
}
- events = eventModelMapper.map(eventService.getEvents(startPage, pageSize, sortColumn,
- sortDirection), listType);
+ events = eventModelMapper.map(
+ eventService.getEvents(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (events == null) {
events = new ArrayList<>();
@@ -258,9 +276,12 @@ public class CatalogController {
return new ResponseEntity<>(events, HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Create a catalog Event", notes = "Creates a catalog event", tags = {"Catalog"})
- @PostMapping(value = "/event", consumes=Versions.V1_0, produces=Versions.V1_0)
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Create a catalog Event",
+ notes = "Creates a catalog event",
+ tags = {"Catalog"})
+ @PostMapping(value = "/event", consumes = Versions.V1_0, produces = Versions.V1_0)
public ResponseEntity<Event> createEvent(@ApiParam(value = "event", required = true) @RequestBody Event event) {
if (event.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required to create an event.");
@@ -269,20 +290,23 @@ public class CatalogController {
throw new IllegalArgumentException("The default catalog cannot be modified at run time.");
}
EventModel model;
- synchronized(this) {
+ synchronized (this) {
Optional<EventModel> opt = eventService.getEvent(event.getCatalogId(), event.getName());
if (opt != null && opt.isPresent()) {
- throw new IllegalStateException(
- "An event named " + event.getName() + " in catalog " + event.getCatalogId() + " already exists");
+ throw new IllegalStateException("An event named " + event.getName() + " in catalog "
+ + event.getCatalogId() + " already exists");
}
model = auditManager.saveEvent(event);
}
return new ResponseEntity<>(eventModelConverter.convert(model), HttpStatus.CREATED);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Update a catalog Event", notes = "Updates a catalog event", tags = {"Catalog"})
- @PutMapping(value = "/event", consumes=Versions.V1_0, produces=Versions.V1_0)
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Update a catalog Event",
+ notes = "Updates a catalog event",
+ tags = {"Catalog"})
+ @PutMapping(value = "/event", consumes = Versions.V1_0, produces = Versions.V1_0)
public ResponseEntity<Event> updateEvent(@ApiParam(value = "event", required = true) @RequestBody Event event) {
if (event.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required to update an event.");
@@ -291,29 +315,36 @@ public class CatalogController {
throw new IllegalArgumentException("The default catalog cannot be modified at run time.");
}
EventModel model;
- synchronized(this) {
+ synchronized (this) {
model = eventConverter.convert(event);
model = eventService.saveEvent(model);
}
return new ResponseEntity<>(eventModelConverter.convert(model), HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Deletes a catalog event", notes = "Deletes a catalog event", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Deletes a catalog event",
+ notes = "Deletes a catalog event",
+ tags = {"Catalog"})
@DeleteMapping(value = "/event/{id}")
public ResponseEntity<?> deleteEvent(@RequestParam("id") Long eventId) {
eventService.deleteEvent(eventId);
return new ResponseEntity<>(HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "List catalog Products", notes = "Lists catalog products for a catalog id", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "List catalog Products",
+ notes = "Lists catalog products for a catalog id",
+ tags = {"Catalog"})
@GetMapping(value = "{catalogId}/products")
- public ResponseEntity<List<Product>> getProducts(@ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
- @RequestParam(value = "startIndex", required = false) Integer startIndex,
- @RequestParam(value = "pageSize", required = false) Integer pageSize,
- @RequestParam(value = "sortCol", required= false) String sortColumn,
- @RequestParam(value = "sortDir", required = false) String sortDirection) {
+ public ResponseEntity<List<Product>> getProducts(
+ @ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
+ @RequestParam(value = "startIndex", required = false) Integer startIndex,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize,
+ @RequestParam(value = "sortCol", required = false) String sortColumn,
+ @RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Product>>() {}.getType();
List<Product> products;
if (startIndex == null || pageSize == null) {
@@ -327,8 +358,8 @@ public class CatalogController {
if (startIndex > 0) {
startPage = startIndex / pageSize;
}
- products = productModelMapper.map(productService.getProducts(startPage, pageSize, sortColumn,
- sortDirection), listType);
+ products = productModelMapper.map(
+ productService.getProducts(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (products == null) {
products = new ArrayList<>();
@@ -336,10 +367,14 @@ public class CatalogController {
return new ResponseEntity<>(products, HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Create a catalog Product", notes = "Creates a catalog product", tags = {"Catalog"})
- @PostMapping(value = "/product", consumes=Versions.V1_0, produces=Versions.V1_0)
- public ResponseEntity<Product> createProduct(@ApiParam(value = "product", required = true) @RequestBody Product product) {
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Create a catalog Product",
+ notes = "Creates a catalog product",
+ tags = {"Catalog"})
+ @PostMapping(value = "/product", consumes = Versions.V1_0, produces = Versions.V1_0)
+ public ResponseEntity<Product> createProduct(
+ @ApiParam(value = "product", required = true) @RequestBody Product product) {
if (product.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required to create a product.");
}
@@ -348,18 +383,22 @@ public class CatalogController {
}
Optional<ProductModel> opt = productService.getProduct(product.getCatalogId(), product.getName());
if (opt != null && opt.isPresent()) {
- throw new IllegalStateException("A product named "+ product.getName() + " in catalog " +
- product.getCatalogId() + " already exists");
+ throw new IllegalStateException("A product named " + product.getName() + " in catalog "
+ + product.getCatalogId() + " already exists");
}
ProductModel model = productConverter.convert(product);
model = productService.saveProduct(model);
return new ResponseEntity<>(productModelConverter.convert(model), HttpStatus.CREATED);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Update a catalog Product", notes = "Updates a catalog event", tags = {"Catalog"})
- @PutMapping(value = "/product", consumes=Versions.V1_0, produces=Versions.V1_0)
- public ResponseEntity<Product> updateProduct(@ApiParam(value = "product", required = true) @RequestBody Product product) {
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Update a catalog Product",
+ notes = "Updates a catalog event",
+ tags = {"Catalog"})
+ @PutMapping(value = "/product", consumes = Versions.V1_0, produces = Versions.V1_0)
+ public ResponseEntity<Product> updateProduct(
+ @ApiParam(value = "product", required = true) @RequestBody Product product) {
if (product.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required to update a product.");
}
@@ -371,22 +410,29 @@ public class CatalogController {
return new ResponseEntity<>(productModelConverter.convert(model), HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Deletes a catalog product", notes = "Deletes a catalog product", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Deletes a catalog product",
+ notes = "Deletes a catalog product",
+ tags = {"Catalog"})
@DeleteMapping(value = "/product/{id}")
public ResponseEntity<?> deleteProduct(@RequestParam("id") Long productId) {
productService.deleteProduct(productId);
return new ResponseEntity<>(HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "List catalog Categories", notes = "Lists catalog categories for a catalog id", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "List catalog Categories",
+ notes = "Lists catalog categories for a catalog id",
+ tags = {"Catalog"})
@GetMapping(value = "{catalogId}/categories")
- public ResponseEntity<List<Category>> getCategories(@ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
- @RequestParam(value = "startIndex", required = false) Integer startIndex,
- @RequestParam(value = "pageSize", required = false) Integer pageSize,
- @RequestParam(value = "sortCol", required= false) String sortColumn,
- @RequestParam(value = "sortDir", required = false) String sortDirection) {
+ public ResponseEntity<List<Category>> getCategories(
+ @ApiParam(value = "catalog id", required = true) @PathVariable String catalogId,
+ @RequestParam(value = "startIndex", required = false) Integer startIndex,
+ @RequestParam(value = "pageSize", required = false) Integer pageSize,
+ @RequestParam(value = "sortCol", required = false) String sortColumn,
+ @RequestParam(value = "sortDir", required = false) String sortDirection) {
Type listType = new TypeToken<List<Category>>() {}.getType();
List<Category> categories;
if (startIndex == null || pageSize == null) {
@@ -400,8 +446,8 @@ public class CatalogController {
if (startIndex > 0) {
startPage = startIndex / pageSize;
}
- categories = categoryModelMapper.map(categoryService.getCategories(startPage, pageSize, sortColumn,
- sortDirection), listType);
+ categories = categoryModelMapper.map(
+ categoryService.getCategories(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (categories == null) {
categories = new ArrayList<>();
@@ -409,10 +455,14 @@ public class CatalogController {
return new ResponseEntity<>(categories, HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Create a catalog Category", notes = "Creates a catalog category", tags = {"Catalog"})
- @PostMapping(value = "/category", consumes=Versions.V1_0, produces=Versions.V1_0)
- public ResponseEntity<Category> createCategory(@ApiParam(value = "category", required = true) @RequestBody Category category) {
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Create a catalog Category",
+ notes = "Creates a catalog category",
+ tags = {"Catalog"})
+ @PostMapping(value = "/category", consumes = Versions.V1_0, produces = Versions.V1_0)
+ public ResponseEntity<Category> createCategory(
+ @ApiParam(value = "category", required = true) @RequestBody Category category) {
if (category.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required to create a category.");
}
@@ -421,18 +471,22 @@ public class CatalogController {
}
Optional<CategoryModel> opt = categoryService.getCategory(category.getCatalogId(), category.getName());
if (opt != null && opt.isPresent()) {
- throw new IllegalStateException("A category named "+ category.getName() + " in catalog " +
- category.getCatalogId() + " already exists");
+ throw new IllegalStateException("A category named " + category.getName() + " in catalog "
+ + category.getCatalogId() + " already exists");
}
CategoryModel model = categoryConverter.convert(category);
model = categoryService.saveCategory(model);
return new ResponseEntity<>(categoryModelConverter.convert(model), HttpStatus.CREATED);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Update a catalog Category", notes = "Updates a catalog category", tags = {"Catalog"})
- @PutMapping(value = "/category", consumes=Versions.V1_0, produces=Versions.V1_0)
- public ResponseEntity<Category> updateCategory(@ApiParam(value = "category", required = true) @RequestBody Category category) {
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Update a catalog Category",
+ notes = "Updates a catalog category",
+ tags = {"Catalog"})
+ @PutMapping(value = "/category", consumes = Versions.V1_0, produces = Versions.V1_0)
+ public ResponseEntity<Category> updateCategory(
+ @ApiParam(value = "category", required = true) @RequestBody Category category) {
if (category.getCatalogId() == null) {
throw new IllegalArgumentException("A catalog id is required to create a category.");
}
@@ -444,8 +498,11 @@ public class CatalogController {
return new ResponseEntity<>(categoryModelConverter.convert(model), HttpStatus.OK);
}
- @ApiImplicitParams( {@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
- @ApiOperation(value = "Deletes a catalog category", notes = "Deletes a catalog category", tags = {"Catalog"})
+ @ApiImplicitParams({@ApiImplicitParam(dataType = "String", name = "Authorization", paramType = "header")})
+ @ApiOperation(
+ value = "Deletes a catalog category",
+ notes = "Deletes a catalog category",
+ tags = {"Catalog"})
@DeleteMapping(value = "/category/{id}")
public ResponseEntity<?> deleteCategory(@RequestParam("id") Long categoryId) {
categoryService.deleteCategory(categoryId);
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 39c2b75..778695c 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
@@ -31,7 +31,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
private static final Logger LOGGER = LogManager.getLogger();
- @ExceptionHandler({ Exception.class })
+ @ExceptionHandler({Exception.class})
@ResponseBody
public ResponseEntity<?> handleAnyException(Exception e) {
if (e instanceof IllegalArgumentException) {
@@ -42,8 +42,7 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH
return errorResponse(e, HttpStatus.INTERNAL_SERVER_ERROR);
}
- protected ResponseEntity<ExceptionMessage> errorResponse(Throwable throwable,
- HttpStatus status) {
+ protected ResponseEntity<ExceptionMessage> errorResponse(Throwable throwable, HttpStatus status) {
if (null != throwable) {
LOGGER.error("error caught: " + throwable.getMessage(), throwable);
return response(new ExceptionMessage(throwable), status);
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/security/LocalAuthorizationInterceptor.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/security/LocalAuthorizationInterceptor.java
index a487715..3e5fce6 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/security/LocalAuthorizationInterceptor.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/security/LocalAuthorizationInterceptor.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.audit.service.security;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.http.HttpStatus;
@@ -52,6 +51,5 @@ public class LocalAuthorizationInterceptor extends HandlerInterceptorAdapter {
} finally {
LOGGER.traceExit();
}
-
}
}
diff --git a/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java b/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
index 2279b0a..413916b 100644
--- a/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
+++ b/log4j-audit/log4j-audit-war/src/test/java/org/apache/logging/log4j/audit/service/CatalogTest.java
@@ -16,13 +16,17 @@
*/
package org.apache.logging.log4j.audit.service;
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.Assert.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import com.fasterxml.jackson.databind.type.CollectionType;
import com.fasterxml.jackson.databind.type.TypeFactory;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.logging.log4j.audit.service.config.WebMvcAppContext;
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Event;
@@ -43,13 +47,10 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
-import static org.junit.Assert.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {WebMvcAppContext.class}, loader=AnnotationConfigWebContextLoader.class)
+@ContextConfiguration(
+ classes = {WebMvcAppContext.class},
+ loader = AnnotationConfigWebContextLoader.class)
@WebAppConfiguration
public class CatalogTest {
@@ -71,11 +72,11 @@ public class CatalogTest {
@Test
public void testCatalogAPI() throws Exception {
- String result = mockMvc.perform(
- get("/catalog/TEST/attributes")
- .accept(Versions.V1_0))
+ String result = mockMvc.perform(get("/catalog/TEST/attributes").accept(Versions.V1_0))
.andExpect(status().is(HttpStatus.OK.value()))
- .andReturn().getResponse().getContentAsString();
+ .andReturn()
+ .getResponse()
+ .getContentAsString();
assertNotNull("No result returned for TEST catalog", result);
ObjectMapper objectMapper = new ObjectMapper();
CollectionType typeReference =
@@ -83,19 +84,21 @@ public class CatalogTest {
List<Attribute> attributes = objectMapper.readValue(result, typeReference);
assertNotNull("Result is not a list", attributes);
assertEquals("Incorrect number of attributes in list", 0, attributes.size());
- result = mockMvc.perform(
- get("/catalog/DEFAULT/attributes")
- .accept(Versions.V1_0))
+ result = mockMvc.perform(get("/catalog/DEFAULT/attributes").accept(Versions.V1_0))
.andExpect(status().is(HttpStatus.OK.value()))
- .andReturn().getResponse().getContentAsString();
+ .andReturn()
+ .getResponse()
+ .getContentAsString();
assertNotNull("No result returned for DEFAULT catalog", result);
attributes = objectMapper.readValue(result, typeReference);
assertNotNull("Result is not a list", attributes);
assertEquals("Incorrect number of attributes in list", 10, attributes.size());
- result = mockMvc.perform( get("/catalog/DEFAULT/events").accept(Versions.V1_0))
+ result = mockMvc.perform(get("/catalog/DEFAULT/events").accept(Versions.V1_0))
.andExpect(status().is(HttpStatus.OK.value()))
- .andReturn().getResponse().getContentAsString();
+ .andReturn()
+ .getResponse()
+ .getContentAsString();
assertNotNull("No result returned for DEFAULT catalog", result);
typeReference = TypeFactory.defaultInstance().constructCollectionType(List.class, Event.class);
List<Event> events = objectMapper.readValue(result, typeReference);
@@ -121,9 +124,14 @@ public class CatalogTest {
filterProvider.addFilter("catalogEvent", new CatalogEventFilter());
mapper.setFilterProvider(filterProvider);
String json = mapper.writeValueAsString(event);
- result = mockMvc.perform(post("/catalog/event").content(json).accept(Versions.V1_0).contentType(Versions.V1_0))
+ result = mockMvc.perform(post("/catalog/event")
+ .content(json)
+ .accept(Versions.V1_0)
+ .contentType(Versions.V1_0))
.andExpect(status().is(HttpStatus.CREATED.value()))
- .andReturn().getResponse().getContentAsString();
+ .andReturn()
+ .getResponse()
+ .getContentAsString();
assertNotNull("No content returned from create user", result);
assertTrue("Missing catalog id", result.contains("\"catalogId\":\"TEST\""));
}
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 8f1842d..c134c27 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
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.catalog.api;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+
import java.io.Serializable;
import java.util.Set;
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
/**
* A Catalog AttributeDto.
*/
@@ -305,7 +305,9 @@ public class Attribute implements Serializable {
} else {
first = false;
}
- sb.append("name=\"").append(constraint.getConstraintType().getName()).append("\"");
+ sb.append("name=\"")
+ .append(constraint.getConstraintType().getName())
+ .append("\"");
sb.append("value=\"").append(constraint.getValue()).append("\"");
}
sb.append("]");
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Category.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Category.java
index ff1acef..eb5bee8 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Category.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Category.java
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.catalog.api;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+
import java.io.Serializable;
import java.util.List;
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
/**
* A Catalog Category.
*/
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 9cf54cd..0dca0ca 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,9 +16,8 @@
*/
package org.apache.logging.log4j.catalog.api;
-import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
/**
*
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 526b935..003dfce 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
@@ -35,12 +35,12 @@ public interface ConstraintType {
default String getName() {
Plugin annotation = this.getClass().getAnnotation(Plugin.class);
if (annotation == null || annotation.name().length() == 0) {
- throw new NameNotFoundException("No name could be found for plugin class " + this.getClass().getName());
+ throw new NameNotFoundException(
+ "No name could be found for plugin class " + this.getClass().getName());
}
return annotation.name();
}
void validate(boolean isRequestContext, String name, String value, String constraintValue, StringBuilder error);
-
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/DataType.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/DataType.java
index 4ec75a7..88e68e6 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/DataType.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/DataType.java
@@ -20,7 +20,6 @@ package org.apache.logging.log4j.catalog.api;
* Mapping of attribute data types.
*/
public enum DataType {
-
STRING("String", null),
BIG_DECIMAL("BigDecimal", "java.math.BigDecimal"),
DOUBLE("double", null),
@@ -49,12 +48,11 @@ public enum DataType {
}
public static DataType fromName(String typeName) {
- for (DataType dataType: DataType.values()) {
+ for (DataType dataType : DataType.values()) {
if (dataType.typeName.equalsIgnoreCase(typeName)) {
return dataType;
}
}
throw new IllegalArgumentException("Unknown data type: " + typeName);
}
-
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
index ee83975..85fdbb8 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Event.java
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.catalog.api;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
-import com.fasterxml.jackson.annotation.JsonFilter;
-
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
/**
* Basic attributes common to all events.
*/
@@ -173,7 +172,11 @@ public class Event implements Serializable {
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("{\"name\" : \"").append(name).append("\", \"displayName\" : \"").append(displayName).append("\"");
+ sb.append("{\"name\" : \"")
+ .append(name)
+ .append("\", \"displayName\" : \"")
+ .append(displayName)
+ .append("\"");
sb.append(", \"description\" : \"").append(description).append("\", \"attributes\" : [");
if (attributes != null) {
boolean first = true;
@@ -183,7 +186,11 @@ public class Event implements Serializable {
} else {
first = false;
}
- sb.append("{\"name\" : \"").append(attribute.getName()).append("\", \"required\" : ").append(attribute.isRequired()).append("}");
+ sb.append("{\"name\" : \"")
+ .append(attribute.getName())
+ .append("\", \"required\" : ")
+ .append(attribute.isRequired())
+ .append("}");
}
}
sb.append("]}");
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/EventAttribute.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/EventAttribute.java
index 7823145..e0e937f 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/EventAttribute.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/EventAttribute.java
@@ -28,8 +28,7 @@ public class EventAttribute implements Serializable {
private Boolean isRequired;
- public EventAttribute() {
- }
+ public EventAttribute() {}
public EventAttribute(String name, boolean isRequired) {
this.name = name;
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Product.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Product.java
index b916985..b40a7fd 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Product.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Product.java
@@ -16,11 +16,10 @@
*/
package org.apache.logging.log4j.catalog.api;
-import java.io.Serializable;
-import java.util.List;
-
import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+import java.io.Serializable;
+import java.util.List;
/**
* Definition of a Product.
@@ -145,5 +144,4 @@ public class Product implements Serializable {
this.events = events;
return this;
}
-
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Type.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Type.java
index 2b85882..d373735 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Type.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Type.java
@@ -22,6 +22,4 @@ package org.apache.logging.log4j.catalog.api;
public class Type {
private String typeName;
-
-
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Versions.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Versions.java
index 1ac7417..9680451 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Versions.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/Versions.java
@@ -23,7 +23,7 @@ public final class Versions {
private static final String VERSION_KEY = "version";
private static final String VERSION_1 = "1.0";
- public static final String V1_0 = TYPE + "/" + SUB_TYPE + "; " + VERSION_KEY + "=\"" + VERSION_1 +"\"";
+ public static final String V1_0 = TYPE + "/" + SUB_TYPE + "; " + VERSION_KEY + "=\"" + VERSION_1 + "\"";
- private Versions() { }
+ private Versions() {}
}
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 b3caa71..64ded0c 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
@@ -20,7 +20,6 @@ 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;
/**
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 5e6ad01..648242d 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
@@ -20,7 +20,6 @@ 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;
/**
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 156e07f..519f4bb 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
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.api.annotation;
import java.util.Map;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Condition;
@@ -31,6 +30,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
public class JdbcUrlCondition implements Condition {
private static final Logger LOGGER = LogManager.getLogger(JdbcUrlCondition.class);
+
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
Environment env = context.getEnvironment();
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/PropertyExistsCondition.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/PropertyExistsCondition.java
index d443372..0b7494f 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/PropertyExistsCondition.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/PropertyExistsCondition.java
@@ -29,7 +29,8 @@ public class PropertyExistsCondition implements Condition {
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
Environment env = context.getEnvironment();
- MultiValueMap<String, Object> attrs = metadata.getAllAnnotationAttributes(ConditionOnPropertyExists.class.getName());
+ MultiValueMap<String, Object> attrs =
+ metadata.getAllAnnotationAttributes(ConditionOnPropertyExists.class.getName());
if (attrs != null) {
Object value = attrs.get("value");
return value != null && null != env && env.getProperty(value.toString()) != null;
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/constant/Constants.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/constant/Constants.java
index d544aba..6f5ca6b 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/constant/Constants.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/constant/Constants.java
@@ -21,8 +21,7 @@ package org.apache.logging.log4j.catalog.api.constant;
*/
public final class Constants {
- private Constants() {
- }
+ private Constants() {}
public static final String DEFAULT_CATALOG = "DEFAULT";
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/AbstractCatalogReader.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/AbstractCatalogReader.java
index 91fc0d6..4d80a29 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/AbstractCatalogReader.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/AbstractCatalogReader.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.api.dao;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.CatalogReader;
@@ -44,25 +43,32 @@ public abstract class AbstractCatalogReader implements CatalogReader {
@Override
public Category getCategory(String name) {
if (catalogData.getCategories() != null) {
- return catalogData.getCategories().stream().filter(c -> c.getName().equals(name)).findFirst().orElse(null);
+ return catalogData.getCategories().stream()
+ .filter(c -> c.getName().equals(name))
+ .findFirst()
+ .orElse(null);
}
return null;
}
-
@Override
public Event getEvent(String name) {
if (catalogData.getEvents() != null) {
- return catalogData.getEvents().stream().filter(e -> e.getName().equals(name)).findFirst().orElse(null);
+ return catalogData.getEvents().stream()
+ .filter(e -> e.getName().equals(name))
+ .findFirst()
+ .orElse(null);
}
return null;
}
-
@Override
public Product getProduct(String name) {
if (catalogData.getProducts() != null) {
- return catalogData.getProducts().stream().filter(p -> p.getName().equals(name)).findFirst().orElse(null);
+ return catalogData.getProducts().stream()
+ .filter(p -> p.getName().equals(name))
+ .findFirst()
+ .orElse(null);
}
return null;
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/CatalogDao.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/CatalogDao.java
index 7e31360..6481289 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/CatalogDao.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/CatalogDao.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.api.dao;
import java.util.Map;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.CatalogReader;
import org.apache.logging.log4j.catalog.api.CatalogWriter;
@@ -51,10 +50,7 @@ public interface CatalogDao extends CatalogReader, CatalogWriter {
*/
Category getCategory(String name);
-
Event getEvent(String name);
-
Product getProduct(String name);
-
}
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 e183861..6dfe278 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
@@ -16,6 +16,9 @@
*/
package org.apache.logging.log4j.catalog.api.dao;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -27,10 +30,6 @@ import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Collection;
import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.CatalogData;
@@ -50,8 +49,9 @@ public class ClassPathCatalogReader extends AbstractCatalogReader {
private final LocalDateTime lastUpdated;
public ClassPathCatalogReader(Map<String, String> attributes) throws IOException {
- String catalogFile = attributes != null ?
- attributes.getOrDefault(CATALOG_ATTRIBUTE_NAME, DEFAULT_CATALOG_FILE) : DEFAULT_CATALOG_FILE;
+ String catalogFile = attributes != null
+ ? attributes.getOrDefault(CATALOG_ATTRIBUTE_NAME, DEFAULT_CATALOG_FILE)
+ : DEFAULT_CATALOG_FILE;
Collection<URL> catalogs = LoaderUtil.findResources(catalogFile);
if (catalogs.isEmpty()) {
LOGGER.error("No catalog named {} could be found on the class path", catalogFile);
@@ -67,8 +67,8 @@ public class ClassPathCatalogReader extends AbstractCatalogReader {
LocalDateTime localDateTime = null;
try {
URLConnection connection = catalogURL.openConnection();
- localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(connection.getLastModified()),
- ZoneId.systemDefault());
+ localDateTime =
+ LocalDateTime.ofInstant(Instant.ofEpochMilli(connection.getLastModified()), ZoneId.systemDefault());
} catch (IOException ioe) {
LOGGER.warn("Unable to open connection to {}", catalogURL.toString());
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/FileCatalogReader.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/FileCatalogReader.java
index 4c75af0..a5dc511 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/FileCatalogReader.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/FileCatalogReader.java
@@ -16,6 +16,9 @@
*/
package org.apache.logging.log4j.catalog.api.dao;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -25,10 +28,6 @@ import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.CatalogData;
@@ -66,15 +65,15 @@ public class FileCatalogReader extends AbstractCatalogReader {
catalogPath.append("/").append(catalogFile);
}
}
- } else if (catalogFile != null){
+ } else if (catalogFile != null) {
catalogPath.append(catalogFile);
} else {
LOGGER.warn("No catalogFile attribute was provided. Using {}", DEFAULT_CATALOG_FILE);
catalogPath.append(DEFAULT_CATALOG_FILE);
}
Path path = Paths.get(catalogPath.toString());
- lastUpdated = LocalDateTime.ofInstant(Instant.ofEpochMilli(path.toFile().lastModified()),
- ZoneId.systemDefault());
+ lastUpdated =
+ LocalDateTime.ofInstant(Instant.ofEpochMilli(path.toFile().lastModified()), ZoneId.systemDefault());
byte[] encoded = Files.readAllBytes(path);
catalog = new String(encoded, StandardCharsets.UTF_8);
JsonFactory factory = new JsonFactory();
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/JsonCatalogReader.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/JsonCatalogReader.java
index 9e2a612..de49ea0 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/JsonCatalogReader.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/dao/JsonCatalogReader.java
@@ -16,12 +16,11 @@
*/
package org.apache.logging.log4j.catalog.api.dao;
-import java.time.LocalDateTime;
-
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.LocalDateTime;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Attribute;
@@ -30,12 +29,12 @@ import org.apache.logging.log4j.catalog.api.CatalogReader;
/**
* Provides access to the JSON version of the catalog. This version is not modifiable.
*/
-//@Component
+// @Component
public class JsonCatalogReader extends AbstractCatalogReader {
private static final Logger LOGGER = LogManager.getLogger(JsonCatalogReader.class);
- //@Autowired
+ // @Autowired
CatalogReader catalogReader;
public CatalogReader getCatalogReader() {
@@ -46,7 +45,7 @@ public class JsonCatalogReader extends AbstractCatalogReader {
this.catalogReader = catalogReader;
}
- //@PostConstruct
+ // @PostConstruct
public void init() {
catalogData = catalogReader.read();
for (Attribute attribute : catalogData.getAttributes()) {
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/CaseInsensitiveEnumConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/CaseInsensitiveEnumConstraint.java
index 919c0db..a935032 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/CaseInsensitiveEnumConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/CaseInsensitiveEnumConstraint.java
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
-import java.util.Arrays;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
+import java.util.Arrays;
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.appendNewline;
-import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
-
/**
* Performs a case insensitive comparison to verify the value is in the list of acceptable values.
*/
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 224f569..3f050bc 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
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.ConstraintType;
@@ -33,7 +32,6 @@ import org.apache.logging.log4j.core.util.ReflectionUtil;
/**
*
*/
-
public class ConstraintPlugins {
private static final Logger LOGGER = LogManager.getLogger(ConstraintPlugins.class);
@@ -46,7 +44,7 @@ public class ConstraintPlugins {
public static ConstraintPlugins getInstance() {
if (instance == null) {
- synchronized(LOCK) {
+ synchronized (LOCK) {
if (instance == null) {
instance = new ConstraintPlugins();
}
@@ -59,8 +57,10 @@ public class ConstraintPlugins {
final PluginManager manager = new PluginManager(ConstraintType.CATEGORY);
if (LOGGER instanceof org.apache.logging.log4j.core.Logger) {
- List<String> pluginPackages =
- ((org.apache.logging.log4j.core.Logger) LOGGER).getContext().getConfiguration().getPluginPackages();
+ List<String> pluginPackages = ((org.apache.logging.log4j.core.Logger) LOGGER)
+ .getContext()
+ .getConfiguration()
+ .getPluginPackages();
manager.collectPlugins(pluginPackages);
} else {
manager.collectPlugins();
@@ -68,7 +68,8 @@ public class ConstraintPlugins {
final Map<String, PluginType<?>> plugins = manager.getPlugins();
for (Map.Entry<String, PluginType<?>> entry : plugins.entrySet()) {
try {
- final Class<? extends ConstraintType> clazz = entry.getValue().getPluginClass().asSubclass(ConstraintType.class);
+ final Class<? extends ConstraintType> clazz =
+ entry.getValue().getPluginClass().asSubclass(ConstraintType.class);
ConstraintType constraintType = ReflectionUtil.instantiate(clazz);
constraintMap.put(entry.getKey(), constraintType);
} catch (final Throwable t) {
@@ -77,8 +78,13 @@ public class ConstraintPlugins {
}
}
- public void validateConstraint(boolean isRequestContext, String constraint, String name,
- String value, String constraintValue, StringBuilder errors) {
+ public void validateConstraint(
+ boolean isRequestContext,
+ String constraint,
+ String name,
+ String value,
+ String constraintValue,
+ StringBuilder errors) {
ConstraintType constraintType = constraintMap.get(constraint.toLowerCase(Locale.US));
if (constraintType == null) {
if (errors.length() > 0) {
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 39b7921..704f8b6 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
@@ -16,13 +16,12 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
-import java.io.IOException;
-
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.deser.std.StdDeserializer;
+import java.io.IOException;
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/ConstraintTypeSerializer.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/ConstraintTypeSerializer.java
index 9c5ba9f..8bb05be 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
@@ -16,11 +16,10 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
-import java.io.IOException;
-
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
import org.apache.logging.log4j.catalog.api.ConstraintType;
/**
@@ -37,8 +36,9 @@ public class ConstraintTypeSerializer extends StdSerializer<ConstraintType> {
}
@Override
- public void serialize(ConstraintType constraintType, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException {
+ public void serialize(
+ ConstraintType constraintType, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException {
jsonGenerator.writeStartObject();
jsonGenerator.writeStringField("name", constraintType.getName());
jsonGenerator.writeEndObject();
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 026c32d..361e302 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
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
-import java.util.Arrays;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
+import java.util.Arrays;
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.appendNewline;
-import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
-
/**
* Performs a comparison to verify the value is in the list of acceptable values.
*/
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxLengthConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxLengthConstraint.java
index c379356..3afe3b0 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxLengthConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxLengthConstraint.java
@@ -16,12 +16,12 @@
*/
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.appendNewline;
import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
+import org.apache.logging.log4j.catalog.api.ConstraintType;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+
/**
*
*/
@@ -53,7 +53,9 @@ public class MaxLengthConstraint implements ConstraintType {
if (isRequestContext) {
error.append("ThreadContext key ");
}
- error.append(name).append(" encountered an error trying to determine the maximum length value: ").append(ex.getMessage());
+ error.append(name)
+ .append(" encountered an error trying to determine the maximum length value: ")
+ .append(ex.getMessage());
}
}
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxValueConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxValueConstraint.java
index 7b05df9..6c81d1e 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxValueConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MaxValueConstraint.java
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
-import java.math.BigDecimal;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
+import java.math.BigDecimal;
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.appendNewline;
-import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
-
/**
*
*/
@@ -56,7 +55,9 @@ public class MaxValueConstraint implements ConstraintType {
if (isRequestContext) {
error.append("ThreadContext key ");
}
- error.append(name).append(" encountered an error trying to determine the minimum value: ").append(ex.getMessage());
+ error.append(name)
+ .append(" encountered an error trying to determine the minimum value: ")
+ .append(ex.getMessage());
}
}
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinLengthConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinLengthConstraint.java
index e754201..bd1210d 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinLengthConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinLengthConstraint.java
@@ -16,12 +16,12 @@
*/
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.appendNewline;
import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
+import org.apache.logging.log4j.catalog.api.ConstraintType;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+
/**
*
*/
@@ -46,14 +46,19 @@ public class MinLengthConstraint implements ConstraintType {
if (isRequestContext) {
error.append("ThreadContext key ");
}
- error.append(name).append(" does not contain ").append(minLength).append(" characters.");
+ error.append(name)
+ .append(" does not contain ")
+ .append(minLength)
+ .append(" characters.");
}
} catch (Exception ex) {
appendNewline(error);
if (isRequestContext) {
error.append("ThreadContext key ");
}
- error.append(name).append(" encountered an error trying to determine the minimum length value: ").append(ex.getMessage());
+ error.append(name)
+ .append(" encountered an error trying to determine the minimum length value: ")
+ .append(ex.getMessage());
}
}
}
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinValueConstraint.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinValueConstraint.java
index 811ab27..c2b3cd0 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinValueConstraint.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/plugins/MinValueConstraint.java
@@ -16,14 +16,13 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
-import java.math.BigDecimal;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.appendNewline;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
+import java.math.BigDecimal;
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.appendNewline;
-import static org.apache.logging.log4j.catalog.api.util.StringUtils.isBlank;
-
/**
*
*/
@@ -56,7 +55,9 @@ public class MinValueConstraint implements ConstraintType {
if (isRequestContext) {
error.append("ThreadContext key ");
}
- error.append(name).append(" encountered an error trying to determine the minimum value: ").append(ex.getMessage());
+ error.append(name)
+ .append(" encountered an error trying to determine the minimum value: ")
+ .append(ex.getMessage());
}
}
}
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 8f663dc..db7b4a8 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
@@ -16,11 +16,11 @@
*/
package org.apache.logging.log4j.catalog.api.plugins;
+import static org.apache.logging.log4j.catalog.api.util.StringUtils.*;
+
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.*;
-
/**
*
*/
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
index c342a34..bcdb22c 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/CatalogEventFilter.java
@@ -16,19 +16,20 @@
*/
package org.apache.logging.log4j.catalog.api.util;
+import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
+
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.PropertyWriter;
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import org.apache.logging.log4j.catalog.api.Event;
-import static org.apache.logging.log4j.catalog.api.constant.Constants.DEFAULT_CATALOG;
-
public class CatalogEventFilter extends SimpleBeanPropertyFilter {
@Override
- public void serializeAsField(Object pojo, JsonGenerator jgen, SerializerProvider provider, PropertyWriter writer) throws Exception {
- if (writer.getName().equals("catalogId") && DEFAULT_CATALOG.equals(((Event)pojo).getCatalogId())) {
+ public void serializeAsField(Object pojo, JsonGenerator jgen, SerializerProvider provider, PropertyWriter writer)
+ throws Exception {
+ if (writer.getName().equals("catalogId") && DEFAULT_CATALOG.equals(((Event) pojo).getCatalogId())) {
return;
}
super.serializeAsField(pojo, jgen, provider, writer);
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/ProfileUtil.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/ProfileUtil.java
index d1057c3..7d2f90c 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/ProfileUtil.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/ProfileUtil.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.api.util;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-
import javax.servlet.ServletContext;
/**
@@ -29,8 +28,7 @@ public final class ProfileUtil {
private static final String SPRING_PROFILE = "spring.profiles.active";
- private ProfileUtil() {
- }
+ private ProfileUtil() {}
/**
* Set the active profile if none has been specified.
diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/StringUtils.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/StringUtils.java
index c7a3c38..fb7a339 100644
--- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/StringUtils.java
+++ b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/util/StringUtils.java
@@ -21,8 +21,7 @@ package org.apache.logging.log4j.catalog.api.util;
*/
public final class StringUtils {
- private StringUtils() {
- }
+ private StringUtils() {}
public static final boolean isBlank(String value) {
return value == null || value.length() == 0;
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/AuditCatalogEditor.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/AuditCatalogEditor.java
index ff13ffa..7433a63 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/AuditCatalogEditor.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/AuditCatalogEditor.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-
import org.apache.logging.log4j.catalog.api.util.ProfileUtil;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -33,8 +32,8 @@ public class AuditCatalogEditor extends SpringBootServletInitializer {
private static final String SPRING_PROFILE = "spring.profiles.active";
public static void main(String[] args) {
- SpringApplicationBuilder builder = new SpringApplicationBuilder().profiles(getActiveProfile())
- .sources(AuditCatalogEditor.class);
+ SpringApplicationBuilder builder =
+ new SpringApplicationBuilder().profiles(getActiveProfile()).sources(AuditCatalogEditor.class);
System.setProperty("isEmbedded", "true");
builder.run(args);
}
@@ -73,10 +72,9 @@ public class AuditCatalogEditor extends SpringBootServletInitializer {
try {
props.load(is);
} catch (IOException ioe) {
- //Ignore the error.
+ // Ignore the error.
}
}
return props;
}
-
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java
index 5848a81..8b194e3 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/JsonObjectMapperFactory.java
@@ -16,13 +16,6 @@
*/
package org.apache.logging.log4j.catalog.config;
-import java.io.IOException;
-import java.time.DateTimeException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
@@ -35,6 +28,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.io.IOException;
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
/**
@@ -49,7 +48,8 @@ public final class JsonObjectMapperFactory {
/**
* LocalDateTime formatter that converts to and from a format usable in REST requests.
*/
- private static final DateTimeFormatter LOCAL_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern(LOCAL_DATE_TIME_FORMAT);
+ private static final DateTimeFormatter LOCAL_DATE_TIME_FORMATTER =
+ DateTimeFormatter.ofPattern(LOCAL_DATE_TIME_FORMAT);
/**
* Date/Time format.
@@ -69,10 +69,10 @@ public final class JsonObjectMapperFactory {
/**
* LocalDateTime formatter that converts to and from a format usable in REST requests.
*/
- public static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern(ZONED_DATE_TIME_FORMAT);
+ public static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER =
+ DateTimeFormatter.ofPattern(ZONED_DATE_TIME_FORMAT);
- private JsonObjectMapperFactory() {
- }
+ private JsonObjectMapperFactory() {}
/**
* Create an ObjectMapper using the standard LocalDateTime format.
@@ -86,8 +86,9 @@ public final class JsonObjectMapperFactory {
SimpleModule module = new SimpleModule();
module.addSerializer(LocalDateTime.class, new JsonSerializer<LocalDateTime>() {
@Override
- public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+ public void serialize(
+ LocalDateTime localDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException, JsonProcessingException {
jsonGenerator.writeString(dateTimeFormatter.format(localDateTime));
}
});
@@ -101,16 +102,20 @@ public final class JsonObjectMapperFactory {
try {
return LocalDateTime.parse(string, dateTimeFormatter);
} catch (DateTimeException e) {
- throw JsonMappingException.from(parser,
- String.format("Failed to deserialize %s: (%s) %s",
- handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+ throw JsonMappingException.from(
+ parser,
+ String.format(
+ "Failed to deserialize %s: (%s) %s",
+ handledType().getName(), e.getClass().getName(), e.getMessage()),
+ e);
}
}
});
module.addSerializer(ZonedDateTime.class, new JsonSerializer<ZonedDateTime>() {
@Override
- public void serialize(ZonedDateTime zonedDateTime, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+ public void serialize(
+ ZonedDateTime zonedDateTime, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException, JsonProcessingException {
jsonGenerator.writeString(zonedTimeFormatter.format(zonedDateTime));
}
});
@@ -124,16 +129,20 @@ public final class JsonObjectMapperFactory {
try {
return ZonedDateTime.parse(string, zonedTimeFormatter);
} catch (DateTimeException e) {
- throw JsonMappingException.from(parser,
- String.format("Failed to deserialize %s: (%s) %s",
- handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+ throw JsonMappingException.from(
+ parser,
+ String.format(
+ "Failed to deserialize %s: (%s) %s",
+ handledType().getName(), e.getClass().getName(), e.getMessage()),
+ e);
}
}
});
module.addSerializer(LocalDate.class, new JsonSerializer<LocalDate>() {
@Override
- public void serialize(LocalDate localDate, JsonGenerator jsonGenerator,
- SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+ public void serialize(
+ LocalDate localDate, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+ throws IOException, JsonProcessingException {
jsonGenerator.writeString(dateFormatter.format(localDate));
}
});
@@ -147,9 +156,12 @@ public final class JsonObjectMapperFactory {
try {
return LocalDate.parse(string, dateFormatter);
} catch (DateTimeException e) {
- throw JsonMappingException.from(parser,
- String.format("Failed to deserialize %s: (%s) %s",
- handledType().getName(), e.getClass().getName(), e.getMessage()), e);
+ throw JsonMappingException.from(
+ parser,
+ String.format(
+ "Failed to deserialize %s: (%s) %s",
+ handledType().getName(), e.getClass().getName(), e.getMessage()),
+ e);
}
}
});
@@ -158,5 +170,4 @@ public final class JsonObjectMapperFactory {
mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
return mapper;
}
-
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java
index 012fc42..97a0bd3 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.config;
import java.time.LocalDate;
import java.time.LocalDateTime;
-
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -40,13 +39,13 @@ public class SwaggerConfig {
@Bean
public Docket api() {
return new Docket(DocumentationType.SWAGGER_2)
- .apiInfo(apiInfo())
- .select()
- .apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any())
- .build()
- .directModelSubstitute(LocalDate.class, java.sql.Date.class)
- .directModelSubstitute(LocalDateTime.class, java.util.Date.class);
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.any())
+ .paths(PathSelectors.any())
+ .build()
+ .directModelSubstitute(LocalDate.class, java.sql.Date.class)
+ .directModelSubstitute(LocalDateTime.class, java.util.Date.class);
}
private ApiInfo apiInfo() {
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 39f3f45..7502ba8 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
@@ -34,14 +34,15 @@ public class WebAppInitializer {
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));
+ // 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/config/WebMvcAppContext.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/WebMvcAppContext.java
index 828c14c..9cec4d5 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
@@ -16,10 +16,7 @@
*/
package org.apache.logging.log4j.catalog.config;
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
@@ -27,6 +24,10 @@ import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.UserInfo;
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+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;
@@ -59,11 +60,9 @@ 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 static org.apache.commons.lang3.StringUtils.isNotBlank;
-
@Configuration
@ComponentScan(basePackages = {"org.apache.logging.log4j.catalog"})
-//@PropertySource(value = "classpath:catalog-${env:}config.properties", ignoreResourceNotFound = true)
+// @PropertySource(value = "classpath:catalog-${env:}config.properties", ignoreResourceNotFound = true)
public class WebMvcAppContext extends WebMvcConfigurerAdapter implements ApplicationContextAware {
private static final Logger LOGGER = LogManager.getLogger(WebMvcAppContext.class);
@@ -176,8 +175,8 @@ public class WebMvcAppContext extends WebMvcConfigurerAdapter implements Applica
TransportConfigCallback transportConfigCallback = new TransportConfigCallback() {
final SshSessionFactory sshSessionFactory = new JschConfigSessionFactory() {
@Override
- protected JSch createDefaultJSch( FS fs ) throws JSchException {
- JSch defaultJSch = super.createDefaultJSch( fs );
+ protected JSch createDefaultJSch(FS fs) throws JSchException {
+ JSch defaultJSch = super.createDefaultJSch(fs);
if (isNotBlank(privateKeyPath)) {
defaultJSch.addIdentity(privateKeyPath);
}
@@ -195,29 +194,36 @@ public class WebMvcAppContext extends WebMvcConfigurerAdapter implements Applica
}
@Override
- public String getPassword() {return null;}
+ public String getPassword() {
+ return null;
+ }
@Override
- public boolean promptPassword(String message) {return false;}
+ public boolean promptPassword(String message) {
+ return false;
+ }
@Override
- public boolean promptPassphrase(String message) {return true;}
+ public boolean promptPassphrase(String message) {
+ return true;
+ }
@Override
- public boolean promptYesNo(String message) {return false;}
+ public boolean promptYesNo(String message) {
+ return false;
+ }
@Override
public void showMessage(String message) {}
});
-
}
}
};
+
@Override
public void configure(Transport transport) {
- SshTransport sshTransport = ( SshTransport )transport;
- sshTransport.setSshSessionFactory( sshSessionFactory );
-
+ SshTransport sshTransport = (SshTransport) transport;
+ sshTransport.setSshSessionFactory(sshSessionFactory);
}
};
dataSource.setTransportConfigCallback(transportConfigCallback);
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 3bdbda7..a436b22 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
@@ -23,9 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-
import javax.annotation.PostConstruct;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.api.ListResponse;
@@ -50,7 +48,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Catalog Product controller
*/
-
@RequestMapping(value = "/api/attributes")
@RestController
public class AttributeController {
@@ -73,9 +70,10 @@ public class AttributeController {
}
@PostMapping(value = "/list")
- public ResponseEntity<Map<String, Object>> attributeList(@RequestParam(value="jtStartIndex", required=false) Integer startIndex,
- @RequestParam(value="jtPageSize", required=false) Integer pageSize,
- @RequestParam(value="jtSorting", required=false) String sorting) {
+ public ResponseEntity<Map<String, Object>> attributeList(
+ @RequestParam(value = "jtStartIndex", required = false) Integer startIndex,
+ @RequestParam(value = "jtPageSize", required = false) Integer pageSize,
+ @RequestParam(value = "jtSorting", required = false) String sorting) {
Type listType = new TypeToken<List<Attribute>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
@@ -96,7 +94,8 @@ public class AttributeController {
sortDirection = sortInfo[1];
}
}
- attributes = modelMapper.map(attributeService.getAttributes(startPage, pageSize, sortColumn, sortDirection), listType);
+ attributes = modelMapper.map(
+ attributeService.getAttributes(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (attributes == null) {
attributes = new ArrayList<>();
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 660b354..0156b3d 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.controller;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.Category;
@@ -76,7 +75,6 @@ public class CatalogController {
@Autowired
private CatalogDao catalogDao;
-
@PostMapping(value = "catalog")
public ResponseEntity<?> saveCatalog() {
CatalogData catalogData = new CatalogData();
@@ -103,7 +101,7 @@ public class CatalogController {
catalogDao.write(catalogData);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
-/*
+ /*
@RequestMapping(value = "/catalog", method = RequestMethod.GET)
public ResponseEntity<Object> handleGetCatalog(
@RequestParam(required = false) boolean attributeDetails,
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 c7b6bc8..aabef6f 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
@@ -21,9 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.annotation.PostConstruct;
-
import org.apache.logging.log4j.catalog.api.Category;
import org.apache.logging.log4j.catalog.jpa.converter.CategoryConverter;
import org.apache.logging.log4j.catalog.jpa.converter.CategoryModelConverter;
@@ -43,7 +41,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Catalog Category controller
*/
-
@RequestMapping(value = "/api/categories")
@RestController
public class CategoryController {
@@ -53,7 +50,6 @@ public class CategoryController {
@Autowired
private CategoryService categoryService;
-
@Autowired
private CategoryModelConverter categoryModelConverter;
@@ -66,9 +62,10 @@ public class CategoryController {
}
@PostMapping(value = "/list")
- public ResponseEntity<Map<String, Object>> categoryList(@RequestParam(value="jtStartIndex", required=false) Integer startIndex,
- @RequestParam(value="jtPageSize", required=false) Integer pageSize,
- @RequestParam(value="jtSorting", required=false) String sorting) {
+ public ResponseEntity<Map<String, Object>> categoryList(
+ @RequestParam(value = "jtStartIndex", required = false) Integer startIndex,
+ @RequestParam(value = "jtPageSize", required = false) Integer pageSize,
+ @RequestParam(value = "jtSorting", required = false) String sorting) {
Type listType = new TypeToken<List<Category>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
@@ -89,7 +86,8 @@ public class CategoryController {
sortDirection = sortInfo[1];
}
}
- categories = modelMapper.map(categoryService.getCategories(startPage, pageSize, sortColumn, sortDirection), listType);
+ categories = modelMapper.map(
+ categoryService.getCategories(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (categories == null) {
categories = new ArrayList<>();
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 220001a..e190246 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
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
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;
@@ -44,7 +43,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Constraint controller
*/
-
@RequestMapping(value = "/api/constraints")
@RestController
public class ConstraintController {
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 bd3452e..be1c2d7 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
@@ -22,9 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-
import javax.annotation.PostConstruct;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Event;
@@ -46,7 +44,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Catalog Product controller
*/
-
@RequestMapping(value = "/api/events")
@RestController
public class EventController {
@@ -69,9 +66,10 @@ public class EventController {
}
@PostMapping(value = "/list")
- public ResponseEntity<Map<String, Object>> eventList(@RequestParam(value="jtStartIndex", required=false) Integer startIndex,
- @RequestParam(value="jtPageSize", required=false) Integer pageSize,
- @RequestParam(value="jtSorting", required=false) String sorting) {
+ public ResponseEntity<Map<String, Object>> eventList(
+ @RequestParam(value = "jtStartIndex", required = false) Integer startIndex,
+ @RequestParam(value = "jtPageSize", required = false) Integer pageSize,
+ @RequestParam(value = "jtSorting", required = false) String sorting) {
Type listType = new TypeToken<List<Event>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
@@ -92,7 +90,8 @@ public class EventController {
sortDirection = sortInfo[1];
}
}
- events = modelMapper.map(eventService.getEvents(startPage, pageSize, sortColumn, sortDirection), listType);
+ events = modelMapper.map(
+ eventService.getEvents(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (events == null) {
events = new ArrayList<>();
@@ -167,7 +166,6 @@ public class EventController {
} else {
response.put("Result", "OK");
response.put("Records", new ArrayList<>());
-
}
} catch (Exception ex) {
response.put("Result", "FAILURE");
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 93b49c2..d342a6c 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
@@ -21,9 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.annotation.PostConstruct;
-
import org.apache.logging.log4j.catalog.api.Product;
import org.apache.logging.log4j.catalog.jpa.converter.ProductConverter;
import org.apache.logging.log4j.catalog.jpa.converter.ProductModelConverter;
@@ -43,7 +41,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Catalog Product controller
*/
-
@RequestMapping(value = "/api/products")
@RestController
public class ProductController {
@@ -65,9 +62,10 @@ public class ProductController {
}
@PostMapping(value = "/list")
- public ResponseEntity<Map<String, Object>> productList(@RequestParam(value="jtStartIndex", required=false) Integer startIndex,
- @RequestParam(value="jtPageSize", required=false) Integer pageSize,
- @RequestParam(value="jtSorting", required=false) String sorting) {
+ public ResponseEntity<Map<String, Object>> productList(
+ @RequestParam(value = "jtStartIndex", required = false) Integer startIndex,
+ @RequestParam(value = "jtPageSize", required = false) Integer pageSize,
+ @RequestParam(value = "jtSorting", required = false) String sorting) {
Type listType = new TypeToken<List<Product>>() {}.getType();
Map<String, Object> response = new HashMap<>();
try {
@@ -88,7 +86,8 @@ public class ProductController {
sortDirection = sortInfo[1];
}
}
- products = modelMapper.map(productService.getProducts(startPage, pageSize, sortColumn, sortDirection), listType);
+ products = modelMapper.map(
+ productService.getProducts(startPage, pageSize, sortColumn, sortDirection), listType);
}
if (products == null) {
products = new ArrayList<>();
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/RestResponseEntityExceptionHandler.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/RestResponseEntityExceptionHandler.java
index e4c12d4..55f654d 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/RestResponseEntityExceptionHandler.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/controller/RestResponseEntityExceptionHandler.java
@@ -31,14 +31,13 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
private static final Logger LOGGER = LogManager.getLogger();
- @ExceptionHandler({ Exception.class })
+ @ExceptionHandler({Exception.class})
@ResponseBody
public ResponseEntity<?> handleAnyException(Exception e) {
return errorResponse(e, HttpStatus.INTERNAL_SERVER_ERROR);
}
- protected ResponseEntity<ExceptionMessage> errorResponse(Throwable throwable,
- HttpStatus status) {
+ protected ResponseEntity<ExceptionMessage> errorResponse(Throwable throwable, HttpStatus status) {
if (null != throwable) {
LOGGER.error("error caught: " + throwable.getMessage(), throwable);
return response(new ExceptionMessage(throwable), status);
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 018e343..2d57b74 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
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.interceptor;
import java.io.IOException;
-
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -33,8 +32,9 @@ import org.springframework.http.client.ClientHttpResponse;
public class RequestContextHeaderInterceptor implements ClientHttpRequestInterceptor {
@Override
- public ClientHttpResponse intercept(HttpRequest httpRequest, byte[] body,
- ClientHttpRequestExecution clientHttpRequestExecution) throws IOException {
+ public ClientHttpResponse intercept(
+ HttpRequest httpRequest, byte[] body, ClientHttpRequestExecution clientHttpRequestExecution)
+ throws IOException {
return clientHttpRequestExecution.execute(httpRequest, body);
}
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/security/LocalAuthorizationInterceptor.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/security/LocalAuthorizationInterceptor.java
index aad8867..6709430 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/security/LocalAuthorizationInterceptor.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/security/LocalAuthorizationInterceptor.java
@@ -16,9 +16,7 @@
*/
package org.apache.logging.log4j.catalog.security;
-
import javax.servlet.http.HttpServletResponse;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -32,7 +30,11 @@ public class LocalAuthorizationInterceptor extends HandlerInterceptorAdapter {
}
@Override
- public boolean preHandle(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, Object handler) throws Exception {
+ public boolean preHandle(
+ javax.servlet.http.HttpServletRequest request,
+ javax.servlet.http.HttpServletResponse response,
+ Object handler)
+ throws Exception {
LOGGER.traceEntry();
try {
if (request.getServletPath().startsWith("/swagger")) {
@@ -50,6 +52,5 @@ public class LocalAuthorizationInterceptor extends HandlerInterceptorAdapter {
} finally {
LOGGER.traceExit();
}
-
}
}
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
index 07ad112..4a4262d 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/service/CatalogInitializer.java
@@ -20,9 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.annotation.PostConstruct;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Attribute;
diff --git a/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/config/ServiceConfig.java b/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/config/ServiceConfig.java
index aa75f14..f691869 100644
--- a/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/config/ServiceConfig.java
+++ b/log4j-catalog/log4j-catalog-git/src/main/java/org/apache/logging/log4j/catalog/git/config/ServiceConfig.java
@@ -19,5 +19,4 @@ package org.apache.logging.log4j.catalog.git.config;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class ServiceConfig {
-}
+public class ServiceConfig {}
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 347d4b0..ab88fcd 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,18 +16,17 @@
*/
package org.apache.logging.log4j.catalog.git.dao;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
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;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.CatalogData;
@@ -126,8 +125,7 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
if (localRepo == null) {
updateRepo();
}
- return LocalDateTime.ofInstant(Instant.ofEpochMilli(catalogFile.lastModified()),
- ZoneId.systemDefault());
+ return LocalDateTime.ofInstant(Instant.ofEpochMilli(catalogFile.lastModified()), ZoneId.systemDefault());
}
@Override
@@ -156,7 +154,7 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
throw new CatalogModificationException("Catalog is not writable: " + localRepoFile.getAbsolutePath());
}
- try (FileWriter writer = new FileWriter(catalogFile)){
+ try (FileWriter writer = new FileWriter(catalogFile)) {
String text = mapper.writeValueAsString(data);
writer.write(text);
} catch (IOException ioException) {
@@ -191,7 +189,8 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
if (!localRepoFile.exists()) {
LOGGER.debug("local git repo {} does not exist - creating it", localRepoPath);
localRepoFile.getParentFile().mkdirs();
- CloneCommand cloneCommand = Git.cloneRepository().setURI(remoteRepoUri).setDirectory(localRepoFile);
+ CloneCommand cloneCommand =
+ Git.cloneRepository().setURI(remoteRepoUri).setDirectory(localRepoFile);
if (branch != null) {
cloneCommand.setBranch(branch);
}
@@ -204,12 +203,13 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
try (Git git = cloneCommand.call()) {
catalogFile = new File(localRepoFile, catalogPath);
} catch (Exception ex) {
- throw new CatalogNotFoundException("Unable to clone remote catalog at " + remoteRepoUri + " to " + localRepoPath, ex);
+ throw new CatalogNotFoundException(
+ "Unable to clone remote catalog at " + remoteRepoUri + " to " + localRepoPath, ex);
}
} else {
try {
LOGGER.debug("local git repo {} exists - updating", localRepoPath);
- localRepo = new FileRepository(localRepoPath + "/.git");
+ localRepo = new FileRepository(localRepoPath + "/.git");
catalogFile = new File(localRepoFile, catalogPath);
git = new Git(localRepo);
PullCommand pullCommand = git.pull();
@@ -225,7 +225,8 @@ public class GitCatalogDao extends AbstractCatalogReader implements CatalogDao {
LOGGER.error("Exception", gitApiException);
}
} catch (Exception exception) {
- throw new CatalogReadException("Unable to pull remote catalog at " + remoteRepoUri + " to " + localRepoPath, exception);
+ throw new CatalogReadException(
+ "Unable to pull remote catalog at " + remoteRepoUri + " to " + localRepoPath, exception);
}
}
}
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 1f1e53e..ff8c126 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
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.catalog.git;
+import static org.junit.Assert.*;
+
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.dao.CatalogDao;
import org.apache.logging.log4j.catalog.git.config.ApplicationConfiguration;
@@ -28,10 +30,10 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import static org.junit.Assert.*;
-
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = {ApplicationConfiguration.class})
+@ContextConfiguration(
+ loader = AnnotationConfigContextLoader.class,
+ classes = {ApplicationConfiguration.class})
@ActiveProfiles("lab")
public class CatalogTest {
@@ -55,50 +57,33 @@ public class CatalogTest {
assertEquals("Incorrect number of categories", 2, data.getCategories().size());
}
-
@Test
- public void testRetrieveEvents() {
-
- }
+ public void testRetrieveEvents() {}
@Test
- public void testRetrieveEvent() {
-
- }
+ public void testRetrieveEvent() {}
@Test
- public void testAddEvent() {
-
- }
+ public void testAddEvent() {}
@Test
- public void testModifyEvent() {
-
- }
+ public void testModifyEvent() {}
@Test
- public void testDeleteEvent() {
-
- }
+ public void testDeleteEvent() {}
@Test
- public void testRetrieveAttributes() {
- }
+ public void testRetrieveAttributes() {}
@Test
- public void testRetrieveAttribute() {
- }
+ public void testRetrieveAttribute() {}
@Test
- public void testAddAttribute() {
-
- }
+ public void testAddAttribute() {}
@Test
- public void testModifyAttribute() {
- }
+ public void testModifyAttribute() {}
@Test
- public void testDeleteAttribute() {
- }
+ public void testDeleteAttribute() {}
}
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 3b9615c..8e190e9 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
@@ -17,9 +17,7 @@
package org.apache.logging.log4j.catalog.git.config;
import java.io.File;
-
import javax.annotation.PreDestroy;
-
import org.apache.logging.log4j.catalog.git.dao.GitCatalogDao;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -27,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.util.FileSystemUtils;
@Configuration
-@ComponentScan(basePackages = { "org.apache.logging.log4j.catalog" })
+@ComponentScan(basePackages = {"org.apache.logging.log4j.catalog"})
public class ApplicationConfiguration {
private String gitLocalRepoPath;
@@ -47,8 +45,8 @@ public class ApplicationConfiguration {
catalogDao.setLocalRepoPath(gitLocalRepoPath);
catalogDao.setRemoteRepoUri(gitRemoteRepoUri);
catalogDao.setCatalogPath("audit-test/catalog.json");
- //CredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider("waymirec", "w4ym1r3c");
- //catalogDao.setCredentialsProvider(credentialsProvider);
+ // CredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider("waymirec", "w4ym1r3c");
+ // catalogDao.setCredentialsProvider(credentialsProvider);
return catalogDao;
}
@@ -59,6 +57,4 @@ public class ApplicationConfiguration {
File file = new File(gitLocalRepoPath);
FileSystemUtils.deleteRecursively(file);
}
-
-
}
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 e8957c1..816d197 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
@@ -17,9 +17,7 @@
package org.apache.logging.log4j.catalog.jpa.config;
import java.util.Properties;
-
import javax.persistence.EntityManagerFactory;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
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 62a6e6f..db4ab6c 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
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.jpa.config;
import javax.persistence.EntityManagerFactory;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HsqldbDataSourceConfig.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HsqldbDataSourceConfig.java
index 1f1ae5f..26b4cc0 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HsqldbDataSourceConfig.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/HsqldbDataSourceConfig.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.jpa.config;
import javax.sql.DataSource;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.annotation.JdbcUrl;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
index 61120cc..0dc9d85 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/PostgresqlDataSourceConfig.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.jpa.config;
import javax.sql.DataSource;
-
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
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 f5e204d..11c316c 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
@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.catalog.api.Attribute;
@@ -43,7 +42,7 @@ public class AttributeConverter extends AbstractConverter<Attribute, AttributeMo
@Autowired
private AttributeService attributeService;
- public AttributeModel convert(Attribute attribute) {
+ public AttributeModel convert(Attribute attribute) {
LOGGER.traceEntry(attribute.getName());
AttributeModel model;
if (attribute.getId() != null) {
@@ -63,21 +62,24 @@ public class AttributeConverter extends AbstractConverter<Attribute, AttributeMo
model.setRequired(attribute.isRequired());
model.setSortable(attribute.isSortable());
model.setExamples(attribute.getExamples());
- Set<ConstraintModel> constraintModels = model.getConstraints() != null ? model.getConstraints() :
- new HashSet<>();
+ Set<ConstraintModel> constraintModels =
+ model.getConstraints() != null ? model.getConstraints() : new HashSet<>();
Map<Long, ConstraintModel> constraintMap =
- constraintModels.stream().collect(Collectors.toMap(ConstraintModel::getId, Function.identity()));
+ constraintModels.stream().collect(Collectors.toMap(ConstraintModel::getId, Function.identity()));
if (attribute.getConstraints() != null) {
- constraintModels.removeIf(a -> attribute.getConstraints().stream().noneMatch(b -> b.getId().equals(a.getId())));
+ constraintModels.removeIf(a ->
+ attribute.getConstraints().stream().noneMatch(b -> b.getId().equals(a.getId())));
for (Constraint constraint : attribute.getConstraints()) {
ConstraintModel constraintModel;
if (constraint.getId() != null) {
constraintModel = constraintMap.get(constraint.getId());
- constraintModel.setConstraintType(constraint.getConstraintType().getName());
+ constraintModel.setConstraintType(
+ constraint.getConstraintType().getName());
constraintModel.setValue(constraint.getValue());
} else {
constraintModel = new ConstraintModel();
- constraintModel.setConstraintType(constraint.getConstraintType().getName());
+ constraintModel.setConstraintType(
+ constraint.getConstraintType().getName());
constraintModel.setValue(constraint.getValue());
constraintModels.add(constraintModel);
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeModelConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeModelConverter.java
index b5ac0ed..5856c11 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeModelConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/AttributeModelConverter.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.util.HashSet;
import java.util.Set;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.Constraint;
import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins;
@@ -33,7 +32,7 @@ import org.springframework.stereotype.Component;
@Component
public class AttributeModelConverter extends AbstractConverter<AttributeModel, Attribute> {
- public Attribute convert(AttributeModel model) {
+ public Attribute convert(AttributeModel model) {
Attribute attribute = new Attribute();
attribute.setName(model.getName());
attribute.setDisplayName(model.getDisplayName());
@@ -52,7 +51,8 @@ public class AttributeModelConverter extends AbstractConverter<AttributeModel, A
for (ConstraintModel constraintModel : constraintModels) {
Constraint constraint = new Constraint();
constraint.setId(constraintModel.getId());
- constraint.setConstraintType(ConstraintPlugins.getInstance().findByName(constraintModel.getConstraintType()));
+ constraint.setConstraintType(
+ ConstraintPlugins.getInstance().findByName(constraintModel.getConstraintType()));
constraint.setValue(constraintModel.getValue());
constraints.add(constraint);
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryConverter.java
index 7be9d24..ac5d4b8 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryConverter.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import org.apache.logging.log4j.catalog.api.Category;
import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryModelConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryModelConverter.java
index fc86b3d..36fd177 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryModelConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/CategoryModelConverter.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.logging.log4j.catalog.api.Category;
import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DataTypeConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DataTypeConverter.java
index 30eaeb4..dad5ea4 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DataTypeConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DataTypeConverter.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
-
import org.apache.logging.log4j.catalog.api.DataType;
/**
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DateTimeConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DateTimeConverter.java
index 21785a9..2e8109f 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DateTimeConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/DateTimeConverter.java
@@ -18,18 +18,15 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.sql.Timestamp;
import java.time.LocalDateTime;
-
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
/**
* Utility class to convert LocalDate to DB timestamp and vice versa.
*/
-
@Converter(autoApply = true)
public class DateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
-
@Override
public Timestamp convertToDatabaseColumn(LocalDateTime localDateTime) {
return localDateTime == null ? null : Timestamp.valueOf(localDateTime);
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 37df3b4..95f01fa 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
@@ -21,7 +21,6 @@ import java.util.HashSet;
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.Event;
@@ -50,7 +49,7 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
@Autowired
private AttributeService attributeService;
- public EventModel convert(Event event) {
+ public EventModel convert(Event event) {
LOGGER.traceEntry(event.getName());
EventModel model;
if (event.getId() != null) {
@@ -66,9 +65,10 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
if (model.getAttributes() == null) {
model.setAttributes(new HashSet<>());
}
- Set<EventAttributeModel> eventAttributeModels = model.getAttributes() != null ? model.getAttributes() :
- new HashSet<>();
- List<EventAttribute> eventAttributes = event.getAttributes() != null ? event.getAttributes() : new ArrayList<>();
+ Set<EventAttributeModel> eventAttributeModels =
+ model.getAttributes() != null ? model.getAttributes() : new HashSet<>();
+ List<EventAttribute> eventAttributes =
+ event.getAttributes() != null ? event.getAttributes() : new ArrayList<>();
if (!eventAttributes.isEmpty()) {
for (EventAttribute eventAttribute : eventAttributes) {
EventAttributeModel eventAttributeModel = model.getAttribute(eventAttribute.getName());
@@ -88,7 +88,8 @@ public class EventConverter extends AbstractConverter<Event, EventModel> {
}
}
}
- eventAttributeModels.removeIf(a -> eventAttributes.stream().noneMatch(b -> b.getName().equals(a.getAttribute().getName())));
+ eventAttributeModels.removeIf(a -> eventAttributes.stream()
+ .noneMatch(b -> b.getName().equals(a.getAttribute().getName())));
model.setAttributes(eventAttributeModels);
return LOGGER.traceExit(model);
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventModelConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventModelConverter.java
index 360254c..09937fa 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventModelConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/EventModelConverter.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.logging.log4j.catalog.api.Event;
import org.apache.logging.log4j.catalog.api.EventAttribute;
import org.apache.logging.log4j.catalog.jpa.model.EventAttributeModel;
@@ -32,7 +31,7 @@ import org.springframework.stereotype.Component;
@Component
public class EventModelConverter extends AbstractConverter<EventModel, Event> {
- public Event convert(EventModel model) {
+ public Event convert(EventModel model) {
Event event = new Event();
event.setName(model.getName());
event.setDisplayName(model.getDisplayName());
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductConverter.java
index a4cc0e0..2c9151e 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductConverter.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import org.apache.logging.log4j.catalog.api.Product;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductModelConverter.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductModelConverter.java
index d1c28b5..716ec3a 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductModelConverter.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/converter/ProductModelConverter.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.converter;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.logging.log4j.catalog.api.Product;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/AttributeRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/AttributeRepository.java
index 147bde1..60c9f53 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/AttributeRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/AttributeRepository.java
@@ -18,5 +18,4 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import org.apache.logging.log4j.catalog.jpa.model.AttributeModel;
-public interface AttributeRepository extends PagingAndSortingRepository<AttributeModel, Long> {
-}
+public interface AttributeRepository extends PagingAndSortingRepository<AttributeModel, Long> {}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/BaseRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/BaseRepository.java
index cd8a0b1..bef264b 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/BaseRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/BaseRepository.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import java.io.Serializable;
import java.util.List;
import java.util.Optional;
-
import org.springframework.data.jpa.domain.Specification;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
@@ -27,7 +26,7 @@ import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.Repository;
@NoRepositoryBean
-public interface BaseRepository <T, ID extends Serializable> extends Repository<T, ID>, JpaSpecificationExecutor<T> {
+public interface BaseRepository<T, ID extends Serializable> extends Repository<T, ID>, JpaSpecificationExecutor<T> {
Optional<T> findById(ID id);
@@ -36,11 +35,15 @@ public interface BaseRepository <T, ID extends Serializable> extends Repository<
}
List<T> findAll();
+
List<T> findAll(Specification<T> spec);
+
@Modifying
T save(T persisted);
+
@Modifying
void delete(T deleted);
+
@Modifying
void deleteById(ID id);
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CatalogRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CatalogRepository.java
index a86bcf7..f3b4a68 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CatalogRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CatalogRepository.java
@@ -18,5 +18,4 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import org.apache.logging.log4j.catalog.jpa.model.CatalogModel;
-public interface CatalogRepository extends BaseRepository<CatalogModel, Long> {
-}
+public interface CatalogRepository extends BaseRepository<CatalogModel, Long> {}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CategoryRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CategoryRepository.java
index ccb355d..4a25c70 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CategoryRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/CategoryRepository.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.jpa.dao;
import java.util.Optional;
-
import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
public interface CategoryRepository extends PagingAndSortingRepository<CategoryModel, Long> {
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ConstraintRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ConstraintRepository.java
index 4e90da7..bafabcf 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ConstraintRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ConstraintRepository.java
@@ -18,6 +18,4 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import org.apache.logging.log4j.catalog.jpa.model.ConstraintModel;
-public interface ConstraintRepository extends BaseRepository<ConstraintModel, Long> {
-
-}
+public interface ConstraintRepository extends BaseRepository<ConstraintModel, Long> {}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/EventRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/EventRepository.java
index f90e216..23c34b6 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/EventRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/EventRepository.java
@@ -18,5 +18,4 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
-public interface EventRepository extends PagingAndSortingRepository<EventModel, Long> {
-}
+public interface EventRepository extends PagingAndSortingRepository<EventModel, Long> {}
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 82f6419..342d487 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 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import java.io.Serializable;
import java.util.List;
import java.util.Optional;
-
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/dao/ProductRepository.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ProductRepository.java
index 4f72699..c7b0b6a 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ProductRepository.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/dao/ProductRepository.java
@@ -18,5 +18,4 @@ package org.apache.logging.log4j.catalog.jpa.dao;
import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
-public interface ProductRepository extends PagingAndSortingRepository<ProductModel, Long> {
-}
+public interface ProductRepository extends PagingAndSortingRepository<ProductModel, Long> {}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
index c07bcf2..def5654 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/AttributeModel.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.jpa.model;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-
import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
@@ -34,7 +33,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.logging.log4j.catalog.api.DataType;
@@ -42,46 +40,59 @@ import org.apache.logging.log4j.catalog.jpa.converter.BooleanToStringConverter;
import org.apache.logging.log4j.catalog.jpa.converter.DataTypeConverter;
@Entity
-@Table(name = "EVENT_ATTRIBUTE",
- uniqueConstraints = { @UniqueConstraint(columnNames = { "NAME" })})
+@Table(
+ name = "EVENT_ATTRIBUTE",
+ uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME"})})
public class AttributeModel implements Serializable {
private static final long serialVersionUID = -756109102178482698L;
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", updatable = false, nullable = false)
private Long id;
+
@Column(name = "NAME")
private String name;
+
@Column(name = "DISPLAY_NAME")
private String displayName;
+
@Column(name = "DESCRIPTION")
private String description;
+
@Column(name = "CATALOG_ID")
private String catalogId;
+
@Column(name = "DATATYPE")
- @Convert(converter=DataTypeConverter.class)
+ @Convert(converter = DataTypeConverter.class)
private DataType dataType;
+
@Column(name = "INDEXED")
- @Convert(converter=BooleanToStringConverter.class)
+ @Convert(converter = BooleanToStringConverter.class)
private boolean indexed;
+
@Column(name = "SORTABLE")
- @Convert(converter=BooleanToStringConverter.class)
+ @Convert(converter = BooleanToStringConverter.class)
private boolean sortable;
+
@Column(name = "REQUIRED")
- @Convert(converter=BooleanToStringConverter.class)
+ @Convert(converter = BooleanToStringConverter.class)
private boolean required;
+
@Column(name = "REQUEST_CONTEXT")
- @Convert(converter=BooleanToStringConverter.class)
+ @Convert(converter = BooleanToStringConverter.class)
private boolean requestContext;
+
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "attribute_examples", joinColumns = @JoinColumn(name = "attribute_id"))
@Column(name = "example")
private Set<String> examples = new HashSet<>();
+
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "attribute_aliases", joinColumns = @JoinColumn(name = "attribute_id"))
@Column(name = "alias")
private Set<String> aliases = new HashSet<>();
+
@OneToMany(fetch = FetchType.EAGER, mappedBy = "attribute", cascade = CascadeType.ALL)
private Set<ConstraintModel> constraints;
@@ -89,7 +100,6 @@ public class AttributeModel implements Serializable {
catalogId = "DEFAULT";
}
-
/**
* Returns the id of the AttributeDto.
* @return
@@ -318,7 +328,10 @@ public class AttributeModel implements Serializable {
if (o == null) return false;
if (!(o instanceof AttributeModel)) return false;
- AttributeModel other = (AttributeModel)o;
- return new EqualsBuilder().append(name, other.name).append(catalogId, other.catalogId).isEquals();
+ AttributeModel other = (AttributeModel) o;
+ return new EqualsBuilder()
+ .append(name, other.name)
+ .append(catalogId, other.catalogId)
+ .isEquals();
}
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CatalogModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CatalogModel.java
index 6f73208..54625f0 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CatalogModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/CatalogModel.java
@@ -16,9 +16,7 @@
*/
package org.apache.logging.log4j.catalog.jpa.model;
-
import java.sql.Timestamp;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -30,9 +28,10 @@ import javax.persistence.Table;
@Table(name = "CATALOG")
public class CatalogModel {
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", updatable = false, nullable = false)
private Long id;
+
@Column(name = "LAST_UPDATE")
private Timestamp lastUpdate;
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 7131622..fd54217 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.model;
import java.io.Serializable;
import java.util.List;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -35,26 +34,34 @@ import javax.persistence.UniqueConstraint;
* A Catalog CategoryDto.
*/
@Entity
-@Table(name = "CATALOG_CATEGORY",
- uniqueConstraints = { @UniqueConstraint(columnNames = { "NAME" })})
+@Table(
+ name = "CATALOG_CATEGORY",
+ uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME"})})
public class CategoryModel implements Serializable {
private static final long serialVersionUID = 5776108323599073407L;
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID")
private Long id;
+
@Column(name = "NAME")
private String name;
+
@Column(name = "DISPLAY_NAME")
private String displayName;
+
@Column(name = "DESCRIPTION")
private String description;
+
@Column(name = "CATALOG_ID")
private String catalogId;
+
@ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(name = "category_events", joinColumns = { @JoinColumn(name = "category_id")},
- inverseJoinColumns = { @JoinColumn(name = "event_id")})
+ @JoinTable(
+ name = "category_events",
+ joinColumns = {@JoinColumn(name = "category_id")},
+ inverseJoinColumns = {@JoinColumn(name = "event_id")})
private List<EventModel> events;
public CategoryModel() {
@@ -164,5 +171,4 @@ public class CategoryModel implements Serializable {
public void setEvents(List<EventModel> events) {
this.events = events;
}
-
}
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 8ff466c..fd1c1b8 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
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.jpa.model;
import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -37,14 +36,17 @@ public class ConstraintModel implements Serializable {
private static final long serialVersionUID = 6836453963830996541L;
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID")
private Long id;
+
@ManyToOne
@JoinColumn(name = "ATTRIBUTE_ID")
private AttributeModel attribute;
+
@Column(name = "CONSTRAINT_TYPE")
private String constraintType;
+
@Column(name = "VALUE")
private String value;
@@ -81,6 +83,5 @@ public class ConstraintModel implements Serializable {
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/model/EventAttributeModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventAttributeModel.java
index c475744..87e9227 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventAttributeModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventAttributeModel.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.catalog.jpa.model;
import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
@@ -27,7 +26,6 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-
import org.apache.logging.log4j.catalog.jpa.converter.BooleanToStringConverter;
/**
@@ -38,7 +36,7 @@ import org.apache.logging.log4j.catalog.jpa.converter.BooleanToStringConverter;
public class EventAttributeModel implements Serializable {
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", updatable = false, nullable = false)
private Long id;
@@ -51,7 +49,7 @@ public class EventAttributeModel implements Serializable {
private AttributeModel attribute;
@Column(name = "is_required")
- @Convert(converter=BooleanToStringConverter.class)
+ @Convert(converter = BooleanToStringConverter.class)
private Boolean isRequired;
/**
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventModel.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventModel.java
index 838f01a..b10c5bf 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventModel.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/model/EventModel.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
@@ -35,31 +34,38 @@ import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@Entity
-@Table(name = "CATALOG_EVENT",
- uniqueConstraints = { @UniqueConstraint(columnNames = { "NAME" })})
+@Table(
+ name = "CATALOG_EVENT",
+ uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME"})})
public class EventModel implements Serializable {
private static final long serialVersionUID = 1512172827909901054L;
+
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", updatable = false, nullable = false)
private Long id;
+
@Column(name = "NAME")
private String name;
+
@Column(name = "DISPLAY_NAME")
private String displayName;
+
@Column(name = "DESCRIPTION")
private String description;
+
@Column(name = "CATALOG_ID")
private String catalogId;
+
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "event_aliases", joinColumns = @JoinColumn(name = "event_id"))
@Column(name = "alias")
private Set<String> aliases;
+
@OneToMany(fetch = FetchType.EAGER, mappedBy = "event", cascade = CascadeType.ALL, orphanRemoval = true)
private Set<EventAttributeModel> attributes = new HashSet<>();
@@ -209,14 +215,18 @@ public class EventModel implements Serializable {
if (o == null) return false;
if (!(o instanceof EventModel)) return false;
- EventModel other = (EventModel)o;
+ EventModel other = (EventModel) o;
return new EqualsBuilder().append(name, other.name).isEquals();
}
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{\"id\" : \"").append(id).append("\"");
- sb.append(", \"name\" : \"").append(name).append("\", \"displayName\" : \"").append(displayName).append("\"");
+ sb.append(", \"name\" : \"")
+ .append(name)
+ .append("\", \"displayName\" : \"")
+ .append(displayName)
+ .append("\"");
sb.append(", \"description\" : ").append(description).append("\", \"attributes\" : [");
boolean first = true;
for (EventAttributeModel attribute : attributes) {
@@ -225,7 +235,11 @@ public class EventModel implements Serializable {
} else {
first = false;
}
- sb.append("{\"name\" : \"").append(attribute.getAttribute().getName()).append("\", \"required\" : ").append(attribute.isRequired()).append("}");
+ sb.append("{\"name\" : \"")
+ .append(attribute.getAttribute().getName())
+ .append("\", \"required\" : ")
+ .append(attribute.isRequired())
+ .append("}");
}
sb.append("]}");
return sb.toString();
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 4f897a0..910c5af 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.model;
import java.io.Serializable;
import java.util.List;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -35,25 +34,34 @@ import javax.persistence.UniqueConstraint;
* Definition of a ProductDto.
*/
@Entity
-@Table(name = "CATALOG_PRODUCT",
- uniqueConstraints = { @UniqueConstraint(columnNames = { "NAME" })})
+@Table(
+ name = "CATALOG_PRODUCT",
+ uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME"})})
public class ProductModel implements Serializable {
private static final long serialVersionUID = -736368842796386523L;
+
@Id
- @GeneratedValue(strategy= GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID")
private Long id;
+
@Column(name = "NAME")
private String name;
+
@Column(name = "DISPLAY_NAME")
private String displayName;
+
@Column(name = "DESCRIPTION")
private String description;
+
@Column(name = "CATALOG_ID")
private String catalogId;
+
@ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(name = "PRODUCT_EVENTS", joinColumns = { @JoinColumn(name = "PRODUCT_ID")},
- inverseJoinColumns = { @JoinColumn(name = "EVENT_ID")})
+ @JoinTable(
+ name = "PRODUCT_EVENTS",
+ joinColumns = {@JoinColumn(name = "PRODUCT_ID")},
+ inverseJoinColumns = {@JoinColumn(name = "EVENT_ID")})
private List<EventModel> events;
public ProductModel() {
@@ -146,5 +154,4 @@ public class ProductModel implements Serializable {
public void setEvents(List<EventModel> events) {
this.events = events;
}
-
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AbstractPagingAndSortingService.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AbstractPagingAndSortingService.java
index 7973156..5b4f03e 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AbstractPagingAndSortingService.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AbstractPagingAndSortingService.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.catalog.jpa.service;
-
import org.springframework.data.domain.PageRequest;
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/service/AttributeService.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeService.java
index c5505ba..43a1494 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeService.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/AttributeService.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Optional;
-
import org.apache.logging.log4j.catalog.jpa.model.AttributeModel;
/**
@@ -26,12 +25,19 @@ import org.apache.logging.log4j.catalog.jpa.model.AttributeModel;
*/
public interface AttributeService {
List<AttributeModel> getAttributes(int startPage, int itemsPerPage, String sortColumn, String direction);
- List<AttributeModel> getAttributes(String catalogId, int startPage, int itemsPerPage, String sortColumn,
- String direction);
+
+ List<AttributeModel> getAttributes(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction);
+
List<AttributeModel> getAttributes();
+
List<AttributeModel> getAttributes(String catalogId);
+
Optional<AttributeModel> getAttribute(Long attributeId);
+
Optional<AttributeModel> getAttribute(String catalogId, String attributeName);
+
AttributeModel saveAttribute(AttributeModel attribute);
+
void deleteAttribute(Long attributeId);
}
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 fb37e9d..fcd9183 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Optional;
-
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;
@@ -54,7 +53,8 @@ public class AttributeServiceImpl extends AbstractPagingAndSortingService implem
}
@Override
- public List<AttributeModel> getAttributes(String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction) {
+ public List<AttributeModel> getAttributes(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction) {
Pageable pageable = createPageRequest(startPage, itemsPerPage, sortColumn, direction);
Page<AttributeModel> page = attributeRepository.findByCatalogId(catalogId, pageable);
return page.getContent();
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 4aa591d..2cb0d22 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
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-
import org.apache.logging.log4j.catalog.api.Attribute;
import org.apache.logging.log4j.catalog.api.CatalogData;
import org.apache.logging.log4j.catalog.api.Category;
@@ -54,24 +53,31 @@ public class CatalogServiceImpl implements CatalogService {
@Autowired
private AttributeRepository attributeRepository;
+
@Autowired
private EventRepository eventRepository;
+
@Autowired
private CategoryRepository categoryRepository;
+
@Autowired
private ProductRepository productRepository;
+
@Autowired
private AttributeModelConverter attributeModelConverter;
+
@Autowired
private EventModelConverter eventModelConverter;
+
@Autowired
private CategoryModelConverter categoryModelConverter;
+
@Autowired
private ProductModelConverter productModelConverter;
+
@Autowired
private CatalogRepository catalogRepository;
-
public CatalogData getCatalogData() {
CatalogData data = new CatalogData();
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryService.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryService.java
index a9c795b..094b6cb 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryService.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/CategoryService.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Optional;
-
import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
/**
@@ -26,12 +25,19 @@ import org.apache.logging.log4j.catalog.jpa.model.CategoryModel;
*/
public interface CategoryService {
List<CategoryModel> getCategories(int startPage, int itemsPerPage, String sortColumn, String direction);
- List<CategoryModel> getCategories(String catalogId, int startPage, int itemsPerPage, String sortColumn,
- String direction);
+
+ List<CategoryModel> getCategories(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction);
+
List<CategoryModel> getCategories();
+
List<CategoryModel> getCategories(String catalogId);
+
Optional<CategoryModel> getCategory(Long categoryId);
+
Optional<CategoryModel> getCategory(String catalogId, String name);
+
CategoryModel saveCategory(CategoryModel category);
+
void deleteCategory(Long categoryId);
}
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 298a836..614cc0b 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Optional;
-
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;
@@ -54,8 +53,8 @@ public class CategoryServiceImpl extends AbstractPagingAndSortingService impleme
}
@Override
- public List<CategoryModel> getCategories(String catalogId, int startPage, int itemsPerPage, String sortColumn,
- String direction) {
+ public List<CategoryModel> getCategories(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction) {
Pageable pageable = createPageRequest(startPage, itemsPerPage, sortColumn, direction);
Page<CategoryModel> page = categoryRepository.findByCatalogId(catalogId, pageable);
return page.getContent();
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintService.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintService.java
index d9da466..92c1946 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintService.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ConstraintService.java
@@ -19,7 +19,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.catalog.jpa.model.ConstraintModel;
/**
@@ -27,8 +26,12 @@ import org.apache.logging.log4j.catalog.jpa.model.ConstraintModel;
*/
public interface ConstraintService {
Set<String> getConstraintTypes();
+
List<ConstraintModel> getConstraints();
+
Optional<ConstraintModel> getConstraint(Long constraintId);
+
ConstraintModel saveConstraint(ConstraintModel constraint);
+
void deleteConstraint(Long constraintId);
}
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 5e9cb82..4ffa6b4 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
@@ -19,7 +19,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.catalog.api.plugins.ConstraintPlugins;
import org.apache.logging.log4j.catalog.jpa.dao.ConstraintRepository;
import org.apache.logging.log4j.catalog.jpa.model.ConstraintModel;
@@ -60,5 +59,4 @@ public class ConstraintServiceImpl implements ConstraintService {
public void deleteConstraint(Long constraintId) {
constraintRepository.deleteById(constraintId);
}
-
}
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventService.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventService.java
index d4235e6..a7ccd91 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventService.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/EventService.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-
import org.apache.logging.log4j.catalog.jpa.model.EventModel;
/**
@@ -27,12 +26,20 @@ import org.apache.logging.log4j.catalog.jpa.model.EventModel;
*/
public interface EventService {
List<EventModel> getEvents(int startPage, int itemsPerPage, String sortColumn, String direction);
+
List<EventModel> getEvents(String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction);
+
List<EventModel> getEvents();
+
List<EventModel> getEvents(String catalogId);
+
Map<String, EventModel> getEventMap();
+
Optional<EventModel> getEvent(Long eventId);
+
Optional<EventModel> getEvent(String catalogId, String eventName);
+
EventModel saveEvent(EventModel event);
+
void deleteEvent(Long eventId);
}
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 310af51..3895c10 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
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-
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;
@@ -56,8 +55,8 @@ public class EventServiceImpl extends AbstractPagingAndSortingService implements
}
@Override
- public List<EventModel> getEvents(String catalogId, int startPage, int itemsPerPage, String sortColumn,
- String direction) {
+ public List<EventModel> getEvents(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction) {
Pageable pageable = createPageRequest(startPage, itemsPerPage, sortColumn, direction);
Page<EventModel> page = eventRepository.findByCatalogId(catalogId, pageable);
return page.getContent();
diff --git a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductService.java b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductService.java
index 7a73e15..2ededc6 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductService.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/service/ProductService.java
@@ -18,17 +18,23 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Optional;
-
import org.apache.logging.log4j.catalog.jpa.model.ProductModel;
public interface ProductService {
List<ProductModel> getProducts(int startPage, int itemsPerPage, String sortColumn, String direction);
- List<ProductModel> getProducts(String catalogId, int startPage, int itemsPerPage, String sortColumn,
- String direction);
+
+ List<ProductModel> getProducts(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction);
+
List<ProductModel> getProducts();
+
List<ProductModel> getProducts(String catalogId);
+
Optional<ProductModel> getProduct(Long productId);
+
Optional<ProductModel> getProduct(String catalogId, String name);
+
ProductModel saveProduct(ProductModel product);
+
void deleteProduct(Long productId);
}
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 061620a..157383e 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
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.catalog.jpa.service;
import java.util.List;
import java.util.Optional;
-
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;
@@ -54,8 +53,8 @@ public class ProductServiceImpl extends AbstractPagingAndSortingService implemen
}
@Override
- public List<ProductModel> getProducts(String catalogId, int startPage, int itemsPerPage, String sortColumn,
- String direction) {
+ public List<ProductModel> getProducts(
+ String catalogId, int startPage, int itemsPerPage, String sortColumn, String direction) {
Pageable pageable = createPageRequest(startPage, itemsPerPage, sortColumn, direction);
Page<ProductModel> page = productRepository.findByCatalogId(catalogId, pageable);
return page.getContent();
@@ -66,7 +65,6 @@ public class ProductServiceImpl extends AbstractPagingAndSortingService implemen
return productRepository.findOne(productId);
}
-
@Override
public Optional<ProductModel> getProduct(String catalogId, String name) {
return productRepository.findByCatalogIdAndName(catalogId, name);
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 43decb5..38e9256 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
@@ -16,9 +16,10 @@
*/
package org.apache.logging.log4j.catalog.jpa;
+import static org.junit.Assert.*;
+
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.config.ApplicationConfiguration;
@@ -40,23 +41,26 @@ import org.springframework.test.context.jdbc.SqlGroup;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import static org.junit.Assert.*;
-
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = {ApplicationConfiguration.class})
+@ContextConfiguration(
+ loader = AnnotationConfigContextLoader.class,
+ classes = {ApplicationConfiguration.class})
@SqlGroup({
- @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/hsql/beforeTestRun.sql"),
- @Sql(executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD, scripts = "classpath:sql/hsql/afterTestRun.sql")
+ @Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:sql/hsql/beforeTestRun.sql"),
+ @Sql(executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD, scripts = "classpath:sql/hsql/afterTestRun.sql")
})
@Repository
public class CatalogTest {
@Autowired
AttributeRepository attributeRepository;
+
@Autowired
CategoryRepository categoryRepository;
+
@Autowired
EventRepository eventRepository;
+
@Autowired
private CatalogService catalogService;
@@ -151,14 +155,10 @@ public class CatalogTest {
}
@Test
- public void testModifyEvent() {
-
- }
+ public void testModifyEvent() {}
@Test
- public void testDeleteEvent() {
-
- }
+ public void testDeleteEvent() {}
@Test
public void testRetrieveAttributes() {
@@ -178,17 +178,13 @@ public class CatalogTest {
}
@Test
- public void testAddAttribute() {
-
- }
+ public void testAddAttribute() {}
@Test
- public void testModifyAttribute() {
- }
+ public void testModifyAttribute() {}
@Test
- public void testDeleteAttribute() {
- }
+ public void testDeleteAttribute() {}
@Test
public void testRetrieveCatalog() {
diff --git a/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/config/ApplicationConfiguration.java b/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/config/ApplicationConfiguration.java
index 13b5b64..3d4ba78 100644
--- a/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/config/ApplicationConfiguration.java
+++ b/log4j-catalog/log4j-catalog-jpa/src/test/java/org/apache/logging/log4j/catalog/jpa/config/ApplicationConfiguration.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@Configuration
-@ComponentScan(basePackages = { "org.apache.logging.log4j.catalog" })
+@ComponentScan(basePackages = {"org.apache.logging.log4j.catalog"})
@Import(HibernateConfig.class)
public class ApplicationConfiguration {
@Bean