Port log4j-jdbc-dbcp2 changes from 2.x (#2163)

apache · Jan 10, 2024 · 2b0ba72 · 2b0ba72
1 parent 245da43
commit 2b0ba72
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
@@ -28,7 +28,6 @@
   <name>Apache Log4j JDBC DBCP 2</name>
   <description>Connection source for the JDBC Appender using Apache Commons DBCP2.</description>
   <properties>
-    <log4jParentDir>${basedir}/..</log4jParentDir>
 
     <!--
       ~ OSGi and JPMS options
@@ -75,11 +74,6 @@
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

diff --git a/.../test/java/org/apache/logging/log4j/dbcp2/appender/PoolingDriverConnectionSourceTest.java b/.../test/java/org/apache/logging/log4j/dbcp2/appender/PoolingDriverConnectionSourceTest.java
@@ -25,14 +25,6 @@
 
 public class PoolingDriverConnectionSourceTest {
 
-    private void openAndClose(final PoolingDriverConnectionSource source) throws SQLException {
-        try (final Connection conn = source.getConnection()) {
-            Assert.assertFalse(conn.isClosed());
-        } finally {
-            source.stop();
-        }
-    }
-
     @Test
     public void testH2Properties() throws SQLException {
         final Property[] properties = new Property[] {
@@ -47,6 +39,7 @@ public void testH2Properties() throws SQLException {
                         .setConnectionString(JdbcH2TestHelper.CONNECTION_STRING_IN_MEMORY)
                         .setProperties(properties)
                         .build();
+        // @formatter:on
         openAndClose(source);
     }
 
@@ -78,9 +71,19 @@ public void testH2UserAndPassword() throws SQLException {
                         .setUserName(JdbcH2TestHelper.USER_NAME.toCharArray())
                         .setPassword(JdbcH2TestHelper.PASSWORD.toCharArray())
                         .build();
+        // @formatter:on
         openAndClose(source);
     }
 
+    private void openAndClose(final PoolingDriverConnectionSource source) throws SQLException {
+        Assert.assertNotNull("PoolingDriverConnectionSource is null", source);
+        try (final Connection conn = source.getConnection()) {
+            Assert.assertFalse(conn.isClosed());
+        } finally {
+            source.stop();
+        }
+    }
+
     @Test
     public void testH2UserPasswordAndPoolName() throws SQLException {
         // @formatter:off
@@ -91,6 +94,7 @@ public void testH2UserPasswordAndPoolName() throws SQLException {
                         .setPassword(JdbcH2TestHelper.PASSWORD.toCharArray())
                         .setPoolName("MyPoolName")
                         .build();
+        // @formatter:on
         openAndClose(source);
     }
 

diff --git a/log4j-jdbc-dbcp2/src/test/resources/log4j2-jdbc-dbcp2.xml b/log4j-jdbc-dbcp2/src/test/resources/log4j2-jdbc-dbcp2.xml
@@ -39,6 +39,10 @@
           rollbackOnReturn="true"
           validationQuery=""
           validationQueryTimeoutSeconds="-1">
+          <DisconnectionSqlCodes>
+        	<String>1</String>
+        	<String>2</String>
+          </DisconnectionSqlCodes>
         </PoolableConnectionFactory>
       </PoolingDriver>
       <ColumnMapping name="ColumnA" />