[LOG4J2-2443] move ConstraintValidationException in the log4j-audit-api module as it's the only place it was used and make it extend AuditException
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/063c2580 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/063c2580 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/063c2580 Branch: refs/heads/master Commit: 063c2580fac4975b3dc47c2a32a6763ae9379cc2 Parents: bf545f3 Author: Andrei Ivanov <andrei.iva...@arnia.ro> Authored: Sun Sep 16 16:44:05 2018 +0300 Committer: Andrei Ivanov <andrei.iva...@arnia.ro> Committed: Sun Sep 16 16:44:05 2018 +0300 ---------------------------------------------------------------------- .../log4j/audit/AbstractEventLogger.java | 4 +- .../logging/log4j/audit/LogEventFactory.java | 2 +- .../ConstraintValidationException.java | 37 ++++++++++++++++++ .../logging/log4j/audit/AuditLoggerTest.java | 2 +- .../logging/log4j/audit/TransferTest.java | 3 +- .../ConstraintValidationException.java | 41 -------------------- 6 files changed, 41 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/063c2580/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java ---------------------------------------------------------------------- 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 8f9a5e6..2b74236 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 @@ -25,7 +25,7 @@ import org.apache.logging.log4j.catalog.api.Attribute; import org.apache.logging.log4j.catalog.api.Constraint; import org.apache.logging.log4j.catalog.api.Event; import org.apache.logging.log4j.catalog.api.EventAttribute; -import org.apache.logging.log4j.catalog.api.exception.ConstraintValidationException; +import org.apache.logging.log4j.audit.exception.ConstraintValidationException; import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins; import org.apache.logging.log4j.message.StructuredDataMessage; @@ -33,8 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.apache.logging.log4j.catalog.api.constant.Constants.*; - /** * This class is used to log events generated remotely. */ http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/063c2580/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java ---------------------------------------------------------------------- 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 85f2692..5914fff 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 @@ -43,7 +43,7 @@ import org.apache.logging.log4j.audit.annotation.RequestContextConstraints; import org.apache.logging.log4j.audit.annotation.Required; import org.apache.logging.log4j.audit.exception.AuditException; import org.apache.logging.log4j.audit.util.NamingUtils; -import org.apache.logging.log4j.catalog.api.exception.ConstraintValidationException; +import org.apache.logging.log4j.audit.exception.ConstraintValidationException; import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins; import org.apache.logging.log4j.message.StructuredDataMessage; import org.apache.logging.log4j.spi.ExtendedLogger; http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/063c2580/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/exception/ConstraintValidationException.java ---------------------------------------------------------------------- diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/exception/ConstraintValidationException.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/exception/ConstraintValidationException.java new file mode 100644 index 0000000..8ca2dfd --- /dev/null +++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/exception/ConstraintValidationException.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.audit.exception; + +/** + * + */ +public class ConstraintValidationException extends AuditException { + + private static final long serialVersionUID = 2142398619256674767L; + + public ConstraintValidationException(String msg) { + super(msg); + } + + public ConstraintValidationException(Throwable t) { + super(t); + } + + public ConstraintValidationException(String msg, Throwable t) { + super(msg, t); + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/063c2580/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java ---------------------------------------------------------------------- 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 0749829..9e8b18d 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 @@ -22,7 +22,7 @@ import org.apache.logging.log4j.audit.catalog.CatalogManager; import org.apache.logging.log4j.audit.catalog.CatalogManagerImpl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.audit.catalog.StringCatalogReader; -import org.apache.logging.log4j.catalog.api.exception.ConstraintValidationException; +import org.apache.logging.log4j.audit.exception.ConstraintValidationException; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/063c2580/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/TransferTest.java ---------------------------------------------------------------------- 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 7c5ce5e..647e350 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 @@ -24,8 +24,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.audit.event.Transfer; -import org.apache.logging.log4j.audit.exception.AuditException; -import org.apache.logging.log4j.catalog.api.exception.ConstraintValidationException; +import org.apache.logging.log4j.audit.exception.ConstraintValidationException; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/063c2580/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/exception/ConstraintValidationException.java ---------------------------------------------------------------------- diff --git a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/exception/ConstraintValidationException.java b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/exception/ConstraintValidationException.java deleted file mode 100644 index b65b5bd..0000000 --- a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/exception/ConstraintValidationException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. - */ -package org.apache.logging.log4j.catalog.api.exception; - -/** - * - */ -public class ConstraintValidationException extends RuntimeException { - - private static final long serialVersionUID = 2142398619256674767L; - - public ConstraintValidationException() { - super(); - } - - public ConstraintValidationException(String msg) { - super(msg); - } - - public ConstraintValidationException(Throwable t) { - super(t); - } - - public ConstraintValidationException(String msg, Throwable t) { - super(msg, t); - } -}