You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2021/03/27 22:22:38 UTC
[logging-log4j2] 03/03: Update some dependencies.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cfc1606a03e6e0dfbc153d1ebee9cc2e9f34745e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 27 18:22:31 2021 -0400
Update some dependencies.
- org.eclipse.persistence:javax.persistence ............. 2.1.1 -> 2.2.1
- org.eclipse.persistence:org.eclipse.persistence.jpa ... 2.6.5 -> 2.6.9
---
.../core/appender/db/jpa/JpaDatabaseManager.java | 48 ++++++++++------------
pom.xml | 4 +-
src/changes/changes.xml | 4 +-
3 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
index 88a4ad2..67891c9 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.appender.db.jpa;
import java.io.Serializable;
import java.lang.reflect.Constructor;
+import java.util.Objects;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -38,18 +39,16 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
private final String entityClassName;
private final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor;
private final String persistenceUnitName;
-
private EntityManagerFactory entityManagerFactory;
-
private EntityManager entityManager;
private EntityTransaction transaction;
private JpaDatabaseManager(final String name, final int bufferSize,
- final Class<? extends AbstractLogEventWrapperEntity> entityClass,
- final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
- final String persistenceUnitName) {
+ final Class<? extends AbstractLogEventWrapperEntity> entityClass,
+ final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
+ final String persistenceUnitName) {
super(name, bufferSize);
- this.entityClassName = entityClass.getName();
+ this.entityClassName = Objects.requireNonNull(entityClass, "entityClass").getName();
this.entityConstructor = entityConstructor;
this.persistenceUnitName = persistenceUnitName;
}
@@ -79,17 +78,16 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
this.transaction.begin();
} catch (final Exception e) {
throw new AppenderLoggingException(
- "Cannot write logging event or flush buffer; manager cannot create EntityManager or transaction.", e
- );
+ "Cannot write logging event or flush buffer; manager cannot create EntityManager or transaction.", e);
}
}
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
if (!this.isRunning() || this.entityManagerFactory == null || this.entityManager == null
- || this.transaction == null) {
+ || this.transaction == null) {
throw new AppenderLoggingException(
- "Cannot write logging event; JPA manager not connected to the database.");
+ "Cannot write logging event; JPA manager not connected to the database.");
}
AbstractLogEventWrapperEntity entity;
@@ -106,8 +104,8 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
this.transaction.rollback();
this.transaction = null;
}
- throw new AppenderLoggingException("Failed to insert record for log event in JPA manager: " +
- e.getMessage(), e);
+ throw new AppenderLoggingException(
+ "Failed to insert record for log event in JPA manager: " + e.getMessage(), e);
}
}
@@ -144,21 +142,18 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
* @param name The name of the manager, which should include connection details, entity class name, etc.
* @param bufferSize The size of the log event buffer.
* @param entityClass The fully-qualified class name of the {@link AbstractLogEventWrapperEntity} concrete
- * implementation.
+ * implementation.
* @param entityConstructor The one-arg {@link LogEvent} constructor for the concrete entity class.
* @param persistenceUnitName The name of the JPA persistence unit that should be used for persisting log events.
* @return a new or existing JPA manager as applicable.
*/
public static JpaDatabaseManager getJPADatabaseManager(final String name, final int bufferSize,
- final Class<? extends AbstractLogEventWrapperEntity>
- entityClass,
- final Constructor<? extends AbstractLogEventWrapperEntity>
- entityConstructor,
- final String persistenceUnitName) {
-
- return AbstractDatabaseManager.getManager(
- name, new FactoryData(bufferSize, entityClass, entityConstructor, persistenceUnitName), FACTORY
- );
+ final Class<? extends AbstractLogEventWrapperEntity> entityClass,
+ final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
+ final String persistenceUnitName) {
+
+ return AbstractDatabaseManager.getManager(name,
+ new FactoryData(bufferSize, entityClass, entityConstructor, persistenceUnitName), FACTORY);
}
/**
@@ -170,8 +165,8 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
private final String persistenceUnitName;
protected FactoryData(final int bufferSize, final Class<? extends AbstractLogEventWrapperEntity> entityClass,
- final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
- final String persistenceUnitName) {
+ final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor,
+ final String persistenceUnitName) {
super(bufferSize, null);
this.entityClass = entityClass;
@@ -186,9 +181,8 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
private static final class JPADatabaseManagerFactory implements ManagerFactory<JpaDatabaseManager, FactoryData> {
@Override
public JpaDatabaseManager createManager(final String name, final FactoryData data) {
- return new JpaDatabaseManager(
- name, data.getBufferSize(), data.entityClass, data.entityConstructor, data.persistenceUnitName
- );
+ return new JpaDatabaseManager(name, data.getBufferSize(), data.entityClass, data.entityConstructor,
+ data.persistenceUnitName);
}
}
}
diff --git a/pom.xml b/pom.xml
index ce0a437..5443a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
<docLabel>Site Documentation</docLabel>
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
- <javax.persistence>2.1.1</javax.persistence>
+ <javax.persistence>2.2.1</javax.persistence>
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports -->
<osgi.api.version>4.3.1</osgi.api.version>
<activemq.version>5.16.1</activemq.version>
@@ -822,7 +822,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.6.5</version>
+ <version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fbd1eed..f7315cc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,8 +62,10 @@
Slf4j implementations walk the stack at most once rather than twice to determine the caller's class loader.
</action>
<action dev="ggregory" type="update">
- - net.javacrumbs.json-unit:json-unit .................. 2.24.0 -> 2.25.0
+ - org.eclipse.persistence:javax.persistence ............. 2.1.1 -> 2.2.1
+ - org.eclipse.persistence:org.eclipse.persistence.jpa ... 2.6.5 -> 2.6.9
- org.fusesource.jansi:jansi ............................ 2.3.1 -> 2.3.2
+ - net.javacrumbs.json-unit:json-unit .................. 2.24.0 -> 2.25.0
- org.springframework:spring-aop ........................ 5.3.3 -> 5.3.5
- org.springframework:spring-beans ...................... 5.3.3 -> 5.3.5
- org.springframework:spring-context .................... 5.3.3 -> 5.3.5