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 2018/01/12 00:15:52 UTC
logging-log4j2 git commit: [LOG4J2-2181] The JDBC Appender should use
keys and values from a Log4j MapMessage. Javadoc. Use try-with-resources.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 5921acad8 -> 55b622e16
[LOG4J2-2181] The JDBC Appender should use keys and values from a Log4j
MapMessage. Javadoc. Use try-with-resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/55b622e1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/55b622e1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/55b622e1
Branch: refs/heads/master
Commit: 55b622e1616c00c2705641c0fd425f7893827d50
Parents: 5921aca
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Jan 11 17:15:49 2018 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Jan 11 17:15:49 2018 -0700
----------------------------------------------------------------------
.../AbstractJdbcAppenderDataSourceTest.java | 37 ++++-----
.../AbstractJdbcAppenderFactoryMethodTest.java | 79 ++++++++++----------
2 files changed, 59 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/55b622e1/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderDataSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderDataSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderDataSourceTest.java
index e5cfb9f..732c2f7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderDataSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderDataSourceTest.java
@@ -80,9 +80,9 @@ public abstract class AbstractJdbcAppenderDataSourceTest {
try (final Connection connection = jdbcRule.getConnectionSource().getConnection()) {
final Error exception = new Error("Final error massage is fatal!");
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- final PrintWriter writer = new PrintWriter(outputStream);
- exception.printStackTrace(writer);
- writer.close();
+ try (final PrintWriter writer = new PrintWriter(outputStream)) {
+ exception.printStackTrace(writer);
+ }
final String stackTrace = outputStream.toString();
final long millis = System.currentTimeMillis();
@@ -91,24 +91,25 @@ public abstract class AbstractJdbcAppenderDataSourceTest {
logger.trace("Data source logged message 01.");
logger.fatal("Error from data source 02.", exception);
- final Statement statement = connection.createStatement();
- final ResultSet resultSet = statement.executeQuery("SELECT * FROM dsLogEntry ORDER BY id");
+ try (final Statement statement = connection.createStatement();
+ final ResultSet resultSet = statement.executeQuery("SELECT * FROM dsLogEntry ORDER BY id")) {
- assertTrue("There should be at least one row.", resultSet.next());
+ assertTrue("There should be at least one row.", resultSet.next());
- final long date = resultSet.getTimestamp("eventDate").getTime();
- assertTrue("The date should be later than pre-logging (1).", date >= millis);
- assertTrue("The date should be earlier than now (1).", date <= System.currentTimeMillis());
- assertEquals("The literal column is not correct (1).", "Literal Value of Data Source",
- resultSet.getString("literalColumn"));
- assertEquals("The level column is not correct (1).", "FATAL", resultSet.getNString("level"));
- assertEquals("The logger column is not correct (1).", logger.getName(), resultSet.getNString("logger"));
- assertEquals("The message column is not correct (1).", "Error from data source 02.",
- resultSet.getString("message"));
- assertEquals("The exception column is not correct (1).", stackTrace,
- IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(), -1));
+ final long date = resultSet.getTimestamp("eventDate").getTime();
+ assertTrue("The date should be later than pre-logging (1).", date >= millis);
+ assertTrue("The date should be earlier than now (1).", date <= System.currentTimeMillis());
+ assertEquals("The literal column is not correct (1).", "Literal Value of Data Source",
+ resultSet.getString("literalColumn"));
+ assertEquals("The level column is not correct (1).", "FATAL", resultSet.getNString("level"));
+ assertEquals("The logger column is not correct (1).", logger.getName(), resultSet.getNString("logger"));
+ assertEquals("The message column is not correct (1).", "Error from data source 02.",
+ resultSet.getString("message"));
+ assertEquals("The exception column is not correct (1).", stackTrace,
+ IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(), -1));
- assertFalse("There should not be two rows.", resultSet.next());
+ assertFalse("There should not be two rows.", resultSet.next());
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/55b622e1/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderFactoryMethodTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderFactoryMethodTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderFactoryMethodTest.java
index cc12feb..72f7f39 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderFactoryMethodTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderFactoryMethodTest.java
@@ -58,9 +58,9 @@ public abstract class AbstractJdbcAppenderFactoryMethodTest {
try (final Connection connection = jdbcRule.getConnectionSource().getConnection()) {
final SQLException exception = new SQLException("Some other error message!");
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- final PrintWriter writer = new PrintWriter(outputStream);
- exception.printStackTrace(writer);
- writer.close();
+ try (final PrintWriter writer = new PrintWriter(outputStream)) {
+ exception.printStackTrace(writer);
+ }
final String stackTrace = outputStream.toString();
final long millis = System.currentTimeMillis();
@@ -70,42 +70,43 @@ public abstract class AbstractJdbcAppenderFactoryMethodTest {
logger.debug("Factory logged message 01.");
logger.error("Error from factory 02.", exception);
- final Statement statement = connection.createStatement();
- final ResultSet resultSet = statement.executeQuery("SELECT * FROM fmLogEntry ORDER BY id");
-
- assertTrue("There should be at least one row.", resultSet.next());
-
- long date = resultSet.getTimestamp("eventDate").getTime();
- long anotherDate = resultSet.getTimestamp("anotherDate").getTime();
- assertEquals(date, anotherDate);
- assertTrue("The date should be later than pre-logging (1).", date >= millis);
- assertTrue("The date should be earlier than now (1).", date <= System.currentTimeMillis());
- assertEquals("The literal column is not correct (1).", "Some Other Literal Value",
- resultSet.getString("literalColumn"));
- assertEquals("The level column is not correct (1).", "DEBUG", resultSet.getNString("level"));
- assertEquals("The logger column is not correct (1).", logger.getName(), resultSet.getNString("logger"));
- assertEquals("The message column is not correct (1).", "Factory logged message 01.",
- resultSet.getString("message"));
- assertEquals("The exception column is not correct (1).", Strings.EMPTY,
- IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(), -1));
-
- assertTrue("There should be two rows.", resultSet.next());
-
- date = resultSet.getTimestamp("eventDate").getTime();
- anotherDate = resultSet.getTimestamp("anotherDate").getTime();
- assertEquals(date, anotherDate);
- assertTrue("The date should be later than pre-logging (2).", date >= millis);
- assertTrue("The date should be earlier than now (2).", date <= System.currentTimeMillis());
- assertEquals("The literal column is not correct (2).", "Some Other Literal Value",
- resultSet.getString("literalColumn"));
- assertEquals("The level column is not correct (2).", "ERROR", resultSet.getNString("level"));
- assertEquals("The logger column is not correct (2).", logger.getName(), resultSet.getNString("logger"));
- assertEquals("The message column is not correct (2).", "Error from factory 02.",
- resultSet.getString("message"));
- assertEquals("The exception column is not correct (2).", stackTrace,
- IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(), -1));
-
- assertFalse("There should not be three rows.", resultSet.next());
+ try (final Statement statement = connection.createStatement();
+ final ResultSet resultSet = statement.executeQuery("SELECT * FROM fmLogEntry ORDER BY id")) {
+
+ assertTrue("There should be at least one row.", resultSet.next());
+
+ long date = resultSet.getTimestamp("eventDate").getTime();
+ long anotherDate = resultSet.getTimestamp("anotherDate").getTime();
+ assertEquals(date, anotherDate);
+ assertTrue("The date should be later than pre-logging (1).", date >= millis);
+ assertTrue("The date should be earlier than now (1).", date <= System.currentTimeMillis());
+ assertEquals("The literal column is not correct (1).", "Some Other Literal Value",
+ resultSet.getString("literalColumn"));
+ assertEquals("The level column is not correct (1).", "DEBUG", resultSet.getNString("level"));
+ assertEquals("The logger column is not correct (1).", logger.getName(), resultSet.getNString("logger"));
+ assertEquals("The message column is not correct (1).", "Factory logged message 01.",
+ resultSet.getString("message"));
+ assertEquals("The exception column is not correct (1).", Strings.EMPTY,
+ IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(), -1));
+
+ assertTrue("There should be two rows.", resultSet.next());
+
+ date = resultSet.getTimestamp("eventDate").getTime();
+ anotherDate = resultSet.getTimestamp("anotherDate").getTime();
+ assertEquals(date, anotherDate);
+ assertTrue("The date should be later than pre-logging (2).", date >= millis);
+ assertTrue("The date should be earlier than now (2).", date <= System.currentTimeMillis());
+ assertEquals("The literal column is not correct (2).", "Some Other Literal Value",
+ resultSet.getString("literalColumn"));
+ assertEquals("The level column is not correct (2).", "ERROR", resultSet.getNString("level"));
+ assertEquals("The logger column is not correct (2).", logger.getName(), resultSet.getNString("logger"));
+ assertEquals("The message column is not correct (2).", "Error from factory 02.",
+ resultSet.getString("message"));
+ assertEquals("The exception column is not correct (2).", stackTrace,
+ IOUtils.readStringAndClose(resultSet.getNClob("exception").getCharacterStream(), -1));
+
+ assertFalse("There should not be three rows.", resultSet.next());
+ }
}
}