You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/12/30 21:56:45 UTC
[1/3] logging-log4j2 git commit: Add generic parameter to
TypeConverters.convert()
Repository: logging-log4j2
Updated Branches:
refs/heads/master ea69c3c79 -> 8962adbc5
Add generic parameter to TypeConverters.convert()
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a890c78f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a890c78f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a890c78f
Branch: refs/heads/master
Commit: a890c78f6f739145651471e7f805605275de207e
Parents: ea69c3c
Author: Matt Sicker <ma...@spr.com>
Authored: Fri Dec 30 15:34:26 2016 -0600
Committer: Matt Sicker <ma...@spr.com>
Committed: Fri Dec 30 15:34:26 2016 -0600
----------------------------------------------------------------------
.../log4j/core/config/plugins/convert/TypeConverters.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a890c78f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
index 421d711..9c28edc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
@@ -359,8 +359,9 @@ public final class TypeConverters {
* @throws IllegalArgumentException
* if no TypeConverter exists for the given class
*/
- public static Object convert(final String s, final Class<?> clazz, final Object defaultValue) {
- final TypeConverter<?> converter = TypeConverterRegistry.getInstance().findCompatibleConverter(clazz);
+ public static <T> T convert(final String s, final Class<? extends T> clazz, final Object defaultValue) {
+ @SuppressWarnings("unchecked")
+ final TypeConverter<T> converter = (TypeConverter<T>) TypeConverterRegistry.getInstance().findCompatibleConverter(clazz);
if (s == null) {
// don't debug print here, resulting output is hard to understand
// LOGGER.debug("Null string given to convert. Using default [{}].", defaultValue);
@@ -375,12 +376,13 @@ public final class TypeConverters {
}
}
- private static Object parseDefaultValue(final TypeConverter<?> converter, final Object defaultValue) {
+ @SuppressWarnings("unchecked")
+ private static <T> T parseDefaultValue(final TypeConverter<T> converter, final Object defaultValue) {
if (defaultValue == null) {
return null;
}
if (!(defaultValue instanceof String)) {
- return defaultValue;
+ return (T) defaultValue;
}
try {
return converter.convert((String) defaultValue);
Re: [2/3] logging-log4j2 git commit: Specify sensitivity property for
password attributes
Posted by Matt Sicker <bo...@gmail.com>.
We've been using the sensitive annotation attribute for password values.
This way they aren't logged when the status logger is at debug.
On 30 December 2016 at 15:59, Gary Gregory <ga...@gmail.com> wrote:
> Do we need a PluginPasswordAttribute?
>
> Gary
>
> ---------- Forwarded message ----------
> From: <ma...@apache.org>
> Date: Fri, Dec 30, 2016 at 1:56 PM
> Subject: [2/3] logging-log4j2 git commit: Specify sensitivity property for
> password attributes
> To: commits@logging.apache.org
>
>
> Specify sensitivity property for password attributes
>
>
> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit
> /b1fa463b
> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b1fa463b
> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b1fa463b
>
> Branch: refs/heads/master
> Commit: b1fa463b55becf49572b6b4c4f030a88dae68640
> Parents: a890c78
> Author: Matt Sicker <ma...@spr.com>
> Authored: Fri Dec 30 15:55:37 2016 -0600
> Committer: Matt Sicker <ma...@spr.com>
> Committed: Fri Dec 30 15:55:37 2016 -0600
>
> ----------------------------------------------------------------------
> .../apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java | 2 +-
> .../apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b
> 1fa463b/log4j-core/src/main/java/org/apache/logging/log4j/co
> re/net/ssl/KeyStoreConfiguration.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net
> /ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org
> /apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
> index b0a6226..db844c7 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net
> /ssl/KeyStoreConfiguration.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net
> /ssl/KeyStoreConfiguration.java
> @@ -64,7 +64,7 @@ public class KeyStoreConfiguration extends
> AbstractKeyStoreConfiguration {
> public static KeyStoreConfiguration createKeyStoreConfiguration(
> // @formatter:off
> @PluginAttribute("location") final String location,
> - @PluginAttribute("password") final String password,
> + @PluginAttribute(value = "password", sensitive = true) final
> String password,
> @PluginAttribute("type") final String keyStoreType,
> @PluginAttribute("keyManagerFactoryAlgorithm") final String
> keyManagerFactoryAlgorithm) throws StoreConfigurationException {
> // @formatter:on
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b
> 1fa463b/log4j-core/src/main/java/org/apache/logging/log4j/co
> re/net/ssl/TrustStoreConfiguration.java
> ----------------------------------------------------------------------
> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net
> /ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org
> /apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
> index a3c9bf8..839365b 100644
> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net
> /ssl/TrustStoreConfiguration.java
> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net
> /ssl/TrustStoreConfiguration.java
> @@ -59,7 +59,7 @@ public class TrustStoreConfiguration extends
> AbstractKeyStoreConfiguration {
> public static TrustStoreConfiguration createKeyStoreConfiguration(
> // @formatter:off
> @PluginAttribute("location") final String location,
> - @PluginAttribute("password") final String password,
> + @PluginAttribute(value = "password", sensitive = true) final
> String password,
> @PluginAttribute("type") final String keyStoreType,
> @PluginAttribute("trustManagerFactoryAlgorithm") final
> String trustManagerFactoryAlgorithm) throws StoreConfigurationException {
> // @formatter:on
>
>
>
>
> --
> E-Mail: garydgregory@gmail.com | ggregory@apache.org
> Java Persistence with Hibernate, Second Edition
> <https://www.amazon.com/gp/product/1617290459/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1617290459&linkCode=as2&tag=garygregory-20&linkId=cadb800f39946ec62ea2b1af9fe6a2b8>
>
> <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1617290459>
> JUnit in Action, Second Edition
> <https://www.amazon.com/gp/product/1935182021/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182021&linkCode=as2&tag=garygregory-20&linkId=31ecd1f6b6d1eaf8886ac902a24de418%22>
>
> <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1935182021>
> Spring Batch in Action
> <https://www.amazon.com/gp/product/1935182951/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182951&linkCode=%7B%7BlinkCode%7D%7D&tag=garygregory-20&linkId=%7B%7Blink_id%7D%7D%22%3ESpring+Batch+in+Action>
> <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1935182951>
> Blog: http://garygregory.wordpress.com
> Home: http://garygregory.com/
> Tweet! http://twitter.com/GaryGregory
>
--
Matt Sicker <bo...@gmail.com>
Fwd: [2/3] logging-log4j2 git commit: Specify sensitivity property
for password attributes
Posted by Gary Gregory <ga...@gmail.com>.
Do we need a PluginPasswordAttribute?
Gary
---------- Forwarded message ----------
From: <ma...@apache.org>
Date: Fri, Dec 30, 2016 at 1:56 PM
Subject: [2/3] logging-log4j2 git commit: Specify sensitivity property for
password attributes
To: commits@logging.apache.org
Specify sensitivity property for password attributes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/
commit/b1fa463b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b1fa463b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b1fa463b
Branch: refs/heads/master
Commit: b1fa463b55becf49572b6b4c4f030a88dae68640
Parents: a890c78
Author: Matt Sicker <ma...@spr.com>
Authored: Fri Dec 30 15:55:37 2016 -0600
Committer: Matt Sicker <ma...@spr.com>
Committed: Fri Dec 30 15:55:37 2016 -0600
----------------------------------------------------------------------
.../apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java | 2 +-
.../apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
b1fa463b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/
KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/
net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/
org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index b0a6226..db844c7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/
net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/
net/ssl/KeyStoreConfiguration.java
@@ -64,7 +64,7 @@ public class KeyStoreConfiguration extends
AbstractKeyStoreConfiguration {
public static KeyStoreConfiguration createKeyStoreConfiguration(
// @formatter:off
@PluginAttribute("location") final String location,
- @PluginAttribute("password") final String password,
+ @PluginAttribute(value = "password", sensitive = true) final
String password,
@PluginAttribute("type") final String keyStoreType,
@PluginAttribute("keyManagerFactoryAlgorithm") final String
keyManagerFactoryAlgorithm) throws StoreConfigurationException {
// @formatter:on
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
b1fa463b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/
TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/
TrustStoreConfiguration.java
index a3c9bf8..839365b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/
TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/
TrustStoreConfiguration.java
@@ -59,7 +59,7 @@ public class TrustStoreConfiguration extends
AbstractKeyStoreConfiguration {
public static TrustStoreConfiguration createKeyStoreConfiguration(
// @formatter:off
@PluginAttribute("location") final String location,
- @PluginAttribute("password") final String password,
+ @PluginAttribute(value = "password", sensitive = true) final
String password,
@PluginAttribute("type") final String keyStoreType,
@PluginAttribute("trustManagerFactoryAlgorithm") final String
trustManagerFactoryAlgorithm) throws StoreConfigurationException {
// @formatter:on
--
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<https://www.amazon.com/gp/product/1617290459/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1617290459&linkCode=as2&tag=garygregory-20&linkId=cadb800f39946ec62ea2b1af9fe6a2b8>
<http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1617290459>
JUnit in Action, Second Edition
<https://www.amazon.com/gp/product/1935182021/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182021&linkCode=as2&tag=garygregory-20&linkId=31ecd1f6b6d1eaf8886ac902a24de418%22>
<http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1935182021>
Spring Batch in Action
<https://www.amazon.com/gp/product/1935182951/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182951&linkCode=%7B%7BlinkCode%7D%7D&tag=garygregory-20&linkId=%7B%7Blink_id%7D%7D%22%3ESpring+Batch+in+Action>
<http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1935182951>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory
[2/3] logging-log4j2 git commit: Specify sensitivity property for
password attributes
Posted by ma...@apache.org.
Specify sensitivity property for password attributes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b1fa463b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b1fa463b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b1fa463b
Branch: refs/heads/master
Commit: b1fa463b55becf49572b6b4c4f030a88dae68640
Parents: a890c78
Author: Matt Sicker <ma...@spr.com>
Authored: Fri Dec 30 15:55:37 2016 -0600
Committer: Matt Sicker <ma...@spr.com>
Committed: Fri Dec 30 15:55:37 2016 -0600
----------------------------------------------------------------------
.../apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java | 2 +-
.../apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b1fa463b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index b0a6226..db844c7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -64,7 +64,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
public static KeyStoreConfiguration createKeyStoreConfiguration(
// @formatter:off
@PluginAttribute("location") final String location,
- @PluginAttribute("password") final String password,
+ @PluginAttribute(value = "password", sensitive = true) final String password,
@PluginAttribute("type") final String keyStoreType,
@PluginAttribute("keyManagerFactoryAlgorithm") final String keyManagerFactoryAlgorithm) throws StoreConfigurationException {
// @formatter:on
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b1fa463b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index a3c9bf8..839365b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -59,7 +59,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
public static TrustStoreConfiguration createKeyStoreConfiguration(
// @formatter:off
@PluginAttribute("location") final String location,
- @PluginAttribute("password") final String password,
+ @PluginAttribute(value = "password", sensitive = true) final String password,
@PluginAttribute("type") final String keyStoreType,
@PluginAttribute("trustManagerFactoryAlgorithm") final String trustManagerFactoryAlgorithm) throws StoreConfigurationException {
// @formatter:on
[3/3] logging-log4j2 git commit: Add @ValidHost and @ValidPort where
appropriate
Posted by ma...@apache.org.
Add @ValidHost and @ValidPort where appropriate
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8962adbc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8962adbc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8962adbc
Branch: refs/heads/master
Commit: 8962adbc5859d46a5a8147a8b617690fa5de3f3e
Parents: b1fa463
Author: Matt Sicker <ma...@spr.com>
Authored: Fri Dec 30 15:56:02 2016 -0600
Committer: Matt Sicker <ma...@spr.com>
Committed: Fri Dec 30 15:56:02 2016 -0600
----------------------------------------------------------------------
.../log4j/core/appender/SmtpAppender.java | 8 +++--
.../log4j/core/appender/SocketAppender.java | 4 +++
.../nosql/appender/couchdb/CouchDbProvider.java | 15 ++++----
.../nosql/appender/mongodb/MongoDbProvider.java | 37 ++++++++------------
4 files changed, 30 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8962adbc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
index 6b9c474..e3aac4d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
@@ -31,6 +31,8 @@ import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidPort;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
import org.apache.logging.log4j.core.layout.HtmlLayout;
import org.apache.logging.log4j.core.net.SmtpManager;
@@ -110,7 +112,7 @@ public final class SmtpAppender extends AbstractAppender {
@PluginFactory
public static SmtpAppender createAppender(
@PluginConfiguration final Configuration config,
- @PluginAttribute("name") final String name,
+ @PluginAttribute("name") @Required final String name,
@PluginAttribute("to") final String to,
@PluginAttribute("cc") final String cc,
@PluginAttribute("bcc") final String bcc,
@@ -119,9 +121,9 @@ public final class SmtpAppender extends AbstractAppender {
@PluginAttribute("subject") final String subject,
@PluginAttribute("smtpProtocol") final String smtpProtocol,
@PluginAttribute("smtpHost") final String smtpHost,
- @PluginAttribute("smtpPort") final String smtpPortStr,
+ @PluginAttribute(value = "smtpPort", defaultString = "0") @ValidPort final String smtpPortStr,
@PluginAttribute("smtpUsername") final String smtpUsername,
- @PluginAttribute("smtpPassword") final String smtpPassword,
+ @PluginAttribute(value = "smtpPassword", sensitive = true) final String smtpPassword,
@PluginAttribute("smtpDebug") final String smtpDebug,
@PluginAttribute("bufferSize") final String bufferSizeStr,
@PluginElement("Layout") Layout<? extends Serializable> layout,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8962adbc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 6b5c75a..c61598c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -34,6 +34,8 @@ import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidHost;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidPort;
import org.apache.logging.log4j.core.layout.SerializedLayout;
import org.apache.logging.log4j.core.net.AbstractSocketManager;
import org.apache.logging.log4j.core.net.Advertiser;
@@ -71,12 +73,14 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
private int connectTimeoutMillis;
@PluginBuilderAttribute
+ @ValidHost
private String host = "localhost";
@PluginBuilderAttribute
private boolean immediateFail = true;
@PluginBuilderAttribute
+ @ValidPort
private int port;
@PluginBuilderAttribute
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8962adbc/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
index 374da43..72fdee0 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
@@ -19,10 +19,12 @@ package org.apache.logging.log4j.nosql.appender.couchdb;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.convert.TypeConverters;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidHost;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidPort;
import org.apache.logging.log4j.core.util.NameUtil;
import org.apache.logging.log4j.nosql.appender.NoSqlProvider;
import org.apache.logging.log4j.status.StatusLogger;
@@ -83,8 +85,8 @@ public final class CouchDbProvider implements NoSqlProvider<CouchDbConnection> {
public static CouchDbProvider createNoSqlProvider(
@PluginAttribute("databaseName") final String databaseName,
@PluginAttribute("protocol") String protocol,
- @PluginAttribute("server") String server,
- @PluginAttribute("port") final String port,
+ @PluginAttribute(value = "server", defaultString = "localhost") @ValidHost String server,
+ @PluginAttribute(value = "port", defaultString = "0") @ValidPort final String port,
@PluginAttribute("username") final String username,
@PluginAttribute(value = "password", sensitive = true) final String password,
@PluginAttribute("factoryClassName") final String factoryClassName,
@@ -139,12 +141,7 @@ public final class CouchDbProvider implements NoSqlProvider<CouchDbConnection> {
LOGGER.warn("No protocol specified, using default port [http].");
}
- final int portInt = AbstractAppender.parseInt(port, protocol.equals("https") ? HTTPS : HTTP);
-
- if (Strings.isEmpty(server)) {
- server = "localhost";
- LOGGER.warn("No server specified, using default server localhost.");
- }
+ final int portInt = TypeConverters.convert(port, int.class, protocol.equals("https") ? HTTPS : HTTP);
if (Strings.isEmpty(username) || Strings.isEmpty(password)) {
LOGGER.error("You must provide a username and password for the CouchDB provider.");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8962adbc/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
index 027f3a1..9ed1d77 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
@@ -21,31 +21,33 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import com.mongodb.DB;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.convert.TypeConverters;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidHost;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.ValidPort;
import org.apache.logging.log4j.core.util.NameUtil;
import org.apache.logging.log4j.nosql.appender.NoSqlProvider;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.LoaderUtil;
import org.apache.logging.log4j.util.Strings;
-import com.mongodb.DB;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.WriteConcern;
-
/**
* The MongoDB implementation of {@link NoSqlProvider}.
*/
@Plugin(name = "MongoDb", category = "Core", printObject = true)
public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> {
-
+
private static final WriteConcern DEFAULT_WRITE_CONCERN = WriteConcern.ACKNOWLEDGED;
private static final Logger LOGGER = StatusLogger.getLogger();
+ private static final int DEFAULT_PORT = 27017;
private final String collectionName;
private final DB database;
@@ -98,8 +100,8 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> {
@PluginAttribute("writeConcernConstant") final String writeConcernConstant,
@PluginAttribute("writeConcernConstantClass") final String writeConcernConstantClassName,
@PluginAttribute("databaseName") final String databaseName,
- @PluginAttribute("server") final String server,
- @PluginAttribute("port") final String port,
+ @PluginAttribute(value = "server", defaultString = "localhost") @ValidHost final String server,
+ @PluginAttribute(value = "port", defaultString = "" + DEFAULT_PORT) @ValidPort final String port,
@PluginAttribute("userName") final String userName,
@PluginAttribute(value = "password", sensitive = true) final String password,
@PluginAttribute("factoryClassName") final String factoryClassName,
@@ -163,18 +165,9 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> {
credentials.add(MongoCredential.createCredential(userName, databaseName, password.toCharArray()));
}
try {
- if (Strings.isNotEmpty(server)) {
- final int portInt = AbstractAppender.parseInt(port, 0);
- description += ", server=" + server;
- if (portInt > 0) {
- description += ", port=" + portInt;
- database = new MongoClient(new ServerAddress(server, portInt), credentials).getDB(databaseName);
- } else {
- database = new MongoClient(new ServerAddress(server), credentials).getDB(databaseName);
- }
- } else {
- database = new MongoClient(new ServerAddress(), credentials).getDB(databaseName);
- }
+ final int portInt = TypeConverters.convert(port, int.class, DEFAULT_PORT);
+ description += ", server=" + server + ", port=" + portInt;
+ database = new MongoClient(new ServerAddress(server, portInt), credentials).getDB(databaseName);
} catch (final Exception e) {
LOGGER.error(
"Failed to obtain a database instance from the MongoClient at server [{}] and " + "port [{}].",