Repository: logging-log4j2 Updated Branches: refs/heads/master 61ddf15cf -> df1d3544c
Fix regression in ColumnConfig literal != literalValue Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/df1d3544 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/df1d3544 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/df1d3544 Branch: refs/heads/master Commit: df1d3544c0020c8e7b2243eb7317192313334081 Parents: 61ddf15 Author: Matt Sicker <[email protected]> Authored: Sat Jan 7 01:29:54 2017 -0600 Committer: Matt Sicker <[email protected]> Committed: Sat Jan 7 01:29:54 2017 -0600 ---------------------------------------------------------------------- .../core/appender/db/jdbc/ColumnConfig.java | 19 +++++++++++-------- .../core/appender/db/jdbc/ColumnConfigTest.java | 14 +++++++------- 2 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1d3544/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java index 2c9a5b9..dbb7ce5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java @@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.appender.db.jdbc; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.Core; +import org.apache.logging.log4j.core.appender.db.ColumnMapping; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute; @@ -31,6 +32,8 @@ import org.apache.logging.log4j.util.Strings; /** * A configuration element used to configure which event properties are logged to which columns in the database table. + * + * @see ColumnMapping */ @Plugin(name = "Column", category = Core.CATEGORY_NAME, printObject = true) public final class ColumnConfig { @@ -106,7 +109,7 @@ public final class ColumnConfig { .setConfiguration(config) .setName(name) .setPattern(pattern) - .setLiteralValue(literalValue) + .setLiteral(literalValue) .setEventTimestamp(isEventTimestamp) .setUnicode(isUnicode) .setClob(isClob) @@ -131,7 +134,7 @@ public final class ColumnConfig { private String pattern; @PluginBuilderAttribute - private String literalValue; + private String literal; @PluginBuilderAttribute private boolean isEventTimestamp; @@ -160,7 +163,7 @@ public final class ColumnConfig { /** * The {@link PatternLayout} pattern to insert in this column. Mutually exclusive with - * {@code literalValue!=null} and {@code eventTimestamp=true} + * {@code literal!=null} and {@code eventTimestamp=true} */ public Builder setPattern(final String pattern) { this.pattern = pattern; @@ -171,14 +174,14 @@ public final class ColumnConfig { * The literal value to insert into the column as-is without any quoting or escaping. Mutually exclusive with * {@code pattern!=null} and {@code eventTimestamp=true}. */ - public Builder setLiteralValue(final String literalValue) { - this.literalValue = literalValue; + public Builder setLiteral(final String literal) { + this.literal = literal; return this; } /** * If {@code "true"}, indicates that this column is a date-time column in which the event timestamp should be - * inserted. Mutually exclusive with {@code pattern!=null} and {@code literalValue!=null}. + * inserted. Mutually exclusive with {@code pattern!=null} and {@code literal!=null}. */ public Builder setEventTimestamp(final boolean eventTimestamp) { isEventTimestamp = eventTimestamp; @@ -209,7 +212,7 @@ public final class ColumnConfig { } final boolean isPattern = Strings.isNotEmpty(pattern); - final boolean isLiteralValue = Strings.isNotEmpty(literalValue); + final boolean isLiteralValue = Strings.isNotEmpty(literal); if ((isPattern && isLiteralValue) || (isPattern && isEventTimestamp) || (isLiteralValue && isEventTimestamp)) { LOGGER.error("The pattern, literal, and isEventTimestamp attributes are mutually exclusive."); @@ -221,7 +224,7 @@ public final class ColumnConfig { } if (isLiteralValue) { - return new ColumnConfig(name, null, literalValue, false, false, false); + return new ColumnConfig(name, null, literal, false, false, false); } if (isPattern) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df1d3544/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java index f92378b..9d36cb7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfigTest.java @@ -35,7 +35,7 @@ public class ColumnConfigTest { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col") .setPattern("%l") - .setLiteralValue("literal") + .setLiteral("literal") .build(); assertNull("The result should be null.", config); @@ -56,7 +56,7 @@ public class ColumnConfigTest { public void testLiteralAndDateNoConfig() { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col") - .setLiteralValue("literal") + .setLiteral("literal") .setEventTimestamp(true) .build(); @@ -85,7 +85,7 @@ public class ColumnConfigTest { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col") .setPattern(Strings.EMPTY) - .setLiteralValue(Strings.EMPTY) + .setLiteral(Strings.EMPTY) .setEventTimestamp(false) .build(); @@ -148,7 +148,7 @@ public class ColumnConfigTest { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col2") .setPattern("%X{id} %level") - .setLiteralValue(Strings.EMPTY) + .setLiteral(Strings.EMPTY) .setEventTimestamp(false) .setUnicode(false) .setClob(true) @@ -169,7 +169,7 @@ public class ColumnConfigTest { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col3") .setPattern("%X{id} %level") - .setLiteralValue(Strings.EMPTY) + .setLiteral(Strings.EMPTY) .setEventTimestamp(false) .setUnicode(true) .setClob(false) @@ -189,7 +189,7 @@ public class ColumnConfigTest { public void testLiteralColumn01() { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col") - .setLiteralValue("literalValue01") + .setLiteral("literalValue01") .build(); assertNotNull("The result should not be null.", config); @@ -206,7 +206,7 @@ public class ColumnConfigTest { public void testLiteralColumn02() { final ColumnConfig config = ColumnConfig.newBuilder() .setName("col2") - .setLiteralValue("USER1.MY_SEQUENCE.NEXT") + .setLiteral("USER1.MY_SEQUENCE.NEXT") .setUnicode(true) .setClob(true) .build();
